Bump docker/bake-action from 3 to 6

Bumps [docker/bake-action](https://github.com/docker/bake-action) from 3 to 6.
- [Release notes](https://github.com/docker/bake-action/releases)
- [Commits](https://github.com/docker/bake-action/compare/v3...v6)

---
updated-dependencies:
- dependency-name: docker/bake-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.cspell/frigate-dictionary.txt

@@ -2,7 +2,6 @@ aarch
 absdiff
 airockchip
 Alloc
-alpr
 Amcrest
 amdgpu
 analyzeduration
@@ -62,7 +61,6 @@ dsize
 dtype
 ECONNRESET
 edgetpu
-facenet
 fastapi
 faststart
 fflags
@@ -116,8 +114,6 @@ itemsize
 Jellyfin
 jetson
 jetsons
-jina
-jinaai
 joserfc
 jsmpeg
 jsonify
@@ -191,7 +187,6 @@ openai
 opencv
 openvino
 OWASP
-paddleocr
 paho
 passwordless
 popleft
@@ -313,4 +308,4 @@ yolo
 yolonas
 yolox
 zeep
-zerolatency
+zerolatency

.github/workflows/ci.yml

@@ -66,7 +66,7 @@ jobs:
             ${{ steps.setup.outputs.image-name }}-standard-arm64
           cache-from: type=registry,ref=${{ steps.setup.outputs.cache-name }}-arm64
       - name: Build and push RPi build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v6
         with:
           push: true
           targets: rpi
@@ -94,7 +94,7 @@ jobs:
           BASE_IMAGE: timongentzsch/l4t-ubuntu20-opencv:latest
           SLIM_BASE: timongentzsch/l4t-ubuntu20-opencv:latest
           TRT_BASE: timongentzsch/l4t-ubuntu20-opencv:latest
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v6
         with:
           push: true
           targets: tensorrt
@@ -122,7 +122,7 @@ jobs:
           BASE_IMAGE: nvcr.io/nvidia/l4t-tensorrt:r8.5.2-runtime
           SLIM_BASE: nvcr.io/nvidia/l4t-tensorrt:r8.5.2-runtime
           TRT_BASE: nvcr.io/nvidia/l4t-tensorrt:r8.5.2-runtime
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v6
         with:
           push: true
           targets: tensorrt
@@ -149,7 +149,7 @@ jobs:
       - name: Build and push TensorRT (x86 GPU)
         env:
           COMPUTE_LEVEL: "50 60 70 80 90"
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v6
         with:
           push: true
           targets: tensorrt
@@ -174,7 +174,7 @@ jobs:
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push Rockchip build
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v6
         with:
           push: true
           targets: rk
@@ -199,7 +199,7 @@ jobs:
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push Hailo-8l build
-        uses: docker/bake-action@v4
+        uses: docker/bake-action@v6
         with:
           push: true
           targets: h8l
@@ -212,7 +212,7 @@ jobs:
         env:
           AMDGPU: gfx
           HSA_OVERRIDE: 0
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v6
         with:
           push: true
           targets: rocm

Makefile

@@ -1,7 +1,7 @@
 default_target: local
 
 COMMIT_HASH := $(shell git log -1 --pretty=format:"%h"|tail -1)
-VERSION = 0.16.0
+VERSION = 0.15.0
 IMAGE_REPO ?= ghcr.io/blakeblackshear/frigate
 GITHUB_REF_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
 BOARDS= #Initialized empty

docker/hailo8l/Dockerfile

@@ -5,7 +5,6 @@ ARG DEBIAN_FRONTEND=noninteractive
 # Build Python wheels
 FROM wheels AS h8l-wheels
 
-RUN python3 -m pip config set global.break-system-packages true
 COPY docker/main/requirements-wheels.txt /requirements-wheels.txt
 COPY docker/hailo8l/requirements-wheels-h8l.txt /requirements-wheels-h8l.txt
 
@@ -31,7 +30,6 @@ COPY --from=hailort /hailo-wheels /deps/hailo-wheels
 COPY --from=hailort /rootfs/ /
 
 # Install the wheels
-RUN python3 -m pip config set global.break-system-packages true
 RUN pip3 install -U /deps/h8l-wheels/*.whl
 RUN pip3 install -U /deps/hailo-wheels/*.whl
 

docker/hailo8l/install_hailort.sh

@@ -15,5 +15,5 @@ wget -qO- "https://github.com/frigate-nvr/hailort/releases/download/v${hailo_ver
 
 mkdir -p /hailo-wheels
 
-wget -P /hailo-wheels/ "https://github.com/frigate-nvr/hailort/releases/download/v${hailo_version}/hailort-${hailo_version}-cp311-cp311-linux_${arch}.whl"
+wget -P /hailo-wheels/ "https://github.com/frigate-nvr/hailort/releases/download/v${hailo_version}/hailort-${hailo_version}-cp39-cp39-linux_${arch}.whl"
 

docker/main/Dockerfile

@@ -3,12 +3,12 @@
 # https://askubuntu.com/questions/972516/debian-frontend-environment-variable
 ARG DEBIAN_FRONTEND=noninteractive
 
-ARG BASE_IMAGE=debian:12
-ARG SLIM_BASE=debian:12-slim
+ARG BASE_IMAGE=debian:11
+ARG SLIM_BASE=debian:11-slim
 
 FROM ${BASE_IMAGE} AS base
 
-FROM --platform=${BUILDPLATFORM} debian:12 AS base_host
+FROM --platform=${BUILDPLATFORM} debian:11 AS base_host
 
 FROM ${SLIM_BASE} AS slim-base
 
@@ -66,8 +66,8 @@ COPY docker/main/requirements-ov.txt /requirements-ov.txt
 RUN apt-get -qq update \
     && apt-get -qq install -y wget python3 python3-dev python3-distutils gcc pkg-config libhdf5-dev \
     && wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \
-    && python3 get-pip.py "pip" --break-system-packages \
-    && pip install --break-system-packages -r /requirements-ov.txt
+    && python3 get-pip.py "pip" \
+    && pip install -r /requirements-ov.txt
 
 # Get OpenVino Model
 RUN --mount=type=bind,source=docker/main/build_ov_model.py,target=/build_ov_model.py \
@@ -139,17 +139,24 @@ ARG TARGETARCH
 # Use a separate container to build wheels to prevent build dependencies in final image
 RUN apt-get -qq update \
     && apt-get -qq install -y \
-    apt-transport-https wget \
+    apt-transport-https \
+    gnupg \
+    wget \
+    # the key fingerprint can be obtained from https://ftp-master.debian.org/keys.html
+    && wget -qO- "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA4285295FC7B1A81600062A9605C66F00D6C9793" | \
+    gpg --dearmor > /usr/share/keyrings/debian-archive-bullseye-stable.gpg \
+    && echo "deb [signed-by=/usr/share/keyrings/debian-archive-bullseye-stable.gpg] http://deb.debian.org/debian bullseye main contrib non-free" | \
+    tee /etc/apt/sources.list.d/debian-bullseye-nonfree.list \
     && apt-get -qq update \
     && apt-get -qq install -y \
-    python3 \
-    python3-dev \
+    python3.9 \
+    python3.9-dev \
     # opencv dependencies
     build-essential cmake git pkg-config libgtk-3-dev \
     libavcodec-dev libavformat-dev libswscale-dev libv4l-dev \
     libxvidcore-dev libx264-dev libjpeg-dev libpng-dev libtiff-dev \
     gfortran openexr libatlas-base-dev libssl-dev\
-    libtbbmalloc2 libtbb-dev libdc1394-dev libopenexr-dev \
+    libtbb2 libtbb-dev libdc1394-22-dev libopenexr-dev \
     libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev \
     # sqlite3 dependencies
     tclsh \
@@ -157,11 +164,14 @@ RUN apt-get -qq update \
     gcc gfortran libopenblas-dev liblapack-dev && \
     rm -rf /var/lib/apt/lists/*
 
+# Ensure python3 defaults to python3.9
+RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1
+
 RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \
-    && python3 get-pip.py "pip" --break-system-packages
+    && python3 get-pip.py "pip"
 
 COPY docker/main/requirements.txt /requirements.txt
-RUN pip3 install -r /requirements.txt --break-system-packages
+RUN pip3 install -r /requirements.txt
 
 # Build pysqlite3 from source
 COPY docker/main/build_pysqlite3.sh /build_pysqlite3.sh
@@ -212,8 +222,8 @@ RUN --mount=type=bind,source=docker/main/install_deps.sh,target=/deps/install_de
     /deps/install_deps.sh
 
 RUN --mount=type=bind,from=wheels,source=/wheels,target=/deps/wheels \
-    python3 -m pip install --upgrade pip --break-system-packages && \
-    pip3 install -U /deps/wheels/*.whl --break-system-packages
+    python3 -m pip install --upgrade pip && \
+    pip3 install -U /deps/wheels/*.whl
 
 COPY --from=deps-rootfs / /
 
@@ -260,7 +270,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN --mount=type=bind,source=./docker/main/requirements-dev.txt,target=/workspace/frigate/requirements-dev.txt \
-    pip3 install -r requirements-dev.txt --break-system-packages
+    pip3 install -r requirements-dev.txt
 
 HEALTHCHECK NONE
 

docker/main/build_nginx.sh

@@ -8,7 +8,8 @@ SECURE_TOKEN_MODULE_VERSION="1.5"
 SET_MISC_MODULE_VERSION="v0.33"
 NGX_DEVEL_KIT_VERSION="v0.3.3"
 
-sed -i '/^Types:/s/deb/& deb-src/' /etc/apt/sources.list.d/debian.sources
+cp /etc/apt/sources.list /etc/apt/sources.list.d/sources-src.list
+sed -i 's|deb http|deb-src http|g' /etc/apt/sources.list.d/sources-src.list
 apt-get update
 
 apt-get -yqq build-dep nginx

docker/main/build_ov_model.py

@@ -4,7 +4,7 @@ from openvino.tools import mo
 ov_model = mo.convert_model(
     "/models/ssdlite_mobilenet_v2_coco_2018_05_09/frozen_inference_graph.pb",
     compress_to_fp16=True,
-    transformations_config="/usr/local/lib/python3.11/dist-packages/openvino/tools/mo/front/tf/ssd_v2_support.json",
+    transformations_config="/usr/local/lib/python3.9/dist-packages/openvino/tools/mo/front/tf/ssd_v2_support.json",
     tensorflow_object_detection_api_pipeline_config="/models/ssdlite_mobilenet_v2_coco_2018_05_09/pipeline.config",
     reverse_input_channels=True,
 )

docker/main/build_sqlite_vec.sh

@@ -4,7 +4,8 @@ set -euxo pipefail
 
 SQLITE_VEC_VERSION="0.1.3"
 
-sed -i '/^Types:/s/deb/& deb-src/' /etc/apt/sources.list.d/debian.sources
+cp /etc/apt/sources.list /etc/apt/sources.list.d/sources-src.list
+sed -i 's|deb http|deb-src http|g' /etc/apt/sources.list.d/sources-src.list
 apt-get update
 apt-get -yqq build-dep sqlite3 gettext git
 

docker/main/install_deps.sh

@@ -11,34 +11,33 @@ apt-get -qq install --no-install-recommends -y \
     lbzip2 \
     procps vainfo \
     unzip locales tzdata libxml2 xz-utils \
-    python3 \
+    python3.9 \
     python3-pip \
     curl \
     lsof \
     jq \
-    nethogs \
-    libgl1 \
-    libglib2.0-0 \
-    libusb-1.0.0
+    nethogs
+
+# ensure python3 defaults to python3.9
+update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1
 
 mkdir -p -m 600 /root/.gnupg
 
-# install coral runtime
-wget -q -O /tmp/libedgetpu1-max.deb "https://github.com/feranick/libedgetpu/releases/download/16.0TF2.17.0-1/libedgetpu1-max_16.0tf2.17.0-1.bookworm_${TARGETARCH}.deb"
-unset DEBIAN_FRONTEND
-yes | dpkg -i /tmp/libedgetpu1-max.deb && export DEBIAN_FRONTEND=noninteractive
-rm /tmp/libedgetpu1-max.deb
+# add coral repo
+curl -fsSLo - https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
+    gpg --dearmor -o /etc/apt/trusted.gpg.d/google-cloud-packages-archive-keyring.gpg
+echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" | tee /etc/apt/sources.list.d/coral-edgetpu.list
+echo "libedgetpu1-max libedgetpu/accepted-eula select true" | debconf-set-selections
 
-# install python3 & tflite runtime
-if [[ "${TARGETARCH}" == "amd64" ]]; then
-    pip3 install --break-system-packages https://github.com/feranick/TFlite-builds/releases/download/v2.17.0/tflite_runtime-2.17.0-cp311-cp311-linux_x86_64.whl
-    pip3 install --break-system-packages https://github.com/feranick/pycoral/releases/download/2.0.2TF2.17.0/pycoral-2.0.2-cp311-cp311-linux_x86_64.whl
+# enable non-free repo in Debian
+if grep -q "Debian" /etc/issue; then
+    sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list
 fi
 
-if [[ "${TARGETARCH}" == "arm64" ]]; then
-    pip3 install --break-system-packages https://github.com/feranick/TFlite-builds/releases/download/v2.17.0/tflite_runtime-2.17.0-cp311-cp311-linux_aarch64.whl
-    pip3 install --break-system-packages https://github.com/feranick/pycoral/releases/download/2.0.2TF2.17.0/pycoral-2.0.2-cp311-cp311-linux_aarch64.whl
-fi
+# coral drivers
+apt-get -qq update
+apt-get -qq install --no-install-recommends --no-install-suggests -y \
+    libedgetpu1-max python3-tflite-runtime python3-pycoral
 
 # btbn-ffmpeg -> amd64
 if [[ "${TARGETARCH}" == "amd64" ]]; then
@@ -66,15 +65,23 @@ fi
 
 # arch specific packages
 if [[ "${TARGETARCH}" == "amd64" ]]; then
-    # install amd / intel-i965 driver packages
+    # use debian bookworm for amd / intel-i965 driver packages
+    echo 'deb https://deb.debian.org/debian bookworm main contrib non-free' >/etc/apt/sources.list.d/debian-bookworm.list
+    apt-get -qq update
     apt-get -qq install --no-install-recommends --no-install-suggests -y \
         i965-va-driver intel-gpu-tools onevpl-tools \
         libva-drm2 \
         mesa-va-drivers radeontop
 
+    # something about this dependency requires it to be installed in a separate call rather than in the line above
+    apt-get -qq install --no-install-recommends --no-install-suggests -y \
+        i965-va-driver-shaders
+
     # intel packages use zst compression so we need to update dpkg
     apt-get install -y dpkg
 
+    rm -f /etc/apt/sources.list.d/debian-bookworm.list
+
     # use intel apt intel packages
     wget -qO - https://repositories.intel.com/gpu/intel-graphics.key | gpg --yes --dearmor --output /usr/share/keyrings/intel-graphics.gpg
     echo "deb [arch=amd64 signed-by=/usr/share/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy client" | tee /etc/apt/sources.list.d/intel-gpu-jammy.list

docker/main/requirements-wheels.txt

@@ -10,10 +10,10 @@ imutils == 0.5.*
 joserfc == 1.0.*
 pathvalidate == 3.2.*
 markupsafe == 2.1.*
-python-multipart == 0.0.12
-# General
 mypy == 1.6.1
+numpy == 1.26.*
 onvif_zeep == 0.2.12
+opencv-python-headless == 4.9.0.*
 paho-mqtt == 2.1.*
 pandas == 2.2.*
 peewee == 3.17.*
@@ -27,19 +27,15 @@ ruamel.yaml == 0.18.*
 tzlocal == 5.2
 requests == 2.32.*
 types-requests == 2.32.*
+scipy == 1.13.*
 norfair == 2.2.*
 setproctitle == 1.3.*
 ws4py == 0.5.*
 unidecode == 1.3.*
-# Image Manipulation
-numpy == 1.26.*
-opencv-python-headless == 4.10.0.*
-opencv-contrib-python == 4.9.0.*
-scipy == 1.14.*
 # OpenVino & ONNX
-openvino == 2024.4.*
-onnxruntime-openvino == 1.20.* ; platform_machine == 'x86_64'
-onnxruntime == 1.20.* ; platform_machine == 'aarch64'
+openvino == 2024.3.*
+onnxruntime-openvino == 1.19.* ; platform_machine == 'x86_64'
+onnxruntime == 1.19.* ; platform_machine == 'aarch64'
 # Embeddings
 transformers == 4.45.*
 # Generative AI
@@ -49,6 +45,3 @@ openai == 1.51.*
 # push notifications
 py-vapid == 1.9.*
 pywebpush == 2.0.*
-# alpr
-pyclipper == 1.3.*
-shapely == 2.0.*

docker/main/requirements.txt

@@ -1,2 +1,2 @@
-scikit-build == 0.18.*
+scikit-build == 0.17.*
 nvidia-pyindex

docker/main/rootfs/usr/local/nginx/conf/nginx.conf

@@ -81,9 +81,6 @@ http {
         open_file_cache_errors on;
         aio on;
 
-        # file upload size
-        client_max_body_size 10M;
-
         # https://github.com/kaltura/nginx-vod-module#vod_open_file_thread_pool
         vod_open_file_thread_pool default;
 

docker/rockchip/Dockerfile

@@ -7,14 +7,13 @@ FROM wheels as rk-wheels
 COPY docker/main/requirements-wheels.txt /requirements-wheels.txt
 COPY docker/rockchip/requirements-wheels-rk.txt /requirements-wheels-rk.txt
 RUN sed -i "/https:\/\//d" /requirements-wheels.txt
-RUN python3 -m pip config set global.break-system-packages true
 RUN pip3 wheel --wheel-dir=/rk-wheels -c /requirements-wheels.txt -r /requirements-wheels-rk.txt
 
 FROM deps AS rk-frigate
 ARG TARGETARCH
 
 RUN --mount=type=bind,from=rk-wheels,source=/rk-wheels,target=/deps/rk-wheels \
-    pip3 install -U /deps/rk-wheels/*.whl --break-system-packages
+    pip3 install -U /deps/rk-wheels/*.whl
 
 WORKDIR /opt/frigate/
 COPY --from=rootfs / /

docker/rockchip/requirements-wheels-rk.txt

@@ -1 +1 @@
-rknn-toolkit-lite2 @ https://github.com/MarcA711/rknn-toolkit2/releases/download/v2.0.0/rknn_toolkit_lite2-2.0.0b0-cp311-cp311-linux_aarch64.whl
+rknn-toolkit-lite2 @ https://github.com/MarcA711/rknn-toolkit2/releases/download/v2.0.0/rknn_toolkit_lite2-2.0.0b0-cp39-cp39-linux_aarch64.whl

docker/rocm/Dockerfile

@@ -34,7 +34,7 @@ RUN mkdir -p /opt/rocm-dist/etc/ld.so.conf.d/
 RUN echo /opt/rocm/lib|tee /opt/rocm-dist/etc/ld.so.conf.d/rocm.conf
 
 #######################################################################
-FROM --platform=linux/amd64 debian:12 as debian-base
+FROM --platform=linux/amd64 debian:11 as debian-base
 
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get -y install --no-install-recommends libelf1 libdrm2 libdrm-amdgpu1 libnuma1 kmod
@@ -51,7 +51,7 @@ COPY --from=rocm /opt/rocm-$ROCM /opt/rocm-$ROCM
 RUN ln -s /opt/rocm-$ROCM /opt/rocm
 
 RUN apt-get -y install g++ cmake
-RUN apt-get -y install python3-pybind11 python3-distutils python3-dev
+RUN apt-get -y install python3-pybind11 python3.9-distutils python3-dev
 
 WORKDIR /opt/build
 
@@ -70,11 +70,10 @@ RUN apt-get -y install libnuma1
 WORKDIR /opt/frigate/
 COPY --from=rootfs / /
 
-# Temporarily disabled to see if a new wheel can be built to support py3.11
-#COPY docker/rocm/requirements-wheels-rocm.txt /requirements.txt
-#RUN python3 -m pip install --upgrade pip \
-#    && pip3 uninstall -y onnxruntime-openvino \
-#    && pip3 install -r /requirements.txt
+COPY docker/rocm/requirements-wheels-rocm.txt /requirements.txt
+RUN python3 -m pip install --upgrade pip \
+    && pip3 uninstall -y onnxruntime-openvino \
+    && pip3 install -r /requirements.txt
 
 #######################################################################
 FROM scratch AS rocm-dist
@@ -87,12 +86,12 @@ COPY --from=rocm /opt/rocm-$ROCM/share/miopen/db/*$AMDGPU* /opt/rocm-$ROCM/share
 COPY --from=rocm /opt/rocm-$ROCM/share/miopen/db/*gfx908* /opt/rocm-$ROCM/share/miopen/db/
 COPY --from=rocm /opt/rocm-$ROCM/lib/rocblas/library/*$AMDGPU* /opt/rocm-$ROCM/lib/rocblas/library/
 COPY --from=rocm /opt/rocm-dist/ /
-COPY --from=debian-build /opt/rocm/lib/migraphx.cpython-311-x86_64-linux-gnu.so /opt/rocm-$ROCM/lib/
+COPY --from=debian-build /opt/rocm/lib/migraphx.cpython-39-x86_64-linux-gnu.so /opt/rocm-$ROCM/lib/
 
 #######################################################################
 FROM deps-prelim AS rocm-prelim-hsa-override0
-\
-    ENV HSA_ENABLE_SDMA=0
+
+ENV HSA_ENABLE_SDMA=0
 
 COPY --from=rocm-dist / /
 

docker/rpi/install_deps.sh

@@ -24,7 +24,7 @@ sed -i -e's/ main/ main contrib non-free/g' /etc/apt/sources.list
 if [[ "${TARGETARCH}" == "arm64" ]]; then
     # add raspberry pi repo
     gpg --no-default-keyring --keyring /usr/share/keyrings/raspbian.gpg --keyserver keyserver.ubuntu.com --recv-keys 82B129927FA3303E
-    echo "deb [signed-by=/usr/share/keyrings/raspbian.gpg] https://archive.raspberrypi.org/debian/ bookworm main" | tee /etc/apt/sources.list.d/raspi.list
+    echo "deb [signed-by=/usr/share/keyrings/raspbian.gpg] https://archive.raspberrypi.org/debian/ bullseye main" | tee /etc/apt/sources.list.d/raspi.list
     apt-get -qq update
     apt-get -qq install --no-install-recommends --no-install-suggests -y ffmpeg
 fi

docker/tensorrt/Dockerfile.amd64

@@ -7,19 +7,18 @@ ARG DEBIAN_FRONTEND=noninteractive
 FROM wheels as trt-wheels
 ARG DEBIAN_FRONTEND
 ARG TARGETARCH
-RUN python3 -m pip config set global.break-system-packages true
 
 # Add TensorRT wheels to another folder
 COPY docker/tensorrt/requirements-amd64.txt /requirements-tensorrt.txt
 RUN mkdir -p /trt-wheels && pip3 wheel --wheel-dir=/trt-wheels -r /requirements-tensorrt.txt
 
 FROM tensorrt-base AS frigate-tensorrt
-ENV TRT_VER=8.6.1
-RUN python3 -m pip config set global.break-system-packages true
+ENV TRT_VER=8.5.3
 RUN --mount=type=bind,from=trt-wheels,source=/trt-wheels,target=/deps/trt-wheels \
-    pip3 install -U /deps/trt-wheels/*.whl --break-system-packages && \
+    pip3 install -U /deps/trt-wheels/*.whl && \
     ldconfig
 
+ENV LD_LIBRARY_PATH=/usr/local/lib/python3.9/dist-packages/tensorrt:/usr/local/cuda/lib64:/usr/local/lib/python3.9/dist-packages/nvidia/cufft/lib
 WORKDIR /opt/frigate/
 COPY --from=rootfs / /
 
@@ -32,4 +31,4 @@ COPY --from=trt-deps /usr/local/cuda-12.1 /usr/local/cuda
 COPY docker/tensorrt/detector/rootfs/ /
 COPY --from=trt-deps /usr/local/lib/libyolo_layer.so /usr/local/lib/libyolo_layer.so
 RUN --mount=type=bind,from=trt-wheels,source=/trt-wheels,target=/deps/trt-wheels \
-    pip3 install -U /deps/trt-wheels/*.whl --break-system-packages
+    pip3 install -U /deps/trt-wheels/*.whl

docker/tensorrt/Dockerfile.arm64

@@ -41,11 +41,11 @@ RUN --mount=type=bind,source=docker/tensorrt/detector/build_python_tensorrt.sh,t
     && TENSORRT_VER=$(cat /etc/TENSORRT_VER) /deps/build_python_tensorrt.sh
 
 COPY docker/tensorrt/requirements-arm64.txt /requirements-tensorrt.txt
-ADD https://nvidia.box.com/shared/static/psl23iw3bh7hlgku0mjo1xekxpego3e3.whl /tmp/onnxruntime_gpu-1.15.1-cp311-cp311-linux_aarch64.whl
+ADD https://nvidia.box.com/shared/static/9aemm4grzbbkfaesg5l7fplgjtmswhj8.whl /tmp/onnxruntime_gpu-1.15.1-cp39-cp39-linux_aarch64.whl
 
 RUN pip3 uninstall -y onnxruntime-openvino \
     && pip3 wheel --wheel-dir=/trt-wheels -r /requirements-tensorrt.txt \
-    && pip3 install --no-deps /tmp/onnxruntime_gpu-1.15.1-cp311-cp311-linux_aarch64.whl
+    && pip3 install --no-deps /tmp/onnxruntime_gpu-1.15.1-cp39-cp39-linux_aarch64.whl
 
 FROM build-wheels AS trt-model-wheels
 ARG DEBIAN_FRONTEND

docker/tensorrt/Dockerfile.base

@@ -3,19 +3,18 @@
 # https://askubuntu.com/questions/972516/debian-frontend-environment-variable
 ARG DEBIAN_FRONTEND=noninteractive
 
-ARG TRT_BASE=nvcr.io/nvidia/tensorrt:24.10-py3
+ARG TRT_BASE=nvcr.io/nvidia/tensorrt:23.03-py3
 
 # Build TensorRT-specific library
 FROM ${TRT_BASE} AS trt-deps
 
 ARG COMPUTE_LEVEL
 
-# Need to wait for script to be adapted to newer version of tensorrt or perhaps decide that we want to remove the TRT detector in favor of using onnx runtime directly
-#RUN apt-get update \
-#    && apt-get install -y git build-essential cuda-nvcc-* cuda-nvtx-* libnvinfer-dev libnvinfer-plugin-dev libnvparsers-dev libnvonnxparsers-dev \
-#    && rm -rf /var/lib/apt/lists/*
-#RUN --mount=type=bind,source=docker/tensorrt/detector/tensorrt_libyolo.sh,target=/tensorrt_libyolo.sh \
-#    /tensorrt_libyolo.sh
+RUN apt-get update \
+    && apt-get install -y git build-essential cuda-nvcc-* cuda-nvtx-* libnvinfer-dev libnvinfer-plugin-dev libnvparsers-dev libnvonnxparsers-dev \
+    && rm -rf /var/lib/apt/lists/*
+RUN --mount=type=bind,source=docker/tensorrt/detector/tensorrt_libyolo.sh,target=/tensorrt_libyolo.sh \
+    /tensorrt_libyolo.sh
 
 # Frigate w/ TensorRT Support as separate image
 FROM deps AS tensorrt-base
@@ -23,12 +22,9 @@ FROM deps AS tensorrt-base
 #Disable S6 Global timeout
 ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
 
-#COPY --from=trt-deps /usr/local/lib/libyolo_layer.so /usr/local/lib/libyolo_layer.so
-#COPY --from=trt-deps /usr/local/src/tensorrt_demos /usr/local/src/tensorrt_demos
-
-COPY --from=trt-deps /usr/lib/x86_64-linux-gnu/libcudnn* /usr/local/cuda/lib64/
-COPY --from=trt-deps /usr/lib/x86_64-linux-gnu/libnv* /usr/local/cuda/lib64/
-
+COPY --from=trt-deps /usr/local/lib/libyolo_layer.so /usr/local/lib/libyolo_layer.so
+COPY --from=trt-deps /usr/local/src/tensorrt_demos /usr/local/src/tensorrt_demos
+COPY --from=trt-deps /usr/local/cuda-12.* /usr/local/cuda
 COPY docker/tensorrt/detector/rootfs/ /
 ENV YOLO_MODELS=""
 

docker/tensorrt/detector/rootfs/etc/ld.so.conf.d/cuda_tensorrt.conf

@@ -1,8 +1,6 @@
 /usr/local/lib
-/usr/local/cuda/lib64
-/usr/local/lib/python3.11/dist-packages/nvidia/cudnn/lib
-/usr/local/lib/python3.11/dist-packages/nvidia/cuda_runtime/lib
-/usr/local/lib/python3.11/dist-packages/nvidia/cublas/lib
-/usr/local/lib/python3.11/dist-packages/nvidia/cuda_nvrtc/lib
-/usr/local/lib/python3.11/dist-packages/tensorrt
-/usr/local/lib/python3.11/dist-packages/nvidia/cufft/lib
+/usr/local/lib/python3.9/dist-packages/nvidia/cudnn/lib
+/usr/local/lib/python3.9/dist-packages/nvidia/cuda_runtime/lib
+/usr/local/lib/python3.9/dist-packages/nvidia/cublas/lib
+/usr/local/lib/python3.9/dist-packages/nvidia/cuda_nvrtc/lib
+/usr/local/lib/python3.9/dist-packages/tensorrt

docker/tensorrt/requirements-amd64.txt

@@ -1,10 +1,14 @@
 # NVidia TensorRT Support (amd64 only)
 --extra-index-url 'https://pypi.nvidia.com'
 numpy < 1.24; platform_machine == 'x86_64'
-tensorrt == 10.5.0; platform_machine == 'x86_64'
-cuda-python == 12.6.*; platform_machine == 'x86_64'
-cython == 3.0.*; platform_machine == 'x86_64'
+tensorrt == 8.5.3.*; platform_machine == 'x86_64'
+cuda-python == 11.8; platform_machine == 'x86_64'
+cython == 0.29.*; platform_machine == 'x86_64'
 nvidia-cuda-runtime-cu12 == 12.1.*; platform_machine == 'x86_64'
+nvidia-cuda-runtime-cu11 == 11.8.*; platform_machine == 'x86_64'
+nvidia-cublas-cu11 == 11.11.3.6; platform_machine == 'x86_64'
+nvidia-cudnn-cu11 == 8.6.0.*; platform_machine == 'x86_64'
+nvidia-cufft-cu11==10.*; platform_machine == 'x86_64'
 onnx==1.16.*; platform_machine == 'x86_64'
-onnxruntime-gpu==1.20.*; platform_machine == 'x86_64'
+onnxruntime-gpu==1.18.*; platform_machine == 'x86_64'
 protobuf==3.20.3; platform_machine == 'x86_64'

docs/docs/configuration/face_recognition.md

@@ -1,35 +0,0 @@
----
-id: face_recognition
-title: Face Recognition
----
-
-Face recognition allows people to be assigned names and when their face is recognized Frigate will assign the person's name as a sub label. This information is included in the UI, filters, as well as in notifications.
-
-Frigate has support for FaceNet to create face embeddings, which runs locally. Embeddings are then saved to Frigate's database.
-
-## Minimum System Requirements
-
-Face recognition works by running a large AI model locally on your system. Systems without a GPU will not run Face Recognition reliably or at all.
-
-## Configuration
-
-Face recognition is disabled by default and requires semantic search to be enabled, face recognition must be enabled in your config file before it can be used. Semantic Search and face recognition are global configuration settings.
-
-```yaml
-face_recognition:
-  enabled: true
-```
-
-## Dataset
-
-The number of images needed for a sufficient training set for face recognition varies depending on several factors:
-
-- Complexity of the task: A simple task like recognizing faces of known individuals may require fewer images than a complex task like identifying unknown individuals in a large crowd.
-- Diversity of the dataset: A dataset with diverse images, including variations in lighting, pose, and facial expressions, will require fewer images per person than a less diverse dataset.
-- Desired accuracy: The higher the desired accuracy, the more images are typically needed.
-
-However, here are some general guidelines:
-
-- Minimum: For basic face recognition tasks, a minimum of 10-20 images per person is often recommended.
-- Recommended: For more robust and accurate systems, 30-50 images per person is a good starting point.
-- Ideal: For optimal performance, especially in challenging conditions, 100 or more images per person can be beneficial.

docs/docs/configuration/index.md

@@ -203,14 +203,13 @@ detectors:
   ov:
     type: openvino
     device: AUTO
-    model:
-      path: /openvino-model/ssdlite_mobilenet_v2.xml
 
 model:
   width: 300
   height: 300
   input_tensor: nhwc
   input_pixel_format: bgr
+  path: /openvino-model/ssdlite_mobilenet_v2.xml
   labelmap_path: /openvino-model/coco_91cl_bkgr.txt
 
 record:

docs/docs/configuration/license_plate_recognition.md

@@ -1,45 +0,0 @@
----
-id: license_plate_recognition
-title: License Plate Recognition (LPR)
----
-
-Frigate can recognize license plates on vehicles and automatically add the detected characters as a `sub_label` to objects that are of type `car`. A common use case may be to read the license plates of cars pulling into a driveway or cars passing by on a street with a dedicated LPR camera.
-
-Users running a Frigate+ model should ensure that `license_plate` is added to the [list of objects to track](https://docs.frigate.video/plus/#available-label-types) either globally or for a specific camera. This will improve the accuracy and performance of the LPR model.
-
-LPR is most effective when the vehicle’s license plate is fully visible to the camera. For moving vehicles, Frigate will attempt to read the plate continuously, refining its detection and keeping the most confident result. LPR will not run on stationary vehicles.
-
-## Minimum System Requirements
-
-License plate recognition works by running AI models locally on your system. The models are relatively lightweight and run on your CPU. At least 4GB of RAM is required.
-
-## Configuration
-
-License plate recognition is disabled by default. Enable it in your config file:
-
-```yaml
-lpr:
-  enabled: true
-```
-
-## Advanced Configuration
-
-Several options are available to fine-tune the LPR feature. For example, you can adjust the `min_area` setting, which defines the minimum size in pixels a license plate must be before LPR runs. The default is 500 pixels.
-
-Additionally, you can define `known_plates` as strings or regular expressions, allowing Frigate to label tracked vehicles with custom sub_labels when a recognized plate is detected. This information is then accessible in the UI, filters, and notifications.
-
-```yaml
-lpr:
-  enabled: true
-  min_area: 500
-  known_plates:
-    Wife's Car:
-      - "ABC-1234"
-      - "ABC-I234"
-    Johnny:
-      - "J*N-*234" # Using wildcards for H/M and 1/I
-    Sally:
-      - "[S5]LL-1234" # Matches SLL-1234 and 5LL-1234
-```
-
-In this example, "Wife's Car" will appear as the label for any vehicle matching the plate "ABC-1234." The model might occasionally interpret the digit 1 as a capital I (e.g., "ABC-I234"), so both variations are listed. Similarly, multiple possible variations are specified for Johnny and Sally.

docs/docs/configuration/live.md

@@ -29,7 +29,7 @@ The default video and audio codec on your camera may not always be compatible wi
 
 ### Audio Support
 
-MSE Requires AAC audio, WebRTC requires PCMU/PCMA, or opus audio. If you want to support both MSE and WebRTC then your restream config needs to make sure both are enabled.
+MSE Requires PCMA/PCMU or AAC audio, WebRTC requires PCMA/PCMU or opus audio. If you want to support both MSE and WebRTC then your restream config needs to make sure both are enabled.
 
 ```yaml
 go2rtc:

docs/docs/configuration/object_detectors.md

@@ -144,7 +144,9 @@ detectors:
 
 #### SSDLite MobileNet v2
 
-An OpenVINO model is provided in the container at `/openvino-model/ssdlite_mobilenet_v2.xml` and is used by this detector type by default. The model comes from Intel's Open Model Zoo [SSDLite MobileNet V2](https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/ssdlite_mobilenet_v2) and is converted to an FP16 precision IR model. Use the model configuration shown below when using the OpenVINO detector with the default model.
+An OpenVINO model is provided in the container at `/openvino-model/ssdlite_mobilenet_v2.xml` and is used by this detector type by default. The model comes from Intel's Open Model Zoo [SSDLite MobileNet V2](https://github.com/openvinotoolkit/open_model_zoo/tree/master/models/public/ssdlite_mobilenet_v2) and is converted to an FP16 precision IR model.
+
+Use the model configuration shown below when using the OpenVINO detector with the default OpenVINO model:
 
 ```yaml
 detectors:
@@ -254,6 +256,7 @@ yolov4x-mish-640
 yolov7-tiny-288
 yolov7-tiny-416
 yolov7-640
+yolov7-416
 yolov7-320
 yolov7x-640
 yolov7x-320
@@ -282,6 +285,8 @@ The TensorRT detector can be selected by specifying `tensorrt` as the model type
 
 The TensorRT detector uses `.trt` model files that are located in `/config/model_cache/tensorrt` by default. These model path and dimensions used will depend on which model you have generated.
 
+Use the config below to work with generated TRT models:
+
 ```yaml
 detectors:
   tensorrt:
@@ -501,11 +506,12 @@ detectors:
   cpu1:
     type: cpu
     num_threads: 3
-    model:
-      path: "/custom_model.tflite"
   cpu2:
     type: cpu
     num_threads: 3
+
+model:
+  path: "/custom_model.tflite"
 ```
 
 When using CPU detectors, you can add one CPU detector per camera. Adding more detectors than the number of cameras should not improve performance.
@@ -632,8 +638,6 @@ detectors:
   hailo8l:
     type: hailo8l
     device: PCIe
-    model:
-      path: /config/model_cache/h8l_cache/ssd_mobilenet_v1.hef
 
 model:
   width: 300
@@ -641,4 +645,5 @@ model:
   input_tensor: nhwc
   input_pixel_format: bgr
   model_type: ssd
+  path: /config/model_cache/h8l_cache/ssd_mobilenet_v1.hef
 ```

docs/docs/configuration/reference.md

@@ -52,7 +52,7 @@ detectors:
   # Required: name of the detector
   detector_name:
     # Required: type of the detector
-    # Frigate provided types include 'cpu', 'edgetpu', 'openvino' and 'tensorrt' (default: shown below)
+    # Frigate provides many types, see https://docs.frigate.video/configuration/object_detectors for more details (default: shown below)
     # Additional detector types can also be plugged in.
     # Detectors may require additional configuration.
     # Refer to the Detectors configuration page for more information.
@@ -117,25 +117,27 @@ auth:
   hash_iterations: 600000
 
 # Optional: model modifications
+# NOTE: The default values are for the EdgeTPU detector.
+# Other detectors will require the model config to be set.
 model:
-  # Optional: path to the model (default: automatic based on detector)
+  # Required: path to the model (default: automatic based on detector)
   path: /edgetpu_model.tflite
-  # Optional: path to the labelmap (default: shown below)
+  # Required: path to the labelmap (default: shown below)
   labelmap_path: /labelmap.txt
   # Required: Object detection model input width (default: shown below)
   width: 320
   # Required: Object detection model input height (default: shown below)
   height: 320
-  # Optional: Object detection model input colorspace
+  # Required: Object detection model input colorspace
   # Valid values are rgb, bgr, or yuv. (default: shown below)
   input_pixel_format: rgb
-  # Optional: Object detection model input tensor format
+  # Required: Object detection model input tensor format
   # Valid values are nhwc or nchw (default: shown below)
   input_tensor: nhwc
-  # Optional: Object detection model type, currently only used with the OpenVINO detector
+  # Required: Object detection model type, currently only used with the OpenVINO detector
   # Valid values are ssd, yolox, yolonas (default: shown below)
   model_type: ssd
-  # Optional: Label name modifications. These are merged into the standard labelmap.
+  # Required: Label name modifications. These are merged into the standard labelmap.
   labelmap:
     2: vehicle
   # Optional: Map of object labels to their attribute labels (default: depends on model)
@@ -522,14 +524,6 @@ semantic_search:
   # NOTE: small model runs on CPU and large model runs on GPU
   model_size: "small"
 
-# Optional: Configuration for face recognition capability
-face_recognition:
-  # Optional: Enable semantic search (default: shown below)
-  enabled: False
-  # Optional: Set the model size used for embeddings. (default: shown below)
-  # NOTE: small model runs on CPU and large model runs on GPU
-  model_size: "small"
-
 # Optional: Configuration for AI generated tracked object descriptions
 # NOTE: Semantic Search must be enabled for this to do anything.
 # WARNING: Depending on the provider, this will send thumbnails over the internet

docs/sidebars.ts

@@ -36,8 +36,6 @@ const sidebars: SidebarsConfig = {
       'Semantic Search': [
         'configuration/semantic_search',
         'configuration/genai',
-        'configuration/face_recognition',
-        'configuration/license_plate_recognition',
       ],
       Cameras: [
         'configuration/cameras',

frigate/__main__.py

@@ -3,15 +3,12 @@ import faulthandler
 import signal
 import sys
 import threading
-from typing import Union
 
-import ruamel.yaml
 from pydantic import ValidationError
 
 from frigate.app import FrigateApp
 from frigate.config import FrigateConfig
 from frigate.log import setup_logging
-from frigate.util.config import find_config_file
 
 
 def main() -> None:
@@ -45,50 +42,10 @@ def main() -> None:
         print("*************************************************************")
         print("*************************************************************")
         print("***    Config Validation Errors                           ***")
-        print("*************************************************************\n")
-        # Attempt to get the original config file for line number tracking
-        config_path = find_config_file()
-        with open(config_path, "r") as f:
-            yaml_config = ruamel.yaml.YAML()
-            yaml_config.preserve_quotes = True
-            full_config = yaml_config.load(f)
-
+        print("*************************************************************")
         for error in e.errors():
-            error_path = error["loc"]
-
-            current = full_config
-            line_number = "Unknown"
-            last_line_number = "Unknown"
-
-            try:
-                for i, part in enumerate(error_path):
-                    key: Union[int, str] = (
-                        int(part) if isinstance(part, str) and part.isdigit() else part
-                    )
-
-                    if isinstance(current, ruamel.yaml.comments.CommentedMap):
-                        current = current[key]
-                    elif isinstance(current, list):
-                        if isinstance(key, int):
-                            current = current[key]
-
-                    if hasattr(current, "lc"):
-                        last_line_number = current.lc.line
-
-                    if i == len(error_path) - 1:
-                        if hasattr(current, "lc"):
-                            line_number = current.lc.line
-                        else:
-                            line_number = last_line_number
-
-            except Exception as traverse_error:
-                print(f"Could not determine exact line number: {traverse_error}")
-
-            print(f"Line #  : {line_number}")
-            print(f"Key     : {' -> '.join(map(str, error_path))}")
-            print(f"Value   : {error.get('input','-')}")
-            print(f"Message : {error.get('msg', error.get('type', 'Unknown'))}\n")
-
+            location = ".".join(str(item) for item in error["loc"])
+            print(f"{location}: {error['msg']}")
         print("*************************************************************")
         print("***    End Config Validation Errors                       ***")
         print("*************************************************************")

frigate/api/app.py

@@ -7,18 +7,15 @@ import os
 import traceback
 from datetime import datetime, timedelta
 from functools import reduce
-from io import StringIO
 from typing import Any, Optional
 
 import requests
-import ruamel.yaml
 from fastapi import APIRouter, Body, Path, Request, Response
 from fastapi.encoders import jsonable_encoder
 from fastapi.params import Depends
 from fastapi.responses import JSONResponse, PlainTextResponse
 from markupsafe import escape
 from peewee import operator
-from pydantic import ValidationError
 
 from frigate.api.defs.query.app_query_parameters import AppTimelineHourlyQueryParameters
 from frigate.api.defs.request.app_body import AppConfigSetBody
@@ -142,6 +139,8 @@ def config(request: Request):
         mode="json", warnings="none", exclude_none=True
     )
     for stream_name, stream in go2rtc.get("streams", {}).items():
+        if stream is None:
+            continue
         if isinstance(stream, str):
             cleaned = clean_camera_user_pass(stream)
         else:
@@ -186,6 +185,7 @@ def config_raw():
 @router.post("/config/save")
 def config_save(save_option: str, body: Any = Body(media_type="text/plain")):
     new_config = body.decode()
+
     if not new_config:
         return JSONResponse(
             content=(
@@ -196,64 +196,13 @@ def config_save(save_option: str, body: Any = Body(media_type="text/plain")):
 
     # Validate the config schema
     try:
-        # Use ruamel to parse and preserve line numbers
-        yaml_config = ruamel.yaml.YAML()
-        yaml_config.preserve_quotes = True
-        full_config = yaml_config.load(StringIO(new_config))
-
         FrigateConfig.parse_yaml(new_config)
-
-    except ValidationError as e:
-        error_message = []
-
-        for error in e.errors():
-            error_path = error["loc"]
-            current = full_config
-            line_number = "Unknown"
-            last_line_number = "Unknown"
-
-            try:
-                for i, part in enumerate(error_path):
-                    key = int(part) if part.isdigit() else part
-
-                    if isinstance(current, ruamel.yaml.comments.CommentedMap):
-                        current = current[key]
-                    elif isinstance(current, list):
-                        current = current[key]
-
-                    if hasattr(current, "lc"):
-                        last_line_number = current.lc.line
-
-                    if i == len(error_path) - 1:
-                        if hasattr(current, "lc"):
-                            line_number = current.lc.line
-                        else:
-                            line_number = last_line_number
-
-            except Exception:
-                line_number = "Unable to determine"
-
-            error_message.append(
-                f"Line {line_number}: {' -> '.join(map(str, error_path))} - {error.get('msg', error.get('type', 'Unknown'))}"
-            )
-
-        return JSONResponse(
-            content=(
-                {
-                    "success": False,
-                    "message": "Your configuration is invalid.\nSee the official documentation at docs.frigate.video.\n\n"
-                    + "\n".join(error_message),
-                }
-            ),
-            status_code=400,
-        )
-
     except Exception:
         return JSONResponse(
             content=(
                 {
                     "success": False,
-                    "message": f"\nYour configuration is invalid.\nSee the official documentation at docs.frigate.video.\n\n{escape(str(traceback.format_exc()))}",
+                    "message": f"\nConfig Error:\n\n{escape(str(traceback.format_exc()))}",
                 }
             ),
             status_code=400,

frigate/api/classification.py

@@ -1,59 +0,0 @@
-"""Object classification APIs."""
-
-import logging
-import os
-
-from fastapi import APIRouter, Request, UploadFile
-from fastapi.responses import JSONResponse
-from pathvalidate import sanitize_filename
-
-from frigate.api.defs.tags import Tags
-from frigate.const import FACE_DIR
-from frigate.embeddings import EmbeddingsContext
-
-logger = logging.getLogger(__name__)
-
-router = APIRouter(tags=[Tags.events])
-
-
-@router.get("/faces")
-def get_faces():
-    face_dict: dict[str, list[str]] = {}
-
-    for name in os.listdir(FACE_DIR):
-        face_dict[name] = []
-        for file in os.listdir(os.path.join(FACE_DIR, name)):
-            face_dict[name].append(file)
-
-    return JSONResponse(status_code=200, content=face_dict)
-
-
-@router.post("/faces/{name}")
-async def register_face(request: Request, name: str, file: UploadFile):
-    context: EmbeddingsContext = request.app.embeddings
-    context.register_face(name, await file.read())
-    return JSONResponse(
-        status_code=200,
-        content={"success": True, "message": "Successfully registered face."},
-    )
-
-
-@router.post("/faces/{name}/delete")
-def deregister_faces(request: Request, name: str, body: dict = None):
-    json: dict[str, any] = body or {}
-    list_of_ids = json.get("ids", "")
-
-    if not list_of_ids or len(list_of_ids) == 0:
-        return JSONResponse(
-            content=({"success": False, "message": "Not a valid list of ids"}),
-            status_code=404,
-        )
-
-    context: EmbeddingsContext = request.app.embeddings
-    context.delete_face_ids(
-        name, map(lambda file: sanitize_filename(file), list_of_ids)
-    )
-    return JSONResponse(
-        content=({"success": True, "message": "Successfully deleted faces."}),
-        status_code=200,
-    )

frigate/api/defs/query/media_query_parameters.py

@@ -20,7 +20,6 @@ class MediaLatestFrameQueryParams(BaseModel):
     regions: Optional[int] = None
     quality: Optional[int] = 70
     height: Optional[int] = None
-    store: Optional[int] = None
 
 
 class MediaEventsSnapshotQueryParams(BaseModel):

frigate/api/defs/request/events_body.py

@@ -8,9 +8,6 @@ class EventsSubLabelBody(BaseModel):
     subLabelScore: Optional[float] = Field(
         title="Score for sub label", default=None, gt=0.0, le=1.0
     )
-    camera: Optional[str] = Field(
-        title="Camera this object is detected on.", default=None
-    )
 
 
 class EventsDescriptionBody(BaseModel):

frigate/api/defs/tags.py

@@ -10,5 +10,4 @@ class Tags(Enum):
     review = "Review"
     export = "Export"
     events = "Events"
-    classification = "classification"
     auth = "Auth"

frigate/api/event.py

@@ -909,59 +909,38 @@ def set_sub_label(
     try:
         event: Event = Event.get(Event.id == event_id)
     except DoesNotExist:
-        if not body.camera:
-            return JSONResponse(
-                content=(
-                    {
-                        "success": False,
-                        "message": "Event "
-                        + event_id
-                        + " not found and camera is not provided.",
-                    }
-                ),
-                status_code=404,
-            )
-
-        event = None
-
-    if request.app.detected_frames_processor:
-        tracked_obj: TrackedObject = (
-            request.app.detected_frames_processor.camera_states[
-                event.camera if event else body.camera
-            ].tracked_objects.get(event_id)
-        )
-    else:
-        tracked_obj = None
-
-    if not event and not tracked_obj:
         return JSONResponse(
-            content=(
-                {"success": False, "message": "Event " + event_id + " not found."}
-            ),
+            content=({"success": False, "message": "Event " + event_id + " not found"}),
             status_code=404,
         )
 
     new_sub_label = body.subLabel
     new_score = body.subLabelScore
 
-    if tracked_obj:
-        tracked_obj.obj_data["sub_label"] = (new_sub_label, new_score)
+    if not event.end_time:
+        # update tracked object
+        tracked_obj: TrackedObject = (
+            request.app.detected_frames_processor.camera_states[
+                event.camera
+            ].tracked_objects.get(event.id)
+        )
+
+        if tracked_obj:
+            tracked_obj.obj_data["sub_label"] = (new_sub_label, new_score)
 
         # update timeline items
         Timeline.update(
             data=Timeline.data.update({"sub_label": (new_sub_label, new_score)})
         ).where(Timeline.source_id == event_id).execute()
 
-    if event:
-        event.sub_label = new_sub_label
+    event.sub_label = new_sub_label
 
-        if new_score:
-            data = event.data
-            data["sub_label_score"] = new_score
-            event.data = data
-
-        event.save()
+    if new_score:
+        data = event.data
+        data["sub_label_score"] = new_score
+        event.data = data
 
+    event.save()
     return JSONResponse(
         content=(
             {

frigate/api/fastapi_app.py

@@ -11,16 +11,7 @@ from starlette_context import middleware, plugins
 from starlette_context.plugins import Plugin
 
 from frigate.api import app as main_app
-from frigate.api import (
-    auth,
-    classification,
-    event,
-    export,
-    media,
-    notification,
-    preview,
-    review,
-)
+from frigate.api import auth, event, export, media, notification, preview, review
 from frigate.api.auth import get_jwt_secret, limiter
 from frigate.comms.event_metadata_updater import (
     EventMetadataPublisher,
@@ -108,7 +99,6 @@ def create_fastapi_app(
     # Routes
     # Order of include_router matters: https://fastapi.tiangolo.com/tutorial/path-params/#order-matters
     app.include_router(auth.router)
-    app.include_router(classification.router)
     app.include_router(review.router)
     app.include_router(main_app.router)
     app.include_router(preview.router)

frigate/api/media.py

@@ -179,12 +179,7 @@ def latest_frame(
         return Response(
             content=img.tobytes(),
             media_type=f"image/{extension}",
-            headers={
-                "Content-Type": f"image/{extension}",
-                "Cache-Control": "no-store"
-                if not params.store
-                else "private, max-age=60",
-            },
+            headers={"Content-Type": f"image/{extension}", "Cache-Control": "no-store"},
         )
     elif camera_name == "birdseye" and request.app.frigate_config.birdseye.restream:
         frame = cv2.cvtColor(
@@ -203,12 +198,7 @@ def latest_frame(
         return Response(
             content=img.tobytes(),
             media_type=f"image/{extension}",
-            headers={
-                "Content-Type": f"image/{extension}",
-                "Cache-Control": "no-store"
-                if not params.store
-                else "private, max-age=60",
-            },
+            headers={"Content-Type": f"image/{extension}", "Cache-Control": "no-store"},
         )
     else:
         return JSONResponse(

frigate/comms/embeddings_updater.py

@@ -12,7 +12,6 @@ class EmbeddingsRequestEnum(Enum):
     embed_description = "embed_description"
     embed_thumbnail = "embed_thumbnail"
     generate_search = "generate_search"
-    register_face = "register_face"
 
 
 class EmbeddingsResponder:
@@ -23,7 +22,7 @@ class EmbeddingsResponder:
 
     def check_for_request(self, process: Callable) -> None:
         while True:  # load all messages that are queued
-            has_message, _, _ = zmq.select([self.socket], [], [], 0.01)
+            has_message, _, _ = zmq.select([self.socket], [], [], 0.1)
 
             if not has_message:
                 break

frigate/config/camera/objects.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional, Union
 
-from pydantic import Field, PrivateAttr, field_serializer
+from pydantic import Field, field_serializer
 
 from ..base import FrigateBaseModel
 
@@ -53,20 +53,3 @@ class ObjectConfig(FrigateBaseModel):
         default_factory=dict, title="Object filters."
     )
     mask: Union[str, list[str]] = Field(default="", title="Object mask.")
-    _all_objects: list[str] = PrivateAttr()
-
-    @property
-    def all_objects(self) -> list[str]:
-        return self._all_objects
-
-    def parse_all_objects(self, cameras):
-        if "_all_objects" in self:
-            return
-
-        # get list of unique enabled labels for tracking
-        enabled_labels = set(self.track)
-
-        for camera in cameras.values():
-            enabled_labels.update(camera.objects.track)
-
-        self._all_objects = list(enabled_labels)

frigate/config/config.py

@@ -57,11 +57,7 @@ from .logger import LoggerConfig
 from .mqtt import MqttConfig
 from .notification import NotificationConfig
 from .proxy import ProxyConfig
-from .semantic_search import (
-    FaceRecognitionConfig,
-    LicensePlateRecognitionConfig,
-    SemanticSearchConfig,
-)
+from .semantic_search import SemanticSearchConfig
 from .telemetry import TelemetryConfig
 from .tls import TlsConfig
 from .ui import UIConfig
@@ -163,16 +159,6 @@ class RestreamConfig(BaseModel):
     model_config = ConfigDict(extra="allow")
 
 
-def verify_semantic_search_dependent_configs(config: FrigateConfig) -> None:
-    """Verify that semantic search is enabled if required features are enabled."""
-    if not config.semantic_search.enabled:
-        if config.genai.enabled:
-            raise ValueError("Genai requires semantic search to be enabled.")
-
-        if config.face_recognition.enabled:
-            raise ValueError("Face recognition requires semantic to be enabled.")
-
-
 def verify_config_roles(camera_config: CameraConfig) -> None:
     """Verify that roles are setup in the config correctly."""
     assigned_roles = list(
@@ -334,13 +320,6 @@ class FrigateConfig(FrigateBaseModel):
     semantic_search: SemanticSearchConfig = Field(
         default_factory=SemanticSearchConfig, title="Semantic search configuration."
     )
-    face_recognition: FaceRecognitionConfig = Field(
-        default_factory=FaceRecognitionConfig, title="Face recognition config."
-    )
-    lpr: LicensePlateRecognitionConfig = Field(
-        default_factory=LicensePlateRecognitionConfig,
-        title="License Plate recognition config.",
-    )
     ui: UIConfig = Field(default_factory=UIConfig, title="UI configuration.")
 
     # Detector config
@@ -599,8 +578,13 @@ class FrigateConfig(FrigateBaseModel):
             verify_autotrack_zones(camera_config)
             verify_motion_and_detect(camera_config)
 
-        self.objects.parse_all_objects(self.cameras)
-        self.model.create_colormap(sorted(self.objects.all_objects))
+        # get list of unique enabled labels for tracking
+        enabled_labels = set(self.objects.track)
+
+        for camera in self.cameras.values():
+            enabled_labels.update(camera.objects.track)
+
+        self.model.create_colormap(sorted(enabled_labels))
         self.model.check_and_load_plus_model(self.plus_api)
 
         for key, detector in self.detectors.items():
@@ -610,38 +594,29 @@ class FrigateConfig(FrigateBaseModel):
                 if isinstance(detector, dict)
                 else detector.model_dump(warnings="none")
             )
-            detector_config: DetectorConfig = adapter.validate_python(model_dict)
-            if detector_config.model is None:
-                detector_config.model = self.model.model_copy()
-            else:
-                path = detector_config.model.path
-                detector_config.model = self.model.model_copy()
-                detector_config.model.path = path
+            detector_config: BaseDetectorConfig = adapter.validate_python(model_dict)
 
-                if "path" not in model_dict or len(model_dict.keys()) > 1:
-                    logger.warning(
-                        "Customizing more than a detector model path is unsupported."
-                    )
+            # users should not set model themselves
+            if detector_config.model:
+                detector_config.model = None
 
-            merged_model = deep_merge(
-                detector_config.model.model_dump(exclude_unset=True, warnings="none"),
-                self.model.model_dump(exclude_unset=True, warnings="none"),
-            )
+            model_config = self.model.model_dump(exclude_unset=True, warnings="none")
 
-            if "path" not in merged_model:
+            if detector_config.model_path:
+                model_config["path"] = detector_config.model_path
+
+            if "path" not in model_config:
                 if detector_config.type == "cpu":
-                    merged_model["path"] = "/cpu_model.tflite"
+                    model_config["path"] = "/cpu_model.tflite"
                 elif detector_config.type == "edgetpu":
-                    merged_model["path"] = "/edgetpu_model.tflite"
+                    model_config["path"] = "/edgetpu_model.tflite"
 
-            detector_config.model = ModelConfig.model_validate(merged_model)
-            detector_config.model.check_and_load_plus_model(
-                self.plus_api, detector_config.type
-            )
-            detector_config.model.compute_model_hash()
+            model = ModelConfig.model_validate(model_config)
+            model.check_and_load_plus_model(self.plus_api, detector_config.type)
+            model.compute_model_hash()
+            detector_config.model = model
             self.detectors[key] = detector_config
 
-        verify_semantic_search_dependent_configs(self)
         return self
 
     @field_validator("cameras")

frigate/config/semantic_search.py

@@ -1,14 +1,10 @@
-from typing import Dict, List, Optional
+from typing import Optional
 
 from pydantic import Field
 
 from .base import FrigateBaseModel
 
-__all__ = [
-    "FaceRecognitionConfig",
-    "SemanticSearchConfig",
-    "LicensePlateRecognitionConfig",
-]
+__all__ = ["SemanticSearchConfig"]
 
 
 class SemanticSearchConfig(FrigateBaseModel):
@@ -19,40 +15,3 @@ class SemanticSearchConfig(FrigateBaseModel):
     model_size: str = Field(
         default="small", title="The size of the embeddings model used."
     )
-
-
-class FaceRecognitionConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable face recognition.")
-    min_score: float = Field(
-        title="Minimum face distance score required to save the attempt.",
-        default=0.8,
-        gt=0.0,
-        le=1.0,
-    )
-    threshold: float = Field(
-        default=0.9,
-        title="Minimum face distance score required to be considered a match.",
-        gt=0.0,
-        le=1.0,
-    )
-    min_area: int = Field(
-        default=500, title="Min area of face box to consider running face recognition."
-    )
-    save_attempts: bool = Field(
-        default=True, title="Save images of face detections for training."
-    )
-
-
-class LicensePlateRecognitionConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable license plate recognition.")
-    threshold: float = Field(
-        default=0.9,
-        title="License plate confidence score required to be added to the object as a sub label.",
-    )
-    min_area: int = Field(
-        default=500,
-        title="Min area of license plate to consider running license plate recognition.",
-    )
-    known_plates: Optional[Dict[str, List[str]]] = Field(
-        default={}, title="Known plates to track."
-    )

frigate/const.py

@@ -5,9 +5,8 @@ DEFAULT_DB_PATH = f"{CONFIG_DIR}/frigate.db"
 MODEL_CACHE_DIR = f"{CONFIG_DIR}/model_cache"
 BASE_DIR = "/media/frigate"
 CLIPS_DIR = f"{BASE_DIR}/clips"
-EXPORT_DIR = f"{BASE_DIR}/exports"
-FACE_DIR = f"{CLIPS_DIR}/faces"
 RECORD_DIR = f"{BASE_DIR}/recordings"
+EXPORT_DIR = f"{BASE_DIR}/exports"
 BIRDSEYE_PIPE = "/tmp/cache/birdseye"
 CACHE_DIR = "/tmp/cache"
 FRIGATE_LOCALHOST = "http://127.0.0.1:5000"

frigate/detectors/detector_config.py

@@ -194,6 +194,9 @@ class BaseDetectorConfig(BaseModel):
     model: Optional[ModelConfig] = Field(
         default=None, title="Detector specific model configuration."
     )
+    model_path: Optional[str] = Field(
+        default=None, title="Detector specific model path."
+    )
     model_config = ConfigDict(
         extra="allow", arbitrary_types_allowed=True, protected_namespaces=()
     )

frigate/embeddings/__init__.py

@@ -1,6 +1,5 @@
 """SQLite-vec embeddings database."""
 
-import base64
 import json
 import logging
 import multiprocessing as mp
@@ -14,7 +13,7 @@ from setproctitle import setproctitle
 
 from frigate.comms.embeddings_updater import EmbeddingsRequestEnum, EmbeddingsRequestor
 from frigate.config import FrigateConfig
-from frigate.const import CONFIG_DIR, FACE_DIR
+from frigate.const import CONFIG_DIR
 from frigate.db.sqlitevecq import SqliteVecQueueDatabase
 from frigate.models import Event
 from frigate.util.builtin import serialize
@@ -190,33 +189,6 @@ class EmbeddingsContext:
 
         return results
 
-    def register_face(self, face_name: str, image_data: bytes) -> None:
-        self.requestor.send_data(
-            EmbeddingsRequestEnum.register_face.value,
-            {
-                "face_name": face_name,
-                "image": base64.b64encode(image_data).decode("ASCII"),
-            },
-        )
-
-    def get_face_ids(self, name: str) -> list[str]:
-        sql_query = f"""
-            SELECT
-                id
-            FROM vec_descriptions
-            WHERE id LIKE '%{name}%'
-        """
-
-        return self.db.execute_sql(sql_query).fetchall()
-
-    def delete_face_ids(self, face: str, ids: list[str]) -> None:
-        folder = os.path.join(FACE_DIR, face)
-        for id in ids:
-            file_path = os.path.join(folder, id)
-
-            if os.path.isfile(file_path):
-                os.unlink(file_path)
-
     def update_description(self, event_id: str, description: str) -> None:
         self.requestor.send_data(
             EmbeddingsRequestEnum.embed_description.value,

frigate/embeddings/embeddings.py

@@ -9,7 +9,7 @@ from numpy import ndarray
 from playhouse.shortcuts import model_to_dict
 
 from frigate.comms.inter_process import InterProcessRequestor
-from frigate.config import FrigateConfig
+from frigate.config.semantic_search import SemanticSearchConfig
 from frigate.const import (
     CONFIG_DIR,
     UPDATE_EMBEDDINGS_REINDEX_PROGRESS,
@@ -59,7 +59,9 @@ def get_metadata(event: Event) -> dict:
 class Embeddings:
     """SQLite-vec embeddings database."""
 
-    def __init__(self, config: FrigateConfig, db: SqliteVecQueueDatabase) -> None:
+    def __init__(
+        self, config: SemanticSearchConfig, db: SqliteVecQueueDatabase
+    ) -> None:
         self.config = config
         self.db = db
         self.requestor = InterProcessRequestor()
@@ -71,13 +73,9 @@ class Embeddings:
             "jinaai/jina-clip-v1-text_model_fp16.onnx",
             "jinaai/jina-clip-v1-tokenizer",
             "jinaai/jina-clip-v1-vision_model_fp16.onnx"
-            if config.semantic_search.model_size == "large"
+            if config.model_size == "large"
             else "jinaai/jina-clip-v1-vision_model_quantized.onnx",
             "jinaai/jina-clip-v1-preprocessor_config.json",
-            "facenet-facenet.onnx",
-            "paddleocr-onnx-detection.onnx",
-            "paddleocr-onnx-classification.onnx",
-            "paddleocr-onnx-recognition.onnx",
         ]
 
         for model in models:
@@ -96,7 +94,7 @@ class Embeddings:
             download_urls={
                 "text_model_fp16.onnx": "https://huggingface.co/jinaai/jina-clip-v1/resolve/main/onnx/text_model_fp16.onnx",
             },
-            model_size=config.semantic_search.model_size,
+            model_size=config.model_size,
             model_type=ModelTypeEnum.text,
             requestor=self.requestor,
             device="CPU",
@@ -104,7 +102,7 @@ class Embeddings:
 
         model_file = (
             "vision_model_fp16.onnx"
-            if self.config.semantic_search.model_size == "large"
+            if self.config.model_size == "large"
             else "vision_model_quantized.onnx"
         )
 
@@ -117,66 +115,12 @@ class Embeddings:
             model_name="jinaai/jina-clip-v1",
             model_file=model_file,
             download_urls=download_urls,
-            model_size=config.semantic_search.model_size,
+            model_size=config.model_size,
             model_type=ModelTypeEnum.vision,
             requestor=self.requestor,
-            device="GPU" if config.semantic_search.model_size == "large" else "CPU",
+            device="GPU" if config.model_size == "large" else "CPU",
         )
 
-        if self.config.face_recognition.enabled:
-            self.face_embedding = GenericONNXEmbedding(
-                model_name="facedet",
-                model_file="facedet.onnx",
-                download_urls={
-                    "facedet.onnx": "https://github.com/NickM-27/facenet-onnx/releases/download/v1.0/facedet.onnx",
-                    "landmarkdet.yaml": "https://github.com/NickM-27/facenet-onnx/releases/download/v1.0/landmarkdet.yaml",
-                },
-                model_size="small",
-                model_type=ModelTypeEnum.face,
-                requestor=self.requestor,
-            )
-
-        self.lpr_detection_model = None
-        self.lpr_classification_model = None
-        self.lpr_recognition_model = None
-
-        if self.config.lpr.enabled:
-            self.lpr_detection_model = GenericONNXEmbedding(
-                model_name="paddleocr-onnx",
-                model_file="detection.onnx",
-                download_urls={
-                    "detection.onnx": "https://github.com/hawkeye217/paddleocr-onnx/raw/refs/heads/master/models/detection.onnx"
-                },
-                model_size="large",
-                model_type=ModelTypeEnum.lpr_detect,
-                requestor=self.requestor,
-                device="CPU",
-            )
-
-            self.lpr_classification_model = GenericONNXEmbedding(
-                model_name="paddleocr-onnx",
-                model_file="classification.onnx",
-                download_urls={
-                    "classification.onnx": "https://github.com/hawkeye217/paddleocr-onnx/raw/refs/heads/master/models/classification.onnx"
-                },
-                model_size="large",
-                model_type=ModelTypeEnum.lpr_classify,
-                requestor=self.requestor,
-                device="CPU",
-            )
-
-            self.lpr_recognition_model = GenericONNXEmbedding(
-                model_name="paddleocr-onnx",
-                model_file="recognition.onnx",
-                download_urls={
-                    "recognition.onnx": "https://github.com/hawkeye217/paddleocr-onnx/raw/refs/heads/master/models/recognition.onnx"
-                },
-                model_size="large",
-                model_type=ModelTypeEnum.lpr_recognize,
-                requestor=self.requestor,
-                device="CPU",
-            )
-
     def embed_thumbnail(
         self, event_id: str, thumbnail: bytes, upsert: bool = True
     ) -> ndarray:

frigate/embeddings/functions/onnx.py

@@ -31,16 +31,11 @@ warnings.filterwarnings(
 disable_progress_bar()
 logger = logging.getLogger(__name__)
 
-FACE_EMBEDDING_SIZE = 160
-
 
 class ModelTypeEnum(str, Enum):
     face = "face"
     vision = "vision"
     text = "text"
-    lpr_detect = "lpr_detect"
-    lpr_classify = "lpr_classify"
-    lpr_recognize = "lpr_recognize"
 
 
 class GenericONNXEmbedding:
@@ -52,7 +47,7 @@ class GenericONNXEmbedding:
         model_file: str,
         download_urls: Dict[str, str],
         model_size: str,
-        model_type: ModelTypeEnum,
+        model_type: str,
         requestor: InterProcessRequestor,
         tokenizer_file: Optional[str] = None,
         device: str = "AUTO",
@@ -62,7 +57,7 @@ class GenericONNXEmbedding:
         self.tokenizer_file = tokenizer_file
         self.requestor = requestor
         self.download_urls = download_urls
-        self.model_type = model_type
+        self.model_type = model_type  # 'text' or 'vision'
         self.model_size = model_size
         self.device = device
         self.download_path = os.path.join(MODEL_CACHE_DIR, self.model_name)
@@ -92,13 +87,12 @@ class GenericONNXEmbedding:
                 files_names,
                 ModelStatusTypesEnum.downloaded,
             )
-            self._load_model_and_utils()
+            self._load_model_and_tokenizer()
             logger.debug(f"models are already downloaded for {self.model_name}")
 
     def _download_model(self, path: str):
         try:
             file_name = os.path.basename(path)
-
             if file_name in self.download_urls:
                 ModelDownloader.download_from_url(self.download_urls[file_name], path)
             elif (
@@ -107,7 +101,6 @@ class GenericONNXEmbedding:
             ):
                 if not os.path.exists(path + "/" + self.model_name):
                     logger.info(f"Downloading {self.model_name} tokenizer")
-
                 tokenizer = AutoTokenizer.from_pretrained(
                     self.model_name,
                     trust_remote_code=True,
@@ -132,23 +125,14 @@ class GenericONNXEmbedding:
                 },
             )
 
-    def _load_model_and_utils(self):
+    def _load_model_and_tokenizer(self):
         if self.runner is None:
             if self.downloader:
                 self.downloader.wait_for_download()
             if self.model_type == ModelTypeEnum.text:
                 self.tokenizer = self._load_tokenizer()
-            elif self.model_type == ModelTypeEnum.vision:
+            else:
                 self.feature_extractor = self._load_feature_extractor()
-            elif self.model_type == ModelTypeEnum.face:
-                self.feature_extractor = []
-            elif self.model_type == ModelTypeEnum.lpr_detect:
-                self.feature_extractor = []
-            elif self.model_type == ModelTypeEnum.lpr_classify:
-                self.feature_extractor = []
-            elif self.model_type == ModelTypeEnum.lpr_recognize:
-                self.feature_extractor = []
-
             self.runner = ONNXModelRunner(
                 os.path.join(self.download_path, self.model_file),
                 self.device,
@@ -188,72 +172,23 @@ class GenericONNXEmbedding:
                 self.feature_extractor(images=image, return_tensors="np")
                 for image in processed_images
             ]
-        elif self.model_type == ModelTypeEnum.face:
-            if isinstance(raw_inputs, list):
-                raise ValueError("Face embedding does not support batch inputs.")
-
-            pil = self._process_image(raw_inputs)
-
-            # handle images larger than input size
-            width, height = pil.size
-            if width != FACE_EMBEDDING_SIZE or height != FACE_EMBEDDING_SIZE:
-                if width > height:
-                    new_height = int(((height / width) * FACE_EMBEDDING_SIZE) // 4 * 4)
-                    pil = pil.resize((FACE_EMBEDDING_SIZE, new_height))
-                else:
-                    new_width = int(((width / height) * FACE_EMBEDDING_SIZE) // 4 * 4)
-                    pil = pil.resize((new_width, FACE_EMBEDDING_SIZE))
-
-            og = np.array(pil).astype(np.float32)
-
-            # Image must be FACE_EMBEDDING_SIZExFACE_EMBEDDING_SIZE
-            og_h, og_w, channels = og.shape
-            frame = np.full(
-                (FACE_EMBEDDING_SIZE, FACE_EMBEDDING_SIZE, channels),
-                (0, 0, 0),
-                dtype=np.float32,
-            )
-
-            # compute center offset
-            x_center = (FACE_EMBEDDING_SIZE - og_w) // 2
-            y_center = (FACE_EMBEDDING_SIZE - og_h) // 2
-
-            # copy img image into center of result image
-            frame[y_center : y_center + og_h, x_center : x_center + og_w] = og
-            frame = np.expand_dims(frame, axis=0)
-            return [{"input_2": frame}]
-        elif self.model_type == ModelTypeEnum.lpr_detect:
-            preprocessed = []
-            for x in raw_inputs:
-                preprocessed.append(x)
-            return [{"x": preprocessed[0]}]
-        elif self.model_type == ModelTypeEnum.lpr_classify:
-            processed = []
-            for img in raw_inputs:
-                processed.append({"x": img})
-            return processed
-        elif self.model_type == ModelTypeEnum.lpr_recognize:
-            processed = []
-            for img in raw_inputs:
-                processed.append({"x": img})
-            return processed
         else:
             raise ValueError(f"Unable to preprocess inputs for {self.model_type}")
 
-    def _process_image(self, image, output: str = "RGB") -> Image.Image:
+    def _process_image(self, image):
         if isinstance(image, str):
             if image.startswith("http"):
                 response = requests.get(image)
-                image = Image.open(BytesIO(response.content)).convert(output)
+                image = Image.open(BytesIO(response.content)).convert("RGB")
         elif isinstance(image, bytes):
-            image = Image.open(BytesIO(image)).convert(output)
+            image = Image.open(BytesIO(image)).convert("RGB")
 
         return image
 
     def __call__(
         self, inputs: Union[List[str], List[Image.Image], List[str]]
     ) -> List[np.ndarray]:
-        self._load_model_and_utils()
+        self._load_model_and_tokenizer()
         if self.runner is None or (
             self.tokenizer is None and self.feature_extractor is None
         ):

frigate/embeddings/lpr/lpr.py

@@ -1,808 +0,0 @@
-import logging
-import math
-from typing import List, Tuple
-
-import cv2
-import numpy as np
-from pyclipper import ET_CLOSEDPOLYGON, JT_ROUND, PyclipperOffset
-from shapely.geometry import Polygon
-
-from frigate.comms.inter_process import InterProcessRequestor
-from frigate.config.semantic_search import LicensePlateRecognitionConfig
-from frigate.embeddings.embeddings import Embeddings
-
-logger = logging.getLogger(__name__)
-
-MIN_PLATE_LENGTH = 3
-
-
-class LicensePlateRecognition:
-    def __init__(
-        self,
-        config: LicensePlateRecognitionConfig,
-        requestor: InterProcessRequestor,
-        embeddings: Embeddings,
-    ):
-        self.lpr_config = config
-        self.requestor = requestor
-        self.embeddings = embeddings
-        self.detection_model = self.embeddings.lpr_detection_model
-        self.classification_model = self.embeddings.lpr_classification_model
-        self.recognition_model = self.embeddings.lpr_recognition_model
-        self.ctc_decoder = CTCDecoder()
-
-        self.batch_size = 6
-
-        # Detection specific parameters
-        self.min_size = 3
-        self.max_size = 960
-        self.box_thresh = 0.8
-        self.mask_thresh = 0.8
-
-        if self.lpr_config.enabled:
-            # all models need to be loaded to run LPR
-            self.detection_model._load_model_and_utils()
-            self.classification_model._load_model_and_utils()
-            self.recognition_model._load_model_and_utils()
-
-    def detect(self, image: np.ndarray) -> List[np.ndarray]:
-        """
-        Detect possible license plates in the input image by first resizing and normalizing it,
-        running a detection model, and filtering out low-probability regions.
-
-        Args:
-            image (np.ndarray): The input image in which license plates will be detected.
-
-        Returns:
-            List[np.ndarray]: A list of bounding box coordinates representing detected license plates.
-        """
-        h, w = image.shape[:2]
-
-        if sum([h, w]) < 64:
-            image = self.zero_pad(image)
-
-        resized_image = self.resize_image(image)
-        normalized_image = self.normalize_image(resized_image)
-
-        outputs = self.detection_model([normalized_image])[0]
-        outputs = outputs[0, :, :]
-
-        boxes, _ = self.boxes_from_bitmap(outputs, outputs > self.mask_thresh, w, h)
-        return self.filter_polygon(boxes, (h, w))
-
-    def classify(
-        self, images: List[np.ndarray]
-    ) -> Tuple[List[np.ndarray], List[Tuple[str, float]]]:
-        """
-        Classify the orientation or category of each detected license plate.
-
-        Args:
-            images (List[np.ndarray]): A list of images of detected license plates.
-
-        Returns:
-            Tuple[List[np.ndarray], List[Tuple[str, float]]]: A tuple of rotated/normalized plate images
-                                                            and classification results with confidence scores.
-        """
-        num_images = len(images)
-        indices = np.argsort([x.shape[1] / x.shape[0] for x in images])
-
-        for i in range(0, num_images, self.batch_size):
-            norm_images = []
-            for j in range(i, min(num_images, i + self.batch_size)):
-                norm_img = self._preprocess_classification_image(images[indices[j]])
-                norm_img = norm_img[np.newaxis, :]
-                norm_images.append(norm_img)
-
-        outputs = self.classification_model(norm_images)
-
-        return self._process_classification_output(images, outputs)
-
-    def recognize(
-        self, images: List[np.ndarray]
-    ) -> Tuple[List[str], List[List[float]]]:
-        """
-        Recognize the characters on the detected license plates using the recognition model.
-
-        Args:
-            images (List[np.ndarray]): A list of images of license plates to recognize.
-
-        Returns:
-            Tuple[List[str], List[List[float]]]: A tuple of recognized license plate texts and confidence scores.
-        """
-        input_shape = [3, 48, 320]
-        num_images = len(images)
-
-        # sort images by aspect ratio for processing
-        indices = np.argsort(np.array([x.shape[1] / x.shape[0] for x in images]))
-
-        for index in range(0, num_images, self.batch_size):
-            input_h, input_w = input_shape[1], input_shape[2]
-            max_wh_ratio = input_w / input_h
-            norm_images = []
-
-            # calculate the maximum aspect ratio in the current batch
-            for i in range(index, min(num_images, index + self.batch_size)):
-                h, w = images[indices[i]].shape[0:2]
-                max_wh_ratio = max(max_wh_ratio, w * 1.0 / h)
-
-            # preprocess the images based on the max aspect ratio
-            for i in range(index, min(num_images, index + self.batch_size)):
-                norm_image = self._preprocess_recognition_image(
-                    images[indices[i]], max_wh_ratio
-                )
-                norm_image = norm_image[np.newaxis, :]
-                norm_images.append(norm_image)
-
-        outputs = self.recognition_model(norm_images)
-        return self.ctc_decoder(outputs)
-
-    def process_license_plate(
-        self, image: np.ndarray
-    ) -> Tuple[List[str], List[float], List[int]]:
-        """
-        Complete pipeline for detecting, classifying, and recognizing license plates in the input image.
-
-        Args:
-            image (np.ndarray): The input image in which to detect, classify, and recognize license plates.
-
-        Returns:
-            Tuple[List[str], List[float], List[int]]: Detected license plate texts, confidence scores, and areas of the plates.
-        """
-        if (
-            self.detection_model.runner is None
-            or self.classification_model.runner is None
-            or self.recognition_model.runner is None
-        ):
-            # we might still be downloading the models
-            logger.debug("Model runners not loaded")
-            return [], [], []
-
-        plate_points = self.detect(image)
-        if len(plate_points) == 0:
-            return [], [], []
-
-        plate_points = self.sort_polygon(list(plate_points))
-        plate_images = [self._crop_license_plate(image, x) for x in plate_points]
-        rotated_images, _ = self.classify(plate_images)
-
-        # keep track of the index of each image for correct area calc later
-        sorted_indices = np.argsort([x.shape[1] / x.shape[0] for x in rotated_images])
-        reverse_mapping = {
-            idx: original_idx for original_idx, idx in enumerate(sorted_indices)
-        }
-
-        results, confidences = self.recognize(rotated_images)
-
-        if results:
-            license_plates = [""] * len(rotated_images)
-            average_confidences = [[0.0]] * len(rotated_images)
-            areas = [0] * len(rotated_images)
-
-            # map results back to original image order
-            for i, (plate, conf) in enumerate(zip(results, confidences)):
-                original_idx = reverse_mapping[i]
-
-                height, width = rotated_images[original_idx].shape[:2]
-                area = height * width
-
-                average_confidence = conf
-
-                # set to True to write each cropped image for debugging
-                if False:
-                    save_image = cv2.cvtColor(
-                        rotated_images[original_idx], cv2.COLOR_RGB2BGR
-                    )
-                    filename = f"/config/plate_{original_idx}_{plate}_{area}.jpg"
-                    cv2.imwrite(filename, save_image)
-
-                license_plates[original_idx] = plate
-                average_confidences[original_idx] = average_confidence
-                areas[original_idx] = area
-
-            # Filter out plates that have a length of less than 3 characters
-            # Sort by area, then by plate length, then by confidence all desc
-            sorted_data = sorted(
-                [
-                    (plate, conf, area)
-                    for plate, conf, area in zip(
-                        license_plates, average_confidences, areas
-                    )
-                    if len(plate) >= MIN_PLATE_LENGTH
-                ],
-                key=lambda x: (x[2], len(x[0]), x[1]),
-                reverse=True,
-            )
-
-            if sorted_data:
-                return map(list, zip(*sorted_data))
-
-        return [], [], []
-
-    def resize_image(self, image: np.ndarray) -> np.ndarray:
-        """
-        Resize the input image while maintaining the aspect ratio, ensuring dimensions are multiples of 32.
-
-        Args:
-            image (np.ndarray): The input image to resize.
-
-        Returns:
-            np.ndarray: The resized image.
-        """
-        h, w = image.shape[:2]
-        ratio = min(self.max_size / max(h, w), 1.0)
-        resize_h = max(int(round(int(h * ratio) / 32) * 32), 32)
-        resize_w = max(int(round(int(w * ratio) / 32) * 32), 32)
-        return cv2.resize(image, (resize_w, resize_h))
-
-    def normalize_image(self, image: np.ndarray) -> np.ndarray:
-        """
-        Normalize the input image by subtracting the mean and multiplying by the standard deviation.
-
-        Args:
-            image (np.ndarray): The input image to normalize.
-
-        Returns:
-            np.ndarray: The normalized image, transposed to match the model's expected input format.
-        """
-        mean = np.array([123.675, 116.28, 103.53]).reshape(1, -1).astype("float64")
-        std = 1 / np.array([58.395, 57.12, 57.375]).reshape(1, -1).astype("float64")
-
-        image = image.astype("float32")
-        cv2.subtract(image, mean, image)
-        cv2.multiply(image, std, image)
-        return image.transpose((2, 0, 1))[np.newaxis, ...]
-
-    def boxes_from_bitmap(
-        self, output: np.ndarray, mask: np.ndarray, dest_width: int, dest_height: int
-    ) -> Tuple[np.ndarray, List[float]]:
-        """
-        Process the binary mask to extract bounding boxes and associated confidence scores.
-
-        Args:
-            output (np.ndarray): Output confidence map from the model.
-            mask (np.ndarray): Binary mask of detected regions.
-            dest_width (int): Target width for scaling the box coordinates.
-            dest_height (int): Target height for scaling the box coordinates.
-
-        Returns:
-            Tuple[np.ndarray, List[float]]: Array of bounding boxes and list of corresponding scores.
-        """
-
-        mask = (mask * 255).astype(np.uint8)
-        height, width = mask.shape
-        outs = cv2.findContours(mask, cv2.RETR_LIST, cv2.CHAIN_APPROX_SIMPLE)
-
-        # handle different return values of findContours between OpenCV versions
-        contours = outs[0] if len(outs) == 2 else outs[1]
-
-        boxes = []
-        scores = []
-
-        for index in range(len(contours)):
-            contour = contours[index]
-
-            # get minimum bounding box (rotated rectangle) around the contour and the smallest side length.
-            points, min_side = self.get_min_boxes(contour)
-
-            if min_side < self.min_size:
-                continue
-
-            points = np.array(points)
-
-            score = self.box_score(output, contour)
-            if self.box_thresh > score:
-                continue
-
-            polygon = Polygon(points)
-            distance = polygon.area / polygon.length
-
-            # Use pyclipper to shrink the polygon slightly based on the computed distance.
-            offset = PyclipperOffset()
-            offset.AddPath(points, JT_ROUND, ET_CLOSEDPOLYGON)
-            points = np.array(offset.Execute(distance * 1.5)).reshape((-1, 1, 2))
-
-            # get the minimum bounding box around the shrunken polygon.
-            box, min_side = self.get_min_boxes(points)
-
-            if min_side < self.min_size + 2:
-                continue
-
-            box = np.array(box)
-
-            # normalize and clip box coordinates to fit within the destination image size.
-            box[:, 0] = np.clip(np.round(box[:, 0] / width * dest_width), 0, dest_width)
-            box[:, 1] = np.clip(
-                np.round(box[:, 1] / height * dest_height), 0, dest_height
-            )
-
-            boxes.append(box.astype("int32"))
-            scores.append(score)
-
-        return np.array(boxes, dtype="int32"), scores
-
-    @staticmethod
-    def get_min_boxes(contour: np.ndarray) -> Tuple[List[Tuple[float, float]], float]:
-        """
-        Calculate the minimum bounding box (rotated rectangle) for a given contour.
-
-        Args:
-            contour (np.ndarray): The contour points of the detected shape.
-
-        Returns:
-            Tuple[List[Tuple[float, float]], float]: A list of four points representing the
-            corners of the bounding box, and the length of the shortest side.
-        """
-        bounding_box = cv2.minAreaRect(contour)
-        points = sorted(cv2.boxPoints(bounding_box), key=lambda x: x[0])
-        index_1, index_4 = (0, 1) if points[1][1] > points[0][1] else (1, 0)
-        index_2, index_3 = (2, 3) if points[3][1] > points[2][1] else (3, 2)
-        box = [points[index_1], points[index_2], points[index_3], points[index_4]]
-        return box, min(bounding_box[1])
-
-    @staticmethod
-    def box_score(bitmap: np.ndarray, contour: np.ndarray) -> float:
-        """
-        Calculate the average score within the bounding box of a contour.
-
-        Args:
-            bitmap (np.ndarray): The output confidence map from the model.
-            contour (np.ndarray): The contour of the detected shape.
-
-        Returns:
-            float: The average score of the pixels inside the contour region.
-        """
-        h, w = bitmap.shape[:2]
-        contour = contour.reshape(-1, 2)
-        x1, y1 = np.clip(contour.min(axis=0), 0, [w - 1, h - 1])
-        x2, y2 = np.clip(contour.max(axis=0), 0, [w - 1, h - 1])
-        mask = np.zeros((y2 - y1 + 1, x2 - x1 + 1), dtype=np.uint8)
-        cv2.fillPoly(mask, [contour - [x1, y1]], 1)
-        return cv2.mean(bitmap[y1 : y2 + 1, x1 : x2 + 1], mask)[0]
-
-    @staticmethod
-    def expand_box(points: List[Tuple[float, float]]) -> np.ndarray:
-        """
-        Expand a polygonal shape slightly by a factor determined by the area-to-perimeter ratio.
-
-        Args:
-            points (List[Tuple[float, float]]): Points of the polygon to expand.
-
-        Returns:
-            np.ndarray: Expanded polygon points.
-        """
-        polygon = Polygon(points)
-        distance = polygon.area / polygon.length
-        offset = PyclipperOffset()
-        offset.AddPath(points, JT_ROUND, ET_CLOSEDPOLYGON)
-        expanded = np.array(offset.Execute(distance * 1.5)).reshape((-1, 2))
-        return expanded
-
-    def filter_polygon(
-        self, points: List[np.ndarray], shape: Tuple[int, int]
-    ) -> np.ndarray:
-        """
-        Filter a set of polygons to include only valid ones that fit within an image shape
-        and meet size constraints.
-
-        Args:
-            points (List[np.ndarray]): List of polygons to filter.
-            shape (Tuple[int, int]): Shape of the image (height, width).
-
-        Returns:
-            np.ndarray: List of filtered polygons.
-        """
-        height, width = shape
-        return np.array(
-            [
-                self.clockwise_order(point)
-                for point in points
-                if self.is_valid_polygon(point, width, height)
-            ]
-        )
-
-    @staticmethod
-    def is_valid_polygon(point: np.ndarray, width: int, height: int) -> bool:
-        """
-        Check if a polygon is valid, meaning it fits within the image bounds
-        and has sides of a minimum length.
-
-        Args:
-            point (np.ndarray): The polygon to validate.
-            width (int): Image width.
-            height (int): Image height.
-
-        Returns:
-            bool: Whether the polygon is valid or not.
-        """
-        return (
-            point[:, 0].min() >= 0
-            and point[:, 0].max() < width
-            and point[:, 1].min() >= 0
-            and point[:, 1].max() < height
-            and np.linalg.norm(point[0] - point[1]) > 3
-            and np.linalg.norm(point[0] - point[3]) > 3
-        )
-
-    @staticmethod
-    def clockwise_order(point: np.ndarray) -> np.ndarray:
-        """
-        Arrange the points of a polygon in clockwise order based on their angular positions
-        around the polygon's center.
-
-        Args:
-            point (np.ndarray): Array of points of the polygon.
-
-        Returns:
-            np.ndarray: Points ordered in clockwise direction.
-        """
-        center = point.mean(axis=0)
-        return point[
-            np.argsort(np.arctan2(point[:, 1] - center[1], point[:, 0] - center[0]))
-        ]
-
-    @staticmethod
-    def sort_polygon(points):
-        """
-        Sort polygons based on their position in the image. If polygons are close in vertical
-        position (within 10 pixels), sort them by horizontal position.
-
-        Args:
-            points: List of polygons to sort.
-
-        Returns:
-            List: Sorted list of polygons.
-        """
-        points.sort(key=lambda x: (x[0][1], x[0][0]))
-        for i in range(len(points) - 1):
-            for j in range(i, -1, -1):
-                if abs(points[j + 1][0][1] - points[j][0][1]) < 10 and (
-                    points[j + 1][0][0] < points[j][0][0]
-                ):
-                    temp = points[j]
-                    points[j] = points[j + 1]
-                    points[j + 1] = temp
-                else:
-                    break
-        return points
-
-    @staticmethod
-    def zero_pad(image: np.ndarray) -> np.ndarray:
-        """
-        Apply zero-padding to an image, ensuring its dimensions are at least 32x32.
-        The padding is added only if needed.
-
-        Args:
-            image (np.ndarray): Input image.
-
-        Returns:
-            np.ndarray: Zero-padded image.
-        """
-        h, w, c = image.shape
-        pad = np.zeros((max(32, h), max(32, w), c), np.uint8)
-        pad[:h, :w, :] = image
-        return pad
-
-    @staticmethod
-    def _preprocess_classification_image(image: np.ndarray) -> np.ndarray:
-        """
-        Preprocess a single image for classification by resizing, normalizing, and padding.
-
-        This method resizes the input image to a fixed height of 48 pixels while adjusting
-        the width dynamically up to a maximum of 192 pixels. The image is then normalized and
-        padded to fit the required input dimensions for classification.
-
-        Args:
-            image (np.ndarray): Input image to preprocess.
-
-        Returns:
-            np.ndarray: Preprocessed and padded image.
-        """
-        # fixed height of 48, dynamic width up to 192
-        input_shape = (3, 48, 192)
-        input_c, input_h, input_w = input_shape
-
-        h, w = image.shape[:2]
-        ratio = w / h
-        resized_w = min(input_w, math.ceil(input_h * ratio))
-
-        resized_image = cv2.resize(image, (resized_w, input_h))
-
-        # handle single-channel images (grayscale) if needed
-        if input_c == 1 and resized_image.ndim == 2:
-            resized_image = resized_image[np.newaxis, :, :]
-        else:
-            resized_image = resized_image.transpose((2, 0, 1))
-
-        # normalize
-        resized_image = (resized_image.astype("float32") / 255.0 - 0.5) / 0.5
-
-        padded_image = np.zeros((input_c, input_h, input_w), dtype=np.float32)
-        padded_image[:, :, :resized_w] = resized_image
-
-        return padded_image
-
-    def _process_classification_output(
-        self, images: List[np.ndarray], outputs: List[np.ndarray]
-    ) -> Tuple[List[np.ndarray], List[Tuple[str, float]]]:
-        """
-        Process the classification model output by matching labels with confidence scores.
-
-        This method processes the outputs from the classification model and rotates images
-        with high confidence of being labeled "180". It ensures that results are mapped to
-        the original image order.
-
-        Args:
-            images (List[np.ndarray]): List of input images.
-            outputs (List[np.ndarray]): Corresponding model outputs.
-
-        Returns:
-            Tuple[List[np.ndarray], List[Tuple[str, float]]]: A tuple of processed images and
-            classification results (label and confidence score).
-        """
-        labels = ["0", "180"]
-        results = [["", 0.0]] * len(images)
-        indices = np.argsort(np.array([x.shape[1] / x.shape[0] for x in images]))
-
-        outputs = np.stack(outputs)
-
-        outputs = [
-            (labels[idx], outputs[i, idx])
-            for i, idx in enumerate(outputs.argmax(axis=1))
-        ]
-
-        for i in range(0, len(images), self.batch_size):
-            for j in range(len(outputs)):
-                label, score = outputs[j]
-                results[indices[i + j]] = [label, score]
-                if "180" in label and score >= self.lpr_config.threshold:
-                    images[indices[i + j]] = cv2.rotate(images[indices[i + j]], 1)
-
-        return images, results
-
-    def _preprocess_recognition_image(
-        self, image: np.ndarray, max_wh_ratio: float
-    ) -> np.ndarray:
-        """
-        Preprocess an image for recognition by dynamically adjusting its width.
-
-        This method adjusts the width of the image based on the maximum width-to-height ratio
-        while keeping the height fixed at 48 pixels. The image is then normalized and padded
-        to fit the required input dimensions for recognition.
-
-        Args:
-            image (np.ndarray): Input image to preprocess.
-            max_wh_ratio (float): Maximum width-to-height ratio for resizing.
-
-        Returns:
-            np.ndarray: Preprocessed and padded image.
-        """
-        # fixed height of 48, dynamic width based on ratio
-        input_shape = [3, 48, 320]
-        input_h, input_w = input_shape[1], input_shape[2]
-
-        assert image.shape[2] == input_shape[0], "Unexpected number of image channels."
-
-        # dynamically adjust input width based on max_wh_ratio
-        input_w = int(input_h * max_wh_ratio)
-
-        # check for model-specific input width
-        model_input_w = self.recognition_model.runner.ort.get_inputs()[0].shape[3]
-        if isinstance(model_input_w, int) and model_input_w > 0:
-            input_w = model_input_w
-
-        h, w = image.shape[:2]
-        aspect_ratio = w / h
-        resized_w = min(input_w, math.ceil(input_h * aspect_ratio))
-
-        resized_image = cv2.resize(image, (resized_w, input_h))
-        resized_image = resized_image.transpose((2, 0, 1))
-        resized_image = (resized_image.astype("float32") / 255.0 - 0.5) / 0.5
-
-        padded_image = np.zeros((input_shape[0], input_h, input_w), dtype=np.float32)
-        padded_image[:, :, :resized_w] = resized_image
-
-        return padded_image
-
-    @staticmethod
-    def _crop_license_plate(image: np.ndarray, points: np.ndarray) -> np.ndarray:
-        """
-        Crop the license plate from the image using four corner points.
-
-        This method crops the region containing the license plate by using the perspective
-        transformation based on four corner points. If the resulting image is significantly
-        taller than wide, the image is rotated to the correct orientation.
-
-        Args:
-            image (np.ndarray): Input image containing the license plate.
-            points (np.ndarray): Four corner points defining the plate's position.
-
-        Returns:
-            np.ndarray: Cropped and potentially rotated license plate image.
-        """
-        assert len(points) == 4, "shape of points must be 4*2"
-        points = points.astype(np.float32)
-        crop_width = int(
-            max(
-                np.linalg.norm(points[0] - points[1]),
-                np.linalg.norm(points[2] - points[3]),
-            )
-        )
-        crop_height = int(
-            max(
-                np.linalg.norm(points[0] - points[3]),
-                np.linalg.norm(points[1] - points[2]),
-            )
-        )
-        pts_std = np.float32(
-            [[0, 0], [crop_width, 0], [crop_width, crop_height], [0, crop_height]]
-        )
-        matrix = cv2.getPerspectiveTransform(points, pts_std)
-        image = cv2.warpPerspective(
-            image,
-            matrix,
-            (crop_width, crop_height),
-            borderMode=cv2.BORDER_REPLICATE,
-            flags=cv2.INTER_CUBIC,
-        )
-        height, width = image.shape[0:2]
-        if height * 1.0 / width >= 1.5:
-            image = np.rot90(image, k=3)
-        return image
-
-
-class CTCDecoder:
-    """
-    A decoder for interpreting the output of a CTC (Connectionist Temporal Classification) model.
-
-    This decoder converts the model's output probabilities into readable sequences of characters
-    while removing duplicates and handling blank tokens. It also calculates the confidence scores
-    for each decoded character sequence.
-    """
-
-    def __init__(self):
-        """
-        Initialize the CTCDecoder with a list of characters and a character map.
-
-        The character set includes digits, letters, special characters, and a "blank" token
-        (used by the CTC model for decoding purposes). A character map is created to map
-        indices to characters.
-        """
-        self.characters = [
-            "blank",
-            "0",
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6",
-            "7",
-            "8",
-            "9",
-            ":",
-            ";",
-            "<",
-            "=",
-            ">",
-            "?",
-            "@",
-            "A",
-            "B",
-            "C",
-            "D",
-            "E",
-            "F",
-            "G",
-            "H",
-            "I",
-            "J",
-            "K",
-            "L",
-            "M",
-            "N",
-            "O",
-            "P",
-            "Q",
-            "R",
-            "S",
-            "T",
-            "U",
-            "V",
-            "W",
-            "X",
-            "Y",
-            "Z",
-            "[",
-            "\\",
-            "]",
-            "^",
-            "_",
-            "`",
-            "a",
-            "b",
-            "c",
-            "d",
-            "e",
-            "f",
-            "g",
-            "h",
-            "i",
-            "j",
-            "k",
-            "l",
-            "m",
-            "n",
-            "o",
-            "p",
-            "q",
-            "r",
-            "s",
-            "t",
-            "u",
-            "v",
-            "w",
-            "x",
-            "y",
-            "z",
-            "{",
-            "|",
-            "}",
-            "~",
-            "!",
-            '"',
-            "#",
-            "$",
-            "%",
-            "&",
-            "'",
-            "(",
-            ")",
-            "*",
-            "+",
-            ",",
-            "-",
-            ".",
-            "/",
-            " ",
-            " ",
-        ]
-        self.char_map = {i: char for i, char in enumerate(self.characters)}
-
-    def __call__(
-        self, outputs: List[np.ndarray]
-    ) -> Tuple[List[str], List[List[float]]]:
-        """
-        Decode a batch of model outputs into character sequences and their confidence scores.
-
-        The method takes the output probability distributions for each time step and uses
-        the best path decoding strategy. It then merges repeating characters and ignores
-        blank tokens. Confidence scores for each decoded character are also calculated.
-
-        Args:
-            outputs (List[np.ndarray]): A list of model outputs, where each element is
-                                        a probability distribution for each time step.
-
-        Returns:
-            Tuple[List[str], List[List[float]]]: A tuple of decoded character sequences
-                                                and confidence scores for each sequence.
-        """
-        results = []
-        confidences = []
-        for output in outputs:
-            seq_log_probs = np.log(output + 1e-8)
-            best_path = np.argmax(seq_log_probs, axis=1)
-
-            merged_path = []
-            merged_probs = []
-            for t, char_index in enumerate(best_path):
-                if char_index != 0 and (t == 0 or char_index != best_path[t - 1]):
-                    merged_path.append(char_index)
-                    merged_probs.append(seq_log_probs[t, char_index])
-
-            result = "".join(self.char_map[idx] for idx in merged_path)
-            results.append(result)
-
-            confidence = np.exp(merged_probs).tolist()
-            confidences.append(confidence)
-
-        return results, confidences

frigate/embeddings/maintainer.py

@@ -3,9 +3,6 @@
 import base64
 import logging
 import os
-import random
-import re
-import string
 import threading
 from multiprocessing.synchronize import Event as MpEvent
 from pathlib import Path
@@ -13,7 +10,6 @@ from typing import Optional
 
 import cv2
 import numpy as np
-import requests
 from peewee import DoesNotExist
 from playhouse.sqliteq import SqliteQueueDatabase
 
@@ -25,20 +21,13 @@ from frigate.comms.event_metadata_updater import (
 from frigate.comms.events_updater import EventEndSubscriber, EventUpdateSubscriber
 from frigate.comms.inter_process import InterProcessRequestor
 from frigate.config import FrigateConfig
-from frigate.const import (
-    CLIPS_DIR,
-    FACE_DIR,
-    FRIGATE_LOCALHOST,
-    UPDATE_EVENT_DESCRIPTION,
-)
-from frigate.embeddings.lpr.lpr import LicensePlateRecognition
+from frigate.const import CLIPS_DIR, UPDATE_EVENT_DESCRIPTION
 from frigate.events.types import EventTypeEnum
 from frigate.genai import get_genai_client
 from frigate.models import Event
 from frigate.types import TrackedObjectUpdateTypesEnum
 from frigate.util.builtin import serialize
-from frigate.util.image import SharedMemoryFrameManager, area, calculate_region
-from frigate.util.model import FaceClassificationModel
+from frigate.util.image import SharedMemoryFrameManager, calculate_region
 
 from .embeddings import Embeddings
 
@@ -58,7 +47,7 @@ class EmbeddingMaintainer(threading.Thread):
     ) -> None:
         super().__init__(name="embeddings_maintainer")
         self.config = config
-        self.embeddings = Embeddings(config, db)
+        self.embeddings = Embeddings(config.semantic_search, db)
 
         # Check if we need to re-index events
         if config.semantic_search.reindex:
@@ -71,48 +60,12 @@ class EmbeddingMaintainer(threading.Thread):
         )
         self.embeddings_responder = EmbeddingsResponder()
         self.frame_manager = SharedMemoryFrameManager()
-
-        # set face recognition conditions
-        self.face_recognition_enabled = self.config.face_recognition.enabled
-        self.requires_face_detection = "face" not in self.config.objects.all_objects
-        self.detected_faces: dict[str, float] = {}
-        self.face_classifier = (
-            FaceClassificationModel(self.config.face_recognition, db)
-            if self.face_recognition_enabled
-            else None
-        )
-
         # create communication for updating event descriptions
         self.requestor = InterProcessRequestor()
         self.stop_event = stop_event
-        self.tracked_events: dict[str, list[any]] = {}
+        self.tracked_events = {}
         self.genai_client = get_genai_client(config)
 
-        # set license plate recognition conditions
-        self.lpr_config = self.config.lpr
-        self.requires_license_plate_detection = (
-            "license_plate" not in self.config.objects.all_objects
-        )
-        self.detected_license_plates: dict[str, dict[str, any]] = {}
-
-        if self.lpr_config.enabled:
-            self.license_plate_recognition = LicensePlateRecognition(
-                self.lpr_config, self.requestor, self.embeddings
-            )
-
-    @property
-    def face_detector(self) -> cv2.FaceDetectorYN:
-        # Lazily create the classifier.
-        if "face_detector" not in self.__dict__:
-            self.__dict__["face_detector"] = cv2.FaceDetectorYN.create(
-                "/config/model_cache/facedet/facedet.onnx",
-                config="",
-                input_size=(320, 320),
-                score_threshold=0.8,
-                nms_threshold=0.3,
-            )
-        return self.__dict__["face_detector"]
-
     def run(self) -> None:
         """Maintain a SQLite-vec database for semantic search."""
         while not self.stop_event.is_set():
@@ -131,7 +84,7 @@ class EmbeddingMaintainer(threading.Thread):
     def _process_requests(self) -> None:
         """Process embeddings requests"""
 
-        def _handle_request(topic: str, data: dict[str, any]) -> str:
+        def _handle_request(topic: str, data: str) -> str:
             try:
                 if topic == EmbeddingsRequestEnum.embed_description.value:
                     return serialize(
@@ -150,46 +103,6 @@ class EmbeddingMaintainer(threading.Thread):
                     return serialize(
                         self.embeddings.text_embedding([data])[0], pack=False
                     )
-                elif topic == EmbeddingsRequestEnum.register_face.value:
-                    if not self.face_recognition_enabled:
-                        return False
-
-                    rand_id = "".join(
-                        random.choices(string.ascii_lowercase + string.digits, k=6)
-                    )
-                    label = data["face_name"]
-                    id = f"{label}-{rand_id}"
-
-                    if data.get("cropped"):
-                        pass
-                    else:
-                        img = cv2.imdecode(
-                            np.frombuffer(
-                                base64.b64decode(data["image"]), dtype=np.uint8
-                            ),
-                            cv2.IMREAD_COLOR,
-                        )
-                        face_box = self._detect_face(img)
-
-                        if not face_box:
-                            return False
-
-                        face = img[face_box[1] : face_box[3], face_box[0] : face_box[2]]
-                        ret, thumbnail = cv2.imencode(
-                            ".webp", face, [int(cv2.IMWRITE_WEBP_QUALITY), 100]
-                        )
-
-                    # write face to library
-                    folder = os.path.join(FACE_DIR, label)
-                    file = os.path.join(folder, f"{id}.webp")
-                    os.makedirs(folder, exist_ok=True)
-
-                    # save face image
-                    with open(file, "wb") as output:
-                        output.write(thumbnail.tobytes())
-
-                self.face_classifier.clear_classifier()
-                return True
             except Exception as e:
                 logger.error(f"Unable to handle embeddings request {e}")
 
@@ -197,7 +110,7 @@ class EmbeddingMaintainer(threading.Thread):
 
     def _process_updates(self) -> None:
         """Process event updates"""
-        update = self.event_subscriber.check_for_update(timeout=0.01)
+        update = self.event_subscriber.check_for_update(timeout=0.1)
 
         if update is None:
             return
@@ -208,56 +121,42 @@ class EmbeddingMaintainer(threading.Thread):
             return
 
         camera_config = self.config.cameras[camera]
-
-        # no need to process updated objects if face recognition, lpr, genai are disabled
+        # no need to save our own thumbnails if genai is not enabled
+        # or if the object has become stationary
         if (
             not camera_config.genai.enabled
-            and not self.face_recognition_enabled
-            and not self.lpr_config.enabled
+            or self.genai_client is None
+            or data["stationary"]
         ):
             return
 
+        if data["id"] not in self.tracked_events:
+            self.tracked_events[data["id"]] = []
+
         # Create our own thumbnail based on the bounding box and the frame time
         try:
             yuv_frame = self.frame_manager.get(
                 frame_name, camera_config.frame_shape_yuv
             )
+
+            if yuv_frame is not None:
+                data["thumbnail"] = self._create_thumbnail(yuv_frame, data["box"])
+
+                # Limit the number of thumbnails saved
+                if len(self.tracked_events[data["id"]]) >= MAX_THUMBNAILS:
+                    # Always keep the first thumbnail for the event
+                    self.tracked_events[data["id"]].pop(1)
+
+                self.tracked_events[data["id"]].append(data)
+
+                self.frame_manager.close(frame_name)
         except FileNotFoundError:
             pass
 
-        if yuv_frame is None:
-            logger.debug(
-                "Unable to process object update because frame is unavailable."
-            )
-            return
-
-        if self.face_recognition_enabled:
-            self._process_face(data, yuv_frame)
-
-        if self.lpr_config.enabled:
-            self._process_license_plate(data, yuv_frame)
-
-        # no need to save our own thumbnails if genai is not enabled
-        # or if the object has become stationary
-        if self.genai_client is not None and not data["stationary"]:
-            if data["id"] not in self.tracked_events:
-                self.tracked_events[data["id"]] = []
-
-            data["thumbnail"] = self._create_thumbnail(yuv_frame, data["box"])
-
-            # Limit the number of thumbnails saved
-            if len(self.tracked_events[data["id"]]) >= MAX_THUMBNAILS:
-                # Always keep the first thumbnail for the event
-                self.tracked_events[data["id"]].pop(1)
-
-            self.tracked_events[data["id"]].append(data)
-
-        self.frame_manager.close(frame_name)
-
     def _process_finalized(self) -> None:
         """Process the end of an event."""
         while True:
-            ended = self.event_end_subscriber.check_for_update(timeout=0.01)
+            ended = self.event_end_subscriber.check_for_update(timeout=0.1)
 
             if ended == None:
                 break
@@ -265,12 +164,6 @@ class EmbeddingMaintainer(threading.Thread):
             event_id, camera, updated_db = ended
             camera_config = self.config.cameras[camera]
 
-            if event_id in self.detected_faces:
-                self.detected_faces.pop(event_id)
-
-            if event_id in self.detected_license_plates:
-                self.detected_license_plates.pop(event_id)
-
             if updated_db:
                 try:
                     event: Event = Event.get(Event.id == event_id)
@@ -384,7 +277,7 @@ class EmbeddingMaintainer(threading.Thread):
     def _process_event_metadata(self):
         # Check for regenerate description requests
         (topic, event_id, source) = self.event_metadata_subscriber.check_for_update(
-            timeout=0.01
+            timeout=0.1
         )
 
         if topic is None:
@@ -393,350 +286,6 @@ class EmbeddingMaintainer(threading.Thread):
         if event_id:
             self.handle_regenerate_description(event_id, source)
 
-    def _detect_face(self, input: np.ndarray) -> tuple[int, int, int, int]:
-        """Detect faces in input image."""
-        self.face_detector.setInputSize((input.shape[1], input.shape[0]))
-        faces = self.face_detector.detect(input)
-
-        if faces[1] is None:
-            return None
-
-        face = None
-
-        for _, potential_face in enumerate(faces[1]):
-            raw_bbox = potential_face[0:4].astype(np.uint16)
-            x: int = max(raw_bbox[0], 0)
-            y: int = max(raw_bbox[1], 0)
-            w: int = raw_bbox[2]
-            h: int = raw_bbox[3]
-            bbox = (x, y, x + w, y + h)
-
-            if face is None or area(bbox) > area(face):
-                face = bbox
-
-        return face
-
-    def _process_face(self, obj_data: dict[str, any], frame: np.ndarray) -> None:
-        """Look for faces in image."""
-        id = obj_data["id"]
-
-        # don't run for non person objects
-        if obj_data.get("label") != "person":
-            logger.debug("Not a processing face for non person object.")
-            return
-
-        # don't overwrite sub label for objects that have a sub label
-        # that is not a face
-        if obj_data.get("sub_label") and id not in self.detected_faces:
-            logger.debug(
-                f"Not processing face due to existing sub label: {obj_data.get('sub_label')}."
-            )
-            return
-
-        face: Optional[dict[str, any]] = None
-
-        if self.requires_face_detection:
-            logger.debug("Running manual face detection.")
-            person_box = obj_data.get("box")
-
-            if not person_box:
-                return None
-
-            rgb = cv2.cvtColor(frame, cv2.COLOR_YUV2RGB_I420)
-            left, top, right, bottom = person_box
-            person = rgb[top:bottom, left:right]
-            face_box = self._detect_face(person)
-
-            if not face_box:
-                logger.debug("Detected no faces for person object.")
-                return
-
-            margin = int((face_box[2] - face_box[0]) * 0.25)
-            face_frame = person[
-                max(0, face_box[1] - margin) : min(
-                    frame.shape[0], face_box[3] + margin
-                ),
-                max(0, face_box[0] - margin) : min(
-                    frame.shape[1], face_box[2] + margin
-                ),
-            ]
-            face_frame = cv2.cvtColor(face_frame, cv2.COLOR_RGB2BGR)
-        else:
-            # don't run for object without attributes
-            if not obj_data.get("current_attributes"):
-                logger.debug("No attributes to parse.")
-                return
-
-            attributes: list[dict[str, any]] = obj_data.get("current_attributes", [])
-            for attr in attributes:
-                if attr.get("label") != "face":
-                    continue
-
-                if face is None or attr.get("score", 0.0) > face.get("score", 0.0):
-                    face = attr
-
-            # no faces detected in this frame
-            if not face:
-                return
-
-            face_box = face.get("box")
-
-            # check that face is valid
-            if not face_box or area(face_box) < self.config.face_recognition.min_area:
-                logger.debug(f"Invalid face box {face}")
-                return
-
-            face_frame = cv2.cvtColor(frame, cv2.COLOR_YUV2BGR_I420)
-            margin = int((face_box[2] - face_box[0]) * 0.25)
-
-            face_frame = face_frame[
-                max(0, face_box[1] - margin) : min(
-                    frame.shape[0], face_box[3] + margin
-                ),
-                max(0, face_box[0] - margin) : min(
-                    frame.shape[1], face_box[2] + margin
-                ),
-            ]
-
-        res = self.face_classifier.classify_face(face_frame)
-
-        if not res:
-            return
-
-        sub_label, score = res
-
-        # calculate the overall face score as the probability * area of face
-        # this will help to reduce false positives from small side-angle faces
-        # if a large front-on face image may have scored slightly lower but
-        # is more likely to be accurate due to the larger face area
-        face_score = round(score * face_frame.shape[0] * face_frame.shape[1], 2)
-
-        logger.debug(
-            f"Detected best face for person as: {sub_label} with probability {score} and overall face score {face_score}"
-        )
-
-        if self.config.face_recognition.save_attempts:
-            # write face to library
-            folder = os.path.join(FACE_DIR, "debug")
-            file = os.path.join(folder, f"{id}-{sub_label}-{score}-{face_score}.webp")
-            os.makedirs(folder, exist_ok=True)
-            cv2.imwrite(file, face_frame)
-
-        if score < self.config.face_recognition.threshold:
-            logger.debug(
-                f"Recognized face distance {score} is less than threshold {self.config.face_recognition.threshold}"
-            )
-            return
-
-        if id in self.detected_faces and face_score <= self.detected_faces[id]:
-            logger.debug(
-                f"Recognized face distance {score} and overall score {face_score} is less than previous overall face score ({self.detected_faces.get(id)})."
-            )
-            return
-
-        resp = requests.post(
-            f"{FRIGATE_LOCALHOST}/api/events/{id}/sub_label",
-            json={
-                "camera": obj_data.get("camera"),
-                "subLabel": sub_label,
-                "subLabelScore": score,
-            },
-        )
-
-        if resp.status_code == 200:
-            self.detected_faces[id] = face_score
-
-    def _detect_license_plate(self, input: np.ndarray) -> tuple[int, int, int, int]:
-        """Return the dimensions of the input image as [x, y, width, height]."""
-        height, width = input.shape[:2]
-        return (0, 0, width, height)
-
-    def _process_license_plate(
-        self, obj_data: dict[str, any], frame: np.ndarray
-    ) -> None:
-        """Look for license plates in image."""
-        id = obj_data["id"]
-
-        # don't run for non car objects
-        if obj_data.get("label") != "car":
-            logger.debug("Not a processing license plate for non car object.")
-            return
-
-        # don't run for stationary car objects
-        if obj_data.get("stationary") == True:
-            logger.debug("Not a processing license plate for a stationary car object.")
-            return
-
-        # don't overwrite sub label for objects that have a sub label
-        # that is not a license plate
-        if obj_data.get("sub_label") and id not in self.detected_license_plates:
-            logger.debug(
-                f"Not processing license plate due to existing sub label: {obj_data.get('sub_label')}."
-            )
-            return
-
-        license_plate: Optional[dict[str, any]] = None
-
-        if self.requires_license_plate_detection:
-            logger.debug("Running manual license_plate detection.")
-            car_box = obj_data.get("box")
-
-            if not car_box:
-                return None
-
-            rgb = cv2.cvtColor(frame, cv2.COLOR_YUV2RGB_I420)
-            left, top, right, bottom = car_box
-            car = rgb[top:bottom, left:right]
-            license_plate = self._detect_license_plate(car)
-
-            if not license_plate:
-                logger.debug("Detected no license plates for car object.")
-                return
-
-            license_plate_frame = car[
-                license_plate[1] : license_plate[3], license_plate[0] : license_plate[2]
-            ]
-            license_plate_frame = cv2.cvtColor(license_plate_frame, cv2.COLOR_RGB2BGR)
-        else:
-            # don't run for object without attributes
-            if not obj_data.get("current_attributes"):
-                logger.debug("No attributes to parse.")
-                return
-
-            attributes: list[dict[str, any]] = obj_data.get("current_attributes", [])
-            for attr in attributes:
-                if attr.get("label") != "license_plate":
-                    continue
-
-                if license_plate is None or attr.get("score", 0.0) > license_plate.get(
-                    "score", 0.0
-                ):
-                    license_plate = attr
-
-            # no license plates detected in this frame
-            if not license_plate:
-                return
-
-            license_plate_box = license_plate.get("box")
-
-            # check that license plate is valid
-            if (
-                not license_plate_box
-                or area(license_plate_box) < self.config.lpr.min_area
-            ):
-                logger.debug(f"Invalid license plate box {license_plate}")
-                return
-
-            license_plate_frame = cv2.cvtColor(frame, cv2.COLOR_YUV2BGR_I420)
-            license_plate_frame = license_plate_frame[
-                license_plate_box[1] : license_plate_box[3],
-                license_plate_box[0] : license_plate_box[2],
-            ]
-
-        # run detection, returns results sorted by confidence, best first
-        license_plates, confidences, areas = (
-            self.license_plate_recognition.process_license_plate(license_plate_frame)
-        )
-
-        logger.debug(f"Text boxes: {license_plates}")
-        logger.debug(f"Confidences: {confidences}")
-        logger.debug(f"Areas: {areas}")
-
-        if license_plates:
-            for plate, confidence, text_area in zip(license_plates, confidences, areas):
-                avg_confidence = (
-                    (sum(confidence) / len(confidence)) if confidence else 0
-                )
-
-                logger.debug(
-                    f"Detected text: {plate} (average confidence: {avg_confidence:.2f}, area: {text_area} pixels)"
-                )
-        else:
-            # no plates found
-            logger.debug("No text detected")
-            return
-
-        top_plate, top_char_confidences, top_area = (
-            license_plates[0],
-            confidences[0],
-            areas[0],
-        )
-        avg_confidence = (
-            (sum(top_char_confidences) / len(top_char_confidences))
-            if top_char_confidences
-            else 0
-        )
-
-        # Check if we have a previously detected plate for this ID
-        if id in self.detected_license_plates:
-            prev_plate = self.detected_license_plates[id]["plate"]
-            prev_char_confidences = self.detected_license_plates[id]["char_confidences"]
-            prev_area = self.detected_license_plates[id]["area"]
-            prev_avg_confidence = (
-                (sum(prev_char_confidences) / len(prev_char_confidences))
-                if prev_char_confidences
-                else 0
-            )
-
-            # Define conditions for keeping the previous plate
-            shorter_than_previous = len(top_plate) < len(prev_plate)
-            lower_avg_confidence = avg_confidence <= prev_avg_confidence
-            smaller_area = top_area < prev_area
-
-            # Compare character-by-character confidence where possible
-            min_length = min(len(top_plate), len(prev_plate))
-            char_confidence_comparison = sum(
-                1
-                for i in range(min_length)
-                if top_char_confidences[i] <= prev_char_confidences[i]
-            )
-            worse_char_confidences = char_confidence_comparison >= min_length / 2
-
-            if (shorter_than_previous or smaller_area) and (
-                lower_avg_confidence and worse_char_confidences
-            ):
-                logger.debug(
-                    f"Keeping previous plate. New plate stats: "
-                    f"length={len(top_plate)}, avg_conf={avg_confidence:.2f}, area={top_area} "
-                    f"vs Previous: length={len(prev_plate)}, avg_conf={prev_avg_confidence:.2f}, area={prev_area}"
-                )
-                return
-
-        # Check against minimum confidence threshold
-        if avg_confidence < self.lpr_config.threshold:
-            logger.debug(
-                f"Average confidence {avg_confidence} is less than threshold ({self.lpr_config.threshold})"
-            )
-            return
-
-        # Determine subLabel based on known plates, use regex matching
-        # Default to the detected plate, use label name if there's a match
-        sub_label = next(
-            (
-                label
-                for label, plates in self.lpr_config.known_plates.items()
-                if any(re.match(f"^{plate}$", top_plate) for plate in plates)
-            ),
-            top_plate,
-        )
-
-        # Send the result to the API
-        resp = requests.post(
-            f"{FRIGATE_LOCALHOST}/api/events/{id}/sub_label",
-            json={
-                "camera": obj_data.get("camera"),
-                "subLabel": sub_label,
-                "subLabelScore": avg_confidence,
-            },
-        )
-
-        if resp.status_code == 200:
-            self.detected_license_plates[id] = {
-                "plate": top_plate,
-                "char_confidences": top_char_confidences,
-                "area": top_area,
-            }
-
     def _create_thumbnail(self, yuv_frame, box, height=500) -> Optional[bytes]:
         """Return jpg thumbnail of a region of the frame."""
         frame = cv2.cvtColor(yuv_frame, cv2.COLOR_YUV2BGR_I420)

frigate/events/cleanup.py

@@ -121,8 +121,8 @@ class EventCleanup(threading.Thread):
 
             events_to_update = []
 
-            for batch in query.iterator():
-                events_to_update.extend([event.id for event in batch])
+            for event in query.iterator():
+                events_to_update.append(event.id)
                 if len(events_to_update) >= CHUNK_SIZE:
                     logger.debug(
                         f"Updating {update_params} for {len(events_to_update)} events"
@@ -257,7 +257,7 @@ class EventCleanup(threading.Thread):
         events_to_update = []
 
         for event in query.iterator():
-            events_to_update.append(event)
+            events_to_update.append(event.id)
 
             if len(events_to_update) >= CHUNK_SIZE:
                 logger.debug(

frigate/ffmpeg_presets.py

@@ -71,8 +71,8 @@ PRESETS_HW_ACCEL_DECODE = {
     "preset-rpi-64-h264": "-c:v:1 h264_v4l2m2m",
     "preset-rpi-64-h265": "-c:v:1 hevc_v4l2m2m",
     FFMPEG_HWACCEL_VAAPI: f"-hwaccel_flags allow_profile_mismatch -hwaccel vaapi -hwaccel_device {_gpu_selector.get_selected_gpu()} -hwaccel_output_format vaapi",
-    "preset-intel-qsv-h264": f"-hwaccel qsv -qsv_device {_gpu_selector.get_selected_gpu()} -hwaccel_output_format qsv -c:v h264_qsv",
-    "preset-intel-qsv-h265": f"-load_plugin hevc_hw -hwaccel qsv -qsv_device {_gpu_selector.get_selected_gpu()} -hwaccel_output_format qsv -c:v hevc_qsv",
+    "preset-intel-qsv-h264": f"-hwaccel qsv -qsv_device {_gpu_selector.get_selected_gpu()} -hwaccel_output_format qsv -c:v h264_qsv -bsf:v dump_extra",  # https://trac.ffmpeg.org/ticket/9766#comment:17
+    "preset-intel-qsv-h265": f"-load_plugin hevc_hw -hwaccel qsv -qsv_device {_gpu_selector.get_selected_gpu()} -hwaccel_output_format qsv -c:v hevc_qsv -bsf:v dump_extra",  # https://trac.ffmpeg.org/ticket/9766#comment:17
     FFMPEG_HWACCEL_NVIDIA: "-hwaccel cuda -hwaccel_output_format cuda",
     "preset-jetson-h264": "-c:v h264_nvmpi -resize {1}x{2}",
     "preset-jetson-h265": "-c:v hevc_nvmpi -resize {1}x{2}",

frigate/log.py

@@ -18,19 +18,12 @@ LOG_HANDLER.setFormatter(
     )
 )
 
-# filter out norfair warning
 LOG_HANDLER.addFilter(
     lambda record: not record.getMessage().startswith(
         "You are using a scalar distance function"
     )
 )
 
-# filter out tflite logging
-LOG_HANDLER.addFilter(
-    lambda record: "Created TensorFlow Lite XNNPACK delegate for CPU."
-    not in record.getMessage()
-)
-
 log_listener: Optional[QueueListener] = None
 
 

frigate/test/test_config.py

@@ -75,11 +75,11 @@ class TestConfig(unittest.TestCase):
             "detectors": {
                 "cpu": {
                     "type": "cpu",
-                    "model": {"path": "/cpu_model.tflite"},
+                    "model_path": "/cpu_model.tflite",
                 },
                 "edgetpu": {
                     "type": "edgetpu",
-                    "model": {"path": "/edgetpu_model.tflite"},
+                    "model_path": "/edgetpu_model.tflite",
                 },
                 "openvino": {
                     "type": "openvino",

frigate/util/config.py

@@ -13,7 +13,7 @@ from frigate.util.services import get_video_properties
 
 logger = logging.getLogger(__name__)
 
-CURRENT_CONFIG_VERSION = "0.15-0"
+CURRENT_CONFIG_VERSION = "0.15-1"
 DEFAULT_CONFIG_FILE = "/config/config.yml"
 
 
@@ -77,6 +77,13 @@ def migrate_frigate_config(config_file: str):
             yaml.dump(new_config, f)
         previous_version = "0.15-0"
 
+    if previous_version < "0.15-1":
+        logger.info(f"Migrating frigate config from {previous_version} to 0.15-1...")
+        new_config = migrate_015_1(config)
+        with open(config_file, "w") as f:
+            yaml.dump(new_config, f)
+        previous_version = "0.15-1"
+
     logger.info("Finished frigate config migration...")
 
 
@@ -267,6 +274,21 @@ def migrate_015_0(config: dict[str, dict[str, any]]) -> dict[str, dict[str, any]
     return new_config
 
 
+def migrate_015_1(config: dict[str, dict[str, any]]) -> dict[str, dict[str, any]]:
+    """Handle migrating frigate config to 0.15-1"""
+    new_config = config.copy()
+
+    for detector, detector_config in config.get("detectors", {}).items():
+        path = detector_config.get("model", {}).get("path")
+
+        if path:
+            new_config["detectors"][detector]["model_path"] = path
+            del new_config["detectors"][detector]["model"]
+
+    new_config["version"] = "0.15-1"
+    return new_config
+
+
 def get_relative_coordinates(
     mask: Optional[Union[str, list]], frame_shape: tuple[int, int]
 ) -> Union[str, list]:

frigate/util/downloader.py

@@ -101,7 +101,7 @@ class ModelDownloader:
         self.download_complete.set()
 
     @staticmethod
-    def download_from_url(url: str, save_path: str, silent: bool = False) -> Path:
+    def download_from_url(url: str, save_path: str, silent: bool = False):
         temporary_filename = Path(save_path).with_name(
             os.path.basename(save_path) + ".part"
         )
@@ -125,8 +125,6 @@ class ModelDownloader:
         if not silent:
             logger.info(f"Downloading complete: {url}")
 
-        return Path(save_path)
-
     @staticmethod
     def mark_files_state(
         requestor: InterProcessRequestor,

frigate/util/model.py

@@ -2,14 +2,9 @@
 
 import logging
 import os
-from typing import Any, Optional
+from typing import Any
 
-import cv2
-import numpy as np
 import onnxruntime as ort
-from playhouse.sqliteq import SqliteQueueDatabase
-
-from frigate.config.semantic_search import FaceRecognitionConfig
 
 try:
     import openvino as ov
@@ -20,9 +15,6 @@ except ImportError:
 logger = logging.getLogger(__name__)
 
 
-MIN_MATCHING_FACES = 2
-
-
 def get_ort_providers(
     force_cpu: bool = False, device: str = "AUTO", requires_fp16: bool = False
 ) -> tuple[list[str], list[dict[str, any]]]:
@@ -156,114 +148,3 @@ class ONNXModelRunner:
             return [infer_request.get_output_tensor().data]
         elif self.type == "ort":
             return self.ort.run(None, input)
-
-
-class FaceClassificationModel:
-    def __init__(self, config: FaceRecognitionConfig, db: SqliteQueueDatabase):
-        self.config = config
-        self.db = db
-        self.landmark_detector = cv2.face.createFacemarkLBF()
-        self.landmark_detector.loadModel("/config/model_cache/facedet/landmarkdet.yaml")
-        self.recognizer: cv2.face.LBPHFaceRecognizer = (
-            cv2.face.LBPHFaceRecognizer_create(
-                radius=2, threshold=(1 - config.min_score) * 1000
-            )
-        )
-        self.label_map: dict[int, str] = {}
-        self.__build_classifier()
-
-    def __build_classifier(self) -> None:
-        labels = []
-        faces = []
-
-        dir = "/media/frigate/clips/faces"
-        for idx, name in enumerate(os.listdir(dir)):
-            if name == "debug":
-                continue
-
-            self.label_map[idx] = name
-            face_folder = os.path.join(dir, name)
-            for image in os.listdir(face_folder):
-                img = cv2.imread(os.path.join(face_folder, image))
-                img = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
-                img = self.__align_face(img, img.shape[1], img.shape[0])
-                faces.append(img)
-                labels.append(idx)
-
-        self.recognizer.train(faces, np.array(labels))
-
-    def __align_face(
-        self,
-        image: np.ndarray,
-        output_width: int,
-        output_height: int,
-    ) -> np.ndarray:
-        _, lands = self.landmark_detector.fit(
-            image, np.array([(0, 0, image.shape[1], image.shape[0])])
-        )
-        landmarks = lands[0][0]
-
-        # get landmarks for eyes
-        leftEyePts = landmarks[42:48]
-        rightEyePts = landmarks[36:42]
-
-        # compute the center of mass for each eye
-        leftEyeCenter = leftEyePts.mean(axis=0).astype("int")
-        rightEyeCenter = rightEyePts.mean(axis=0).astype("int")
-
-        # compute the angle between the eye centroids
-        dY = rightEyeCenter[1] - leftEyeCenter[1]
-        dX = rightEyeCenter[0] - leftEyeCenter[0]
-        angle = np.degrees(np.arctan2(dY, dX)) - 180
-
-        # compute the desired right eye x-coordinate based on the
-        # desired x-coordinate of the left eye
-        desiredRightEyeX = 1.0 - 0.35
-
-        # determine the scale of the new resulting image by taking
-        # the ratio of the distance between eyes in the *current*
-        # image to the ratio of distance between eyes in the
-        # *desired* image
-        dist = np.sqrt((dX**2) + (dY**2))
-        desiredDist = desiredRightEyeX - 0.35
-        desiredDist *= output_width
-        scale = desiredDist / dist
-
-        # compute center (x, y)-coordinates (i.e., the median point)
-        # between the two eyes in the input image
-        # grab the rotation matrix for rotating and scaling the face
-        eyesCenter = (
-            int((leftEyeCenter[0] + rightEyeCenter[0]) // 2),
-            int((leftEyeCenter[1] + rightEyeCenter[1]) // 2),
-        )
-        M = cv2.getRotationMatrix2D(eyesCenter, angle, scale)
-
-        # update the translation component of the matrix
-        tX = output_width * 0.5
-        tY = output_height * 0.35
-        M[0, 2] += tX - eyesCenter[0]
-        M[1, 2] += tY - eyesCenter[1]
-
-        # apply the affine transformation
-        return cv2.warpAffine(
-            image, M, (output_width, output_height), flags=cv2.INTER_CUBIC
-        )
-
-    def clear_classifier(self) -> None:
-        self.classifier = None
-        self.labeler = None
-        self.label_map = {}
-
-    def classify_face(self, face_image: np.ndarray) -> Optional[tuple[str, float]]:
-        if not self.label_map:
-            self.__build_classifier()
-
-        img = cv2.cvtColor(face_image, cv2.COLOR_BGR2GRAY)
-        img = self.__align_face(img, img.shape[1], img.shape[0])
-        index, distance = self.recognizer.predict(img)
-
-        if index == -1:
-            return None
-
-        score = 1.0 - (distance / 1000)
-        return self.label_map[index], round(score, 2)

web/src/App.tsx

@@ -19,7 +19,6 @@ const ConfigEditor = lazy(() => import("@/pages/ConfigEditor"));
 const System = lazy(() => import("@/pages/System"));
 const Settings = lazy(() => import("@/pages/Settings"));
 const UIPlayground = lazy(() => import("@/pages/UIPlayground"));
-const FaceLibrary = lazy(() => import("@/pages/FaceLibrary"));
 const Logs = lazy(() => import("@/pages/Logs"));
 
 function App() {
@@ -52,7 +51,6 @@ function App() {
                   <Route path="/config" element={<ConfigEditor />} />
                   <Route path="/logs" element={<Logs />} />
                   <Route path="/playground" element={<UIPlayground />} />
-                  <Route path="/faces" element={<FaceLibrary />} />
                   <Route path="*" element={<Redirect to="/" />} />
                 </Routes>
               </Suspense>

web/src/components/camera/AutoUpdatingCameraImage.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import CameraImage from "./CameraImage";
 
 type AutoUpdatingCameraImageProps = {
@@ -8,7 +8,6 @@ type AutoUpdatingCameraImageProps = {
   className?: string;
   cameraClasses?: string;
   reloadInterval?: number;
-  periodicCache?: boolean;
 };
 
 const MIN_LOAD_TIMEOUT_MS = 200;
@@ -20,7 +19,6 @@ export default function AutoUpdatingCameraImage({
   className,
   cameraClasses,
   reloadInterval = MIN_LOAD_TIMEOUT_MS,
-  periodicCache = false,
 }: AutoUpdatingCameraImageProps) {
   const [key, setKey] = useState(Date.now());
   const [fps, setFps] = useState<string>("0");
@@ -44,8 +42,6 @@ export default function AutoUpdatingCameraImage({
   }, [reloadInterval]);
 
   const handleLoad = useCallback(() => {
-    setIsCached(true);
-
     if (reloadInterval == -1) {
       return;
     }
@@ -70,28 +66,12 @@ export default function AutoUpdatingCameraImage({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [key, setFps]);
 
-  // periodic cache to reduce loading indicator
-
-  const [isCached, setIsCached] = useState(false);
-
-  const cacheKey = useMemo(() => {
-    let baseParam = "";
-
-    if (periodicCache && !isCached) {
-      baseParam = "store=1";
-    } else {
-      baseParam = `cache=${key}`;
-    }
-
-    return `${baseParam}${searchParams ? `&${searchParams}` : ""}`;
-  }, [isCached, periodicCache, key, searchParams]);
-
   return (
     <div className={className}>
       <CameraImage
         camera={camera}
         onload={handleLoad}
-        searchParams={cacheKey}
+        searchParams={`cache=${key}${searchParams ? `&${searchParams}` : ""}`}
         className={cameraClasses}
       />
       {showFps ? <span className="text-xs">Displaying at {fps}fps</span> : null}

web/src/components/filter/CameraGroupSelector.tsx

@@ -755,7 +755,11 @@ export function CameraGroupEdit({
                 <FormMessage />
                 {[
                   ...(birdseyeConfig?.enabled ? ["birdseye"] : []),
-                  ...Object.keys(config?.cameras ?? {}),
+                  ...Object.keys(config?.cameras ?? {}).sort(
+                    (a, b) =>
+                      (config?.cameras[a]?.ui?.order ?? 0) -
+                      (config?.cameras[b]?.ui?.order ?? 0),
+                  ),
                 ].map((camera) => (
                   <FormControl key={camera}>
                     <FilterSwitch

web/src/components/overlay/detail/ObjectLifecycle.tsx

@@ -477,7 +477,10 @@ export default function ObjectLifecycle({
                           </p>
                           {Array.isArray(item.data.box) &&
                           item.data.box.length >= 4
-                            ? (item.data.box[2] / item.data.box[3]).toFixed(2)
+                            ? (
+                                aspectRatio *
+                                (item.data.box[2] / item.data.box[3])
+                              ).toFixed(2)
                             : "N/A"}
                         </div>
                       </div>

web/src/components/overlay/detail/SearchDetailDialog.tsx

@@ -505,45 +505,46 @@ function ObjectDetailsTab({
 
         <div className="flex w-full flex-row justify-end gap-2">
           {config?.cameras[search.camera].genai.enabled && search.end_time && (
-            <>
-              <div className="flex items-start">
-                <Button
-                  className="rounded-r-none border-r-0"
-                  aria-label="Regenerate tracked object description"
-                  onClick={() => regenerateDescription("thumbnails")}
-                >
-                  Regenerate
-                </Button>
-                {search.has_snapshot && (
-                  <DropdownMenu>
-                    <DropdownMenuTrigger asChild>
-                      <Button
-                        className="rounded-l-none border-l-0 px-2"
-                        aria-label="Expand regeneration menu"
-                      >
-                        <FaChevronDown className="size-3" />
-                      </Button>
-                    </DropdownMenuTrigger>
-                    <DropdownMenuContent>
-                      <DropdownMenuItem
-                        className="cursor-pointer"
-                        aria-label="Regenerate from snapshot"
-                        onClick={() => regenerateDescription("snapshot")}
-                      >
-                        Regenerate from Snapshot
-                      </DropdownMenuItem>
-                      <DropdownMenuItem
-                        className="cursor-pointer"
-                        aria-label="Regenerate from thumbnails"
-                        onClick={() => regenerateDescription("thumbnails")}
-                      >
-                        Regenerate from Thumbnails
-                      </DropdownMenuItem>
-                    </DropdownMenuContent>
-                  </DropdownMenu>
-                )}
-              </div>
-
+            <div className="flex items-start">
+              <Button
+                className="rounded-r-none border-r-0"
+                aria-label="Regenerate tracked object description"
+                onClick={() => regenerateDescription("thumbnails")}
+              >
+                Regenerate
+              </Button>
+              {search.has_snapshot && (
+                <DropdownMenu>
+                  <DropdownMenuTrigger asChild>
+                    <Button
+                      className="rounded-l-none border-l-0 px-2"
+                      aria-label="Expand regeneration menu"
+                    >
+                      <FaChevronDown className="size-3" />
+                    </Button>
+                  </DropdownMenuTrigger>
+                  <DropdownMenuContent>
+                    <DropdownMenuItem
+                      className="cursor-pointer"
+                      aria-label="Regenerate from snapshot"
+                      onClick={() => regenerateDescription("snapshot")}
+                    >
+                      Regenerate from Snapshot
+                    </DropdownMenuItem>
+                    <DropdownMenuItem
+                      className="cursor-pointer"
+                      aria-label="Regenerate from thumbnails"
+                      onClick={() => regenerateDescription("thumbnails")}
+                    >
+                      Regenerate from Thumbnails
+                    </DropdownMenuItem>
+                  </DropdownMenuContent>
+                </DropdownMenu>
+              )}
+            </div>
+          )}
+          {(config?.cameras[search.camera].genai.enabled && search.end_time) ||
+            (!config?.cameras[search.camera].genai.enabled && (
               <Button
                 variant="select"
                 aria-label="Save"
@@ -551,8 +552,7 @@ function ObjectDetailsTab({
               >
                 Save
               </Button>
-            </>
-          )}
+            ))}
         </div>
       </div>
     </div>

web/src/components/overlay/dialog/UploadImageDialog.tsx

@@ -1,88 +0,0 @@
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from "@/components/ui/dialog";
-import { Form, FormControl, FormField, FormItem } from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useCallback } from "react";
-import { useForm } from "react-hook-form";
-import { z } from "zod";
-
-type UploadImageDialogProps = {
-  open: boolean;
-  title: string;
-  description?: string;
-  setOpen: (open: boolean) => void;
-  onSave: (file: File) => void;
-};
-export default function UploadImageDialog({
-  open,
-  title,
-  description,
-  setOpen,
-  onSave,
-}: UploadImageDialogProps) {
-  const formSchema = z.object({
-    file: z.instanceof(FileList, { message: "Please select an image file." }),
-  });
-
-  const form = useForm<z.infer<typeof formSchema>>({
-    resolver: zodResolver(formSchema),
-  });
-  const fileRef = form.register("file");
-
-  // upload handler
-
-  const onSubmit = useCallback(
-    (data: z.infer<typeof formSchema>) => {
-      if (!data["file"]) {
-        return;
-      }
-
-      onSave(data["file"]["0"]);
-    },
-    [onSave],
-  );
-
-  return (
-    <Dialog open={open} defaultOpen={false} onOpenChange={setOpen}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>{title}</DialogTitle>
-          {description && <DialogDescription>{description}</DialogDescription>}
-        </DialogHeader>
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)}>
-            <FormField
-              control={form.control}
-              name="file"
-              render={() => (
-                <FormItem>
-                  <FormControl>
-                    <Input
-                      className="aspect-video h-40 w-full"
-                      type="file"
-                      {...fileRef}
-                    />
-                  </FormControl>
-                </FormItem>
-              )}
-            />
-            <DialogFooter className="pt-4">
-              <Button onClick={() => setOpen(false)}>Cancel</Button>
-              <Button variant="select" type="submit">
-                Save
-              </Button>
-            </DialogFooter>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-}

web/src/components/player/LivePlayer.tsx

@@ -294,11 +294,10 @@ export default function LivePlayer({
       >
         <AutoUpdatingCameraImage
           className="size-full"
-          cameraClasses="relative size-full flex justify-center"
           camera={cameraConfig.name}
           showFps={false}
           reloadInterval={stillReloadInterval}
-          periodicCache
+          cameraClasses="relative size-full flex justify-center"
         />
       </div>
 

web/src/components/settings/SearchSettings.tsx

@@ -46,7 +46,7 @@ export default function SearchSettings({
   const trigger = (
     <Button
       className="flex items-center gap-2"
-      aria-label="Search Settings"
+      aria-label="Explore Settings"
       size="sm"
     >
       <FaCog className="text-secondary-foreground" />

web/src/hooks/use-navigation.ts

@@ -1,29 +1,20 @@
 import { ENV } from "@/env";
-import { FrigateConfig } from "@/types/frigateConfig";
 import { NavData } from "@/types/navigation";
 import { useMemo } from "react";
-import { isDesktop } from "react-device-detect";
 import { FaCompactDisc, FaVideo } from "react-icons/fa";
 import { IoSearch } from "react-icons/io5";
 import { LuConstruction } from "react-icons/lu";
 import { MdVideoLibrary } from "react-icons/md";
-import { TbFaceId } from "react-icons/tb";
-import useSWR from "swr";
 
 export const ID_LIVE = 1;
 export const ID_REVIEW = 2;
 export const ID_EXPLORE = 3;
 export const ID_EXPORT = 4;
 export const ID_PLAYGROUND = 5;
-export const ID_FACE_LIBRARY = 6;
 
 export default function useNavigation(
   variant: "primary" | "secondary" = "primary",
 ) {
-  const { data: config } = useSWR<FrigateConfig>("config", {
-    revalidateOnFocus: false,
-  });
-
   return useMemo(
     () =>
       [
@@ -63,15 +54,7 @@ export default function useNavigation(
           url: "/playground",
           enabled: ENV !== "production",
         },
-        {
-          id: ID_FACE_LIBRARY,
-          variant,
-          icon: TbFaceId,
-          title: "Face Library",
-          url: "/faces",
-          enabled: isDesktop && config?.face_recognition.enabled,
-        },
       ] as NavData[],
-    [config?.face_recognition.enabled, variant],
+    [variant],
   );
 }

web/src/pages/Explore.tsx

@@ -328,12 +328,12 @@ export default function Explore() {
           <div className="flex max-w-96 flex-col items-center justify-center space-y-3 rounded-lg bg-background/50 p-5">
             <div className="my-5 flex flex-col items-center gap-2 text-xl">
               <TbExclamationCircle className="mb-3 size-10" />
-              <div>Search Unavailable</div>
+              <div>Explore is Unavailable</div>
             </div>
             {embeddingsReindexing && allModelsLoaded && (
               <>
                 <div className="text-center text-primary-variant">
-                  Search can be used after tracked object embeddings have
+                  Explore can be used after tracked object embeddings have
                   finished reindexing.
                 </div>
                 <div className="pt-5 text-center">
@@ -384,8 +384,8 @@ export default function Explore() {
               <>
                 <div className="text-center text-primary-variant">
                   Frigate is downloading the necessary embeddings models to
-                  support semantic searching. This may take several minutes
-                  depending on the speed of your network connection.
+                  support the Semantic Search feature. This may take several
+                  minutes depending on the speed of your network connection.
                 </div>
                 <div className="flex w-96 flex-col gap-2 py-5">
                   <div className="flex flex-row items-center justify-center gap-2">

web/src/pages/FaceLibrary.tsx

@@ -1,332 +0,0 @@
-import { baseUrl } from "@/api/baseUrl";
-import Chip from "@/components/indicators/Chip";
-import UploadImageDialog from "@/components/overlay/dialog/UploadImageDialog";
-import { Button } from "@/components/ui/button";
-import { ScrollArea, ScrollBar } from "@/components/ui/scroll-area";
-import { Toaster } from "@/components/ui/sonner";
-import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
-import useOptimisticState from "@/hooks/use-optimistic-state";
-import axios from "axios";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { isDesktop } from "react-device-detect";
-import { LuImagePlus, LuTrash } from "react-icons/lu";
-import { toast } from "sonner";
-import useSWR from "swr";
-
-export default function FaceLibrary() {
-  const [page, setPage] = useState<string>();
-  const [pageToggle, setPageToggle] = useOptimisticState(page, setPage, 100);
-  const tabsRef = useRef<HTMLDivElement | null>(null);
-
-  // face data
-
-  const { data: faceData, mutate: refreshFaces } = useSWR("faces");
-
-  const faces = useMemo<string[]>(
-    () =>
-      faceData ? Object.keys(faceData).filter((face) => face != "debug") : [],
-    [faceData],
-  );
-  const faceImages = useMemo<string[]>(
-    () => (pageToggle && faceData ? faceData[pageToggle] : []),
-    [pageToggle, faceData],
-  );
-
-  const faceAttempts = useMemo<string[]>(
-    () => faceData?.["debug"] || [],
-    [faceData],
-  );
-
-  useEffect(() => {
-    if (!pageToggle) {
-      if (faceAttempts.length > 0) {
-        setPageToggle("attempts");
-      } else if (faces) {
-        setPageToggle(faces[0]);
-      }
-    } else if (pageToggle == "attempts" && faceAttempts.length == 0) {
-      setPageToggle(faces[0]);
-    }
-    // we need to listen on the value of the faces list
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [faceAttempts, faces]);
-
-  // upload
-
-  const [upload, setUpload] = useState(false);
-
-  const onUploadImage = useCallback(
-    (file: File) => {
-      const formData = new FormData();
-      formData.append("file", file);
-      axios
-        .post(`faces/${pageToggle}`, formData, {
-          headers: {
-            "Content-Type": "multipart/form-data",
-          },
-        })
-        .then((resp) => {
-          if (resp.status == 200) {
-            setUpload(false);
-            refreshFaces();
-            toast.success(
-              "Successfully uploaded image. View the file in the /exports folder.",
-              { position: "top-center" },
-            );
-          }
-        })
-        .catch((error) => {
-          if (error.response?.data?.message) {
-            toast.error(
-              `Failed to upload image: ${error.response.data.message}`,
-              { position: "top-center" },
-            );
-          } else {
-            toast.error(`Failed to upload image: ${error.message}`, {
-              position: "top-center",
-            });
-          }
-        });
-    },
-    [pageToggle, refreshFaces],
-  );
-
-  return (
-    <div className="flex size-full flex-col p-2">
-      <Toaster />
-
-      <UploadImageDialog
-        open={upload}
-        title="Upload Face Image"
-        description={`Upload an image to scan for faces and include for ${pageToggle}`}
-        setOpen={setUpload}
-        onSave={onUploadImage}
-      />
-
-      <div className="relative flex h-11 w-full items-center justify-between">
-        <ScrollArea className="w-full whitespace-nowrap">
-          <div ref={tabsRef} className="flex flex-row">
-            <ToggleGroup
-              className="*:rounded-md *:px-3 *:py-4"
-              type="single"
-              size="sm"
-              value={pageToggle}
-              onValueChange={(value: string) => {
-                if (value) {
-                  setPageToggle(value);
-                }
-              }}
-            >
-              {faceAttempts.length > 0 && (
-                <>
-                  <ToggleGroupItem
-                    value="attempts"
-                    className={`flex scroll-mx-10 items-center justify-between gap-2 ${pageToggle == "attempts" ? "" : "*:text-muted-foreground"}`}
-                    data-nav-item="attempts"
-                    aria-label="Select attempts"
-                  >
-                    <div>Attempts</div>
-                  </ToggleGroupItem>
-                  <div>|</div>
-                </>
-              )}
-
-              {Object.values(faces).map((item) => (
-                <ToggleGroupItem
-                  key={item}
-                  className={`flex scroll-mx-10 items-center justify-between gap-2 ${pageToggle == item ? "" : "*:text-muted-foreground"}`}
-                  value={item}
-                  data-nav-item={item}
-                  aria-label={`Select ${item}`}
-                >
-                  <div className="capitalize">{item}</div>
-                </ToggleGroupItem>
-              ))}
-            </ToggleGroup>
-            <ScrollBar orientation="horizontal" className="h-0" />
-          </div>
-        </ScrollArea>
-      </div>
-      {pageToggle &&
-        (pageToggle == "attempts" ? (
-          <AttemptsGrid attemptImages={faceAttempts} onRefresh={refreshFaces} />
-        ) : (
-          <FaceGrid
-            faceImages={faceImages}
-            pageToggle={pageToggle}
-            setUpload={setUpload}
-            onRefresh={refreshFaces}
-          />
-        ))}
-    </div>
-  );
-}
-
-type AttemptsGridProps = {
-  attemptImages: string[];
-  onRefresh: () => void;
-};
-function AttemptsGrid({ attemptImages, onRefresh }: AttemptsGridProps) {
-  return (
-    <div className="scrollbar-container flex flex-wrap gap-2 overflow-y-scroll">
-      {attemptImages.map((image: string) => (
-        <FaceAttempt key={image} image={image} onRefresh={onRefresh} />
-      ))}
-    </div>
-  );
-}
-
-type FaceAttemptProps = {
-  image: string;
-  onRefresh: () => void;
-};
-function FaceAttempt({ image, onRefresh }: FaceAttemptProps) {
-  const [hovered, setHovered] = useState(false);
-
-  const data = useMemo(() => {
-    const parts = image.split("-");
-
-    return {
-      eventId: `${parts[0]}-${parts[1]}`,
-      name: parts[2],
-      score: parts[3],
-    };
-  }, [image]);
-
-  const onDelete = useCallback(() => {
-    axios
-      .post(`/faces/debug/delete`, { ids: [image] })
-      .then((resp) => {
-        if (resp.status == 200) {
-          toast.success(`Successfully deleted face.`, {
-            position: "top-center",
-          });
-          onRefresh();
-        }
-      })
-      .catch((error) => {
-        if (error.response?.data?.message) {
-          toast.error(`Failed to delete: ${error.response.data.message}`, {
-            position: "top-center",
-          });
-        } else {
-          toast.error(`Failed to delete: ${error.message}`, {
-            position: "top-center",
-          });
-        }
-      });
-  }, [image, onRefresh]);
-
-  return (
-    <div
-      className="relative h-min"
-      onMouseEnter={isDesktop ? () => setHovered(true) : undefined}
-      onMouseLeave={isDesktop ? () => setHovered(false) : undefined}
-      onClick={isDesktop ? undefined : () => setHovered(!hovered)}
-    >
-      {hovered && (
-        <div className="absolute right-1 top-1">
-          <Chip
-            className="cursor-pointer rounded-md bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500"
-            onClick={() => onDelete()}
-          >
-            <LuTrash className="size-4 fill-destructive text-destructive" />
-          </Chip>
-        </div>
-      )}
-      <div className="rounded-md bg-secondary">
-        <img
-          className="h-40 rounded-md"
-          src={`${baseUrl}clips/faces/debug/${image}`}
-        />
-        <div className="p-2">{`${data.name}: ${data.score}`}</div>
-      </div>
-    </div>
-  );
-}
-
-type FaceGridProps = {
-  faceImages: string[];
-  pageToggle: string;
-  setUpload: (upload: boolean) => void;
-  onRefresh: () => void;
-};
-function FaceGrid({
-  faceImages,
-  pageToggle,
-  setUpload,
-  onRefresh,
-}: FaceGridProps) {
-  return (
-    <div className="scrollbar-container flex flex-wrap gap-2 overflow-y-scroll">
-      {faceImages.map((image: string) => (
-        <FaceImage
-          key={image}
-          name={pageToggle}
-          image={image}
-          onRefresh={onRefresh}
-        />
-      ))}
-      <Button key="upload" className="size-40" onClick={() => setUpload(true)}>
-        <LuImagePlus className="size-10" />
-      </Button>
-    </div>
-  );
-}
-
-type FaceImageProps = {
-  name: string;
-  image: string;
-  onRefresh: () => void;
-};
-function FaceImage({ name, image, onRefresh }: FaceImageProps) {
-  const [hovered, setHovered] = useState(false);
-
-  const onDelete = useCallback(() => {
-    axios
-      .post(`/faces/${name}/delete`, { ids: [image] })
-      .then((resp) => {
-        if (resp.status == 200) {
-          toast.success(`Successfully deleted face.`, {
-            position: "top-center",
-          });
-          onRefresh();
-        }
-      })
-      .catch((error) => {
-        if (error.response?.data?.message) {
-          toast.error(`Failed to delete: ${error.response.data.message}`, {
-            position: "top-center",
-          });
-        } else {
-          toast.error(`Failed to delete: ${error.message}`, {
-            position: "top-center",
-          });
-        }
-      });
-  }, [name, image, onRefresh]);
-
-  return (
-    <div
-      className="relative h-40"
-      onMouseEnter={isDesktop ? () => setHovered(true) : undefined}
-      onMouseLeave={isDesktop ? () => setHovered(false) : undefined}
-      onClick={isDesktop ? undefined : () => setHovered(!hovered)}
-    >
-      {hovered && (
-        <div className="absolute right-1 top-1">
-          <Chip
-            className="cursor-pointer rounded-md bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500"
-            onClick={() => onDelete()}
-          >
-            <LuTrash className="size-4 fill-destructive text-destructive" />
-          </Chip>
-        </div>
-      )}
-      <img
-        className="h-40 rounded-md"
-        src={`${baseUrl}clips/faces/${name}/${image}`}
-      />
-    </div>
-  );
-}

web/src/pages/Settings.tsx

@@ -40,7 +40,7 @@ import UiSettingsView from "@/views/settings/UiSettingsView";
 
 const allSettingsViews = [
   "UI settings",
-  "search settings",
+  "explore settings",
   "camera settings",
   "masks / zones",
   "motion tuner",
@@ -175,7 +175,7 @@ export default function Settings() {
       </div>
       <div className="mt-2 flex h-full w-full flex-col items-start md:h-dvh md:pb-24">
         {page == "UI settings" && <UiSettingsView />}
-        {page == "search settings" && (
+        {page == "explore settings" && (
           <SearchSettingsView setUnsavedChanges={setUnsavedChanges} />
         )}
         {page == "debug" && (

web/src/types/frigateConfig.ts

@@ -288,10 +288,6 @@ export interface FrigateConfig {
 
   environment_vars: Record<string, unknown>;
 
-  face_recognition: {
-    enabled: boolean;
-  };
-
   ffmpeg: {
     global_args: string[];
     hwaccel_args: string;

web/src/views/settings/SearchSettingsView.tsx

@@ -91,7 +91,7 @@ export default function SearchSettingsView({
       )
       .then((res) => {
         if (res.status === 200) {
-          toast.success("Search settings have been saved.", {
+          toast.success("Explore settings have been saved.", {
             position: "top-center",
           });
           setChangedValue(false);
@@ -128,7 +128,7 @@ export default function SearchSettingsView({
     if (changedValue) {
       addMessage(
         "search_settings",
-        `Unsaved search settings changes`,
+        `Unsaved Explore settings changes`,
         undefined,
         "search_settings",
       );
@@ -140,7 +140,7 @@ export default function SearchSettingsView({
   }, [changedValue]);
 
   useEffect(() => {
-    document.title = "Search Settings - Frigate";
+    document.title = "Explore Settings - Frigate";
   }, []);
 
   if (!config) {
@@ -152,7 +152,7 @@ export default function SearchSettingsView({
       <Toaster position="top-center" closeButton={true} />
       <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:mb-0 md:mr-2 md:mt-0">
         <Heading as="h3" className="my-2">
-          Search Settings
+          Explore Settings
         </Heading>
         <Separator className="my-2 flex bg-secondary" />
         <Heading as="h4" className="my-2">
@@ -221,7 +221,7 @@ export default function SearchSettingsView({
               <div className="text-md">Model Size</div>
               <div className="space-y-1 text-sm text-muted-foreground">
                 <p>
-                  The size of the model used for semantic search embeddings.
+                  The size of the model used for Semantic Search embeddings.
                 </p>
                 <ul className="list-disc pl-5 text-sm">
                   <li>