Add web only amd64 build and push target to Makefile

Fix typo in arm64 docker/webonly/Dockerfile -> docker/main/Dockerfile

.cspell/frigate-dictionary.txt

@@ -1,303 +1,168 @@
-aarch
-absdiff
-airockchip
-Alloc
-Amcrest
-amdgpu
-analyzeduration
-Annke
-apexcharts
-arange
-argmax
-argmin
-argpartition
-ascontiguousarray
-authelia
-authentik
-autodetected
-automations
-autotrack
-autotracked
-autotracker
-autotracking
-balena
-Beelink
-BGRA
-BHWC
-blackshear
-blakeblackshear
-bottombar
-buildx
-castable
-cdist
-Celeron
-cgroups
-chipset
-chromadb
-Chromecast
-cmdline
-codeowner
-CODEOWNERS
-codeproject
-colormap
-colorspace
-comms
-ctypeslib
-CUDA
-Cuvid
-Dahua
-datasheet
-debconf
-deci
-deepstack
-defragment
-devcontainer
-DEVICEMAP
-discardcorrupt
-dpkg
-dsize
-dtype
-ECONNRESET
-edgetpu
-faststart
-fflags
-ffprobe
-fillna
-flac
-foscam
-fourcc
-framebuffer
-fregate
-frégate
-fromarray
-frombuffer
-frontdoor
-fstype
-fullchain
-fullscreen
-genai
-generativeai
-genpts
-getpid
-gpuload
-HACS
-Hailo
-hass
-hconcat
-healthcheck
-hideable
-Hikvision
-homeassistant
-homekit
-homography
-hsize
-hstack
-httpx
-hwaccel
-hwdownload
-hwmap
-hwupload
-iloc
-imagestream
-imdecode
-imencode
-imread
-imutils
-imwrite
-interp
-iostat
-iotop
-itemsize
-Jellyfin
-jetson
-jetsons
-joserfc
-jsmpeg
-jsonify
-Kalman
-keepalive
-keepdims
-labelmap
-letsencrypt
-levelname
-LIBAVFORMAT
-libedgetpu
-libnvinfer
-libva
-libwebp
-libx
-libyolo
-linalg
-localzone
-logpipe
-Loryta
-lstsq
-lsusb
-markupsafe
-maxsplit
-MEMHOSTALLOC
-memlimit
-meshgrid
-metadatas
-migraphx
-minilm
-mjpeg
-mkfifo
-mobiledet
-mobilenet
-modelpath
-mosquitto
-mountpoint
-movflags
-mpegts
-mqtt
-mse
-msenc
-namedtuples
-nbytes
-nchw
-ndarray
-ndimage
-nethogs
-newaxis
-nhwc
-NOBLOCK
-nobuffer
-nokey
-NONBLOCK
-noninteractive
-noprint
-Norfair
-nptype
-NTSC
-numpy
-nvenc
-nvhost
-nvml
-nvmpi
-ollama
-onnx
-onnxruntime
-onvif
-ONVIF
-openai
-opencv
-openvino
-OWASP
-paho
-passwordless
-popleft
-posthog
-postprocess
-poweroff
-preexec
-probesize
-protobuf
-psutil
-pubkey
-putenv
-pycache
-pydantic
-pyobj
-pysqlite
-pytz
-pywebpush
-qnap
-quantisation
-Radeon
-radeonsi
-radeontop
-rawvideo
-rcond
-RDONLY
-rebranded
-referer
-Reolink
-restream
-restreamed
-restreaming
-rkmpp
-rknn
-rkrga
-rockchip
-rocm
-rocminfo
-rootfs
 rtmp
+edgetpu
+labelmap
+rockchip
+jetson
+rocm
+vaapi
+CUDA
+hwaccel
 RTSP
-ruamel
-scroller
-setproctitle
-setpts
-shms
-SIGUSR
-skylake
-sleeptime
-SNDMORE
-socs
-sqliteq
-ssdlite
-statm
-stimeout
-stylelint
-subclassing
-substream
-superfast
-surveillance
-svscan
-Swipeable
-sysconf
-tailscale
-Tapo
-tensorrt
+Hikvision
+Dahua
+Amcrest
+Reolink
+Loryta
+Beelink
+Celeron
+vaapi
+blakeblackshear
+workdir
+onvif
+autotracking
+openvino
 tflite
+deepstack
+codeproject
+udev
+tailscale
+restream
+restreaming
+webrtc
+ssdlite
+mobilenet
+mosquitto
+datasheet
+Jellyfin
+Radeon
+libva
+Ubiquiti
+Unifi
+Tapo
+Annke
+autotracker
+autotracked
+variations
+ONVIF
+traefik
+devcontainer
+rootfs
+ffprobe
+autotrack
+logpipe
+imread
+imwrite
+imencode
+imutils
 thresholded
 timelapse
-tmpfs
-tobytes
-toggleable
-traefik
-tzlocal
-Ubiquiti
-udev
-udevadm
 ultrafast
-unichip
-unidecode
-Unifi
-unixepoch
-unraid
-unreviewed
-userdata
-usermod
-vaapi
+sleeptime
+radeontop
 vainfo
-variations
-vconcat
-vitb
-vstream
-vsync
-wallclock
-webp
-webpush
-webrtc
+tmpfs
+homography
 websockets
-webui
-werkzeug
-workdir
-WRONLY
-wsgirefserver
-wsgiutils
-wsize
-xaddr
-xmaxs
-xmins
-XPUB
-XSUB
-ymaxs
-ymins
-yolo
-yolonas
-yolox
+LIBAVFORMAT
+NTSC
+onnxruntime
+fourcc
+radeonsi
+paho
+imagestream
+jsonify
+cgroups
+sysconf
+memlimit
+gpuload
+nvml
+setproctitle
+psutil
+Kalman
+frontdoor
+namedtuples
 zeep
-zerolatency
+fflags
+probesize
+wallclock
+rknn
+socs
+pydantic
+shms
+imdecode
+colormap
+webui
+mse
+jsmpeg
+unreviewed
+Chromecast
+Swipeable
+flac
+scroller
+cmdline
+toggleable
+bottombar
+opencv
+apexcharts
+buildx
+mqtt
+rawvideo
+defragment
+Norfair
+subclassing
+yolo
+tensorrt
+blackshear
+stylelint
+HACS
+homeassistant
+hass
+castable
+mobiledet
+framebuffer
+mjpeg
+substream
+codeowner
+noninteractive
+restreamed
+mountpoint
+fstype
+OWASP
+iotop
+letsencrypt
+fullchain
+lsusb
+iostat
+usermod
+balena
+passwordless
+debconf
+dpkg
+poweroff
+surveillance
+qnap
+homekit
+colorspace
+quantisation
+skylake
+Cuvid
+foscam
+onnx
+numpy
+protobuf
+aarch
+amdgpu
+chipset
+referer
+mpegts
+webp
+authelia
+authentik
+unichip
+rebranded
+udevadm
+automations
+unraid
+hideable
+healthcheck
+keepalive

.devcontainer/post_create.sh

@@ -17,7 +17,7 @@ sudo chown -R "$(id -u):$(id -g)" /media/frigate
 # When started as a service, LIBAVFORMAT_VERSION_MAJOR is defined in the
 # s6 service file. For dev, where frigate is started from an interactive
 # shell, we define it in .bashrc instead.
-echo 'export LIBAVFORMAT_VERSION_MAJOR=$(/usr/lib/ffmpeg/7.0/bin/ffmpeg -version | grep -Po "libavformat\W+\K\d+")' >> $HOME/.bashrc
+echo 'export LIBAVFORMAT_VERSION_MAJOR=$(ffmpeg -version | grep -Po "libavformat\W+\K\d+")' >> $HOME/.bashrc
 
 make version
 

.github/workflows/ci.yml

@@ -155,42 +155,57 @@ jobs:
             tensorrt.tags=${{ steps.setup.outputs.image-name }}-tensorrt
             *.cache-from=type=registry,ref=${{ steps.setup.outputs.cache-name }}-amd64
             *.cache-to=type=registry,ref=${{ steps.setup.outputs.cache-name }}-amd64,mode=max
-  combined_extra_builds:
-    runs-on: ubuntu-latest
-    name: Combined Extra Builds
-    needs:
-      - amd64_build
-      - arm64_build
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Set up QEMU and Buildx
-        id: setup
-        uses: ./.github/actions/setup
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push Hailo-8l build
-        uses: docker/bake-action@v4
-        with:
-          push: true
-          targets: h8l
-          files: docker/hailo8l/h8l.hcl
-          set: |
-            h8l.tags=${{ steps.setup.outputs.image-name }}-h8l
-            *.cache-from=type=registry,ref=${{ steps.setup.outputs.cache-name }}-h8l
-            *.cache-to=type=registry,ref=${{ steps.setup.outputs.cache-name }}-h8l,mode=max
-      - name: AMD/ROCm general build
-        env:
-          AMDGPU: gfx
-          HSA_OVERRIDE: 0
-        uses: docker/bake-action@v3
-        with:
-          push: true
-          targets: rocm
-          files: docker/rocm/rocm.hcl
-          set: |
-            rocm.tags=${{ steps.setup.outputs.image-name }}-rocm
-            *.cache-from=type=gha
+      #- name: AMD/ROCm general build
+      #  env:
+      #    AMDGPU: gfx
+      #    HSA_OVERRIDE: 0
+      #  uses: docker/bake-action@v3
+      #  with:
+      #    push: true
+      #    targets: rocm
+      #    files: docker/rocm/rocm.hcl
+      #    set: |
+      #      rocm.tags=${{ steps.setup.outputs.image-name }}-rocm
+      #      *.cache-from=type=gha
+      #- name: AMD/ROCm gfx900
+      #  env:
+      #    AMDGPU: gfx900
+      #    HSA_OVERRIDE: 1
+      #    HSA_OVERRIDE_GFX_VERSION: 9.0.0
+      #  uses: docker/bake-action@v3
+      #  with:
+      #    push: true
+      #    targets: rocm
+      #    files: docker/rocm/rocm.hcl
+      #    set: |
+      #      rocm.tags=${{ steps.setup.outputs.image-name }}-rocm-gfx900
+      #      *.cache-from=type=gha
+      #- name: AMD/ROCm gfx1030
+      #  env:
+      #    AMDGPU: gfx1030
+      #    HSA_OVERRIDE: 1
+      #    HSA_OVERRIDE_GFX_VERSION: 10.3.0
+      #  uses: docker/bake-action@v3
+      #  with:
+      #    push: true
+      #    targets: rocm
+      #    files: docker/rocm/rocm.hcl
+      #    set: |
+      #      rocm.tags=${{ steps.setup.outputs.image-name }}-rocm-gfx1030
+      #      *.cache-from=type=gha
+      #- name: AMD/ROCm gfx1100
+      #  env:
+      #    AMDGPU: gfx1100
+      #    HSA_OVERRIDE: 1
+      #    HSA_OVERRIDE_GFX_VERSION: 11.0.0
+      #  uses: docker/bake-action@v3
+      #  with:
+      #    push: true
+      #    targets: rocm
+      #    files: docker/rocm/rocm.hcl
+      #    set: |
+      #      rocm.tags=${{ steps.setup.outputs.image-name }}-rocm-gfx1100
+      #      *.cache-from=type=gha
   # The majority of users running arm64 are rpi users, so the rpi
   # build should be the primary arm64 image
   assemble_default_build:

.vscode/launch.json

@@ -3,9 +3,10 @@
   "configurations": [
     {
       "name": "Python: Launch Frigate",
-      "type": "debugpy",
+      "type": "python",
       "request": "launch",
-      "module": "frigate"
+      "module": "frigate",
+      "justMyCode": true
     }
   ]
 }

CODEOWNERS

@@ -4,4 +4,3 @@
 /docker/tensorrt/*jetson* @madsciencetist
 /docker/rockchip/ @MarcA711
 /docker/rocm/ @harakas
-/docker/hailo8l/ @spanner3003

Makefile

@@ -1,9 +1,12 @@
 default_target: local
 
 COMMIT_HASH := $(shell git log -1 --pretty=format:"%h"|tail -1)
-VERSION = 0.15.0
-IMAGE_REPO ?= ghcr.io/blakeblackshear/frigate
+VERSION = 0.14.1
+#IMAGE_REPO ?= ghcr.io/blakeblackshear/frigate
+IMAGE_REPO ?= gitea.tremendousturtle.tools/chris/frigate
 GITHUB_REF_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
+CURRENT_UID := $(shell id -u)
+CURRENT_GID := $(shell id -g)
 BOARDS= #Initialized empty
 
 include docker/*/*.mk
@@ -16,38 +19,40 @@ version:
 	echo 'VERSION = "$(VERSION)-$(COMMIT_HASH)"' > frigate/version.py
 
 local: version
-	docker buildx build --target=frigate --file docker/main/Dockerfile . \
-		--tag frigate:latest \
-		--load
+	docker buildx build --target=frigate --tag frigate:latest --load --file docker/main/Dockerfile .
 
 amd64:
-	docker buildx build --target=frigate --file docker/main/Dockerfile . \
-		--tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) \
-		--platform linux/amd64
+	docker buildx build --platform linux/amd64 --target=frigate --tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) --file docker/main/Dockerfile .
+
+amd64_web:
+	docker buildx build --platform linux/amd64 --target=frigate --tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) --file docker/webonly/Dockerfile .
 
 arm64:
-	docker buildx build --target=frigate --file docker/main/Dockerfile . \
-		--tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) \
-		--platform linux/arm64
+	docker buildx build --platform linux/arm64 --target=frigate --tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) --file docker/main/Dockerfile .
+
+arm64_web:
+	docker buildx build --platform linux/arm64 --target=frigate --tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) --file docker/webonly/Dockerfile .
 
 build: version amd64 arm64
-	docker buildx build --target=frigate --file docker/main/Dockerfile . \
-		--tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) \
-		--platform linux/arm64/v8,linux/amd64
+	docker buildx build --platform linux/arm64/v8,linux/amd64 --target=frigate --tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) --file docker/main/Dockerfile .
+
+build_web: version amd64_web arm64_web
+	docker buildx build --platform linux/arm64/v8,linux/amd64 --target=frigate --tag $(IMAGE_REPO):$(VERSION)-$(COMMIT_HASH) --file docker/webonly/Dockerfile .
 
 push: push-boards
-	docker buildx build --target=frigate --file docker/main/Dockerfile . \
-		--tag $(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH) \
-		--platform linux/arm64/v8,linux/amd64 \
-		--push
+	docker buildx build --push --platform linux/arm64/v8,linux/amd64 --target=frigate --tag $(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH) --file docker/main/Dockerfile .
+
+push_web: push-boards
+	docker buildx build --push --platform linux/arm64/v8,linux/amd64 --target=frigate --tag $(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH) --file docker/webonly/Dockerfile .
+
+push_web-amd64:
+	docker buildx build --push --platform linux/amd64 --target=frigate --tag $(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH) --file docker/webonly/Dockerfile .
 
 run: local
 	docker run --rm --publish=5000:5000 --volume=${PWD}/config:/config frigate:latest
 
 run_tests: local
-	docker run --rm --workdir=/opt/frigate --entrypoint= frigate:latest \
-		python3 -u -m unittest
-	docker run --rm --workdir=/opt/frigate --entrypoint= frigate:latest \
-		python3 -u -m mypy --config-file frigate/mypy.ini frigate
+	docker run --rm --workdir=/opt/frigate --entrypoint= frigate:latest python3 -u -m unittest
+	docker run --rm --workdir=/opt/frigate --entrypoint= frigate:latest python3 -u -m mypy --config-file frigate/mypy.ini frigate
 
 .PHONY: run_tests

cspell.json

@@ -7,8 +7,7 @@
     "*.db",
     "node_modules",
     "__pycache__",
-    "dist",
-    "/audio-labelmap.txt"
+    "dist"
   ],
   "language": "en",
   "dictionaryDefinitions": [

docker/hailo8l/Dockerfile

@@ -1,104 +0,0 @@
-# syntax=docker/dockerfile:1.6
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-# Build Python wheels
-FROM wheels AS h8l-wheels
-
-COPY docker/main/requirements-wheels.txt /requirements-wheels.txt
-COPY docker/hailo8l/requirements-wheels-h8l.txt /requirements-wheels-h8l.txt
-
-RUN sed -i "/https:\/\//d" /requirements-wheels.txt
-
-# Create a directory to store the built wheels
-RUN mkdir /h8l-wheels
-
-# Build the wheels
-RUN pip3 wheel --wheel-dir=/h8l-wheels -c /requirements-wheels.txt -r /requirements-wheels-h8l.txt
-
-# Build HailoRT and create wheel
-FROM wheels AS build-hailort
-ARG TARGETARCH
-
-SHELL ["/bin/bash", "-c"]
-
-# Install necessary APT packages
-RUN apt-get -qq update \
-    && apt-get -qq install -y \
-    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.9 \
-    python3.9-dev \
-    build-essential cmake git \
-    && rm -rf /var/lib/apt/lists/*
-
-# Extract Python version and set environment variables
-RUN PYTHON_VERSION=$(python3 --version 2>&1 | awk '{print $2}' | cut -d. -f1,2) && \
-    PYTHON_VERSION_NO_DOT=$(echo $PYTHON_VERSION | sed 's/\.//') && \
-    echo "PYTHON_VERSION=$PYTHON_VERSION" > /etc/environment && \
-    echo "PYTHON_VERSION_NO_DOT=$PYTHON_VERSION_NO_DOT" >> /etc/environment
-
-# Clone and build HailoRT
-RUN . /etc/environment && \
-    git clone https://github.com/hailo-ai/hailort.git /opt/hailort && \
-    cd /opt/hailort && \
-    git checkout v4.17.0 && \
-    cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release -DHAILO_BUILD_PYBIND=1 -DPYBIND11_PYTHON_VERSION=${PYTHON_VERSION} && \
-    cmake --build build --config release --target libhailort && \
-    cmake --build build --config release --target _pyhailort && \
-    cp build/hailort/libhailort/bindings/python/src/_pyhailort.cpython-${PYTHON_VERSION_NO_DOT}-$(if [ $TARGETARCH == "amd64" ]; then echo 'x86_64'; else echo 'aarch64'; fi )-linux-gnu.so hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/ && \
-    cp build/hailort/libhailort/src/libhailort.so hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/
-
-RUN ls -ahl /opt/hailort/build/hailort/libhailort/src/
-RUN ls -ahl /opt/hailort/hailort/libhailort/bindings/python/platform/hailo_platform/pyhailort/
-
-# Remove the existing setup.py if it exists in the target directory
-RUN rm -f /opt/hailort/hailort/libhailort/bindings/python/platform/setup.py
-
-# Copy generate_wheel_conf.py and setup.py
-COPY docker/hailo8l/pyhailort_build_scripts/generate_wheel_conf.py /opt/hailort/hailort/libhailort/bindings/python/platform/generate_wheel_conf.py
-COPY docker/hailo8l/pyhailort_build_scripts/setup.py /opt/hailort/hailort/libhailort/bindings/python/platform/setup.py
-
-# Run the generate_wheel_conf.py script
-RUN python3 /opt/hailort/hailort/libhailort/bindings/python/platform/generate_wheel_conf.py
-
-# Create a wheel file using pip3 wheel
-RUN cd /opt/hailort/hailort/libhailort/bindings/python/platform && \
-    python3 setup.py bdist_wheel --dist-dir /hailo-wheels
-
-# Use deps as the base image
-FROM deps AS h8l-frigate
-
-# Copy the wheels from the wheels stage
-COPY --from=h8l-wheels /h8l-wheels /deps/h8l-wheels
-COPY --from=build-hailort /hailo-wheels /deps/hailo-wheels
-COPY --from=build-hailort /etc/environment /etc/environment
-RUN CC=$(python3 -c "import sysconfig; import shlex; cc = sysconfig.get_config_var('CC'); cc_cmd = shlex.split(cc)[0]; print(cc_cmd[:-4] if cc_cmd.endswith('-gcc') else cc_cmd)") && \
-    echo "CC=$CC" >> /etc/environment
-
-# Install the wheels
-RUN pip3 install -U /deps/h8l-wheels/*.whl
-RUN pip3 install -U /deps/hailo-wheels/*.whl
-
-RUN . /etc/environment && \
-    mv /usr/local/lib/python${PYTHON_VERSION}/dist-packages/hailo_platform/pyhailort/libhailort.so /usr/lib/${CC} && \
-    cd /usr/lib/${CC}/ && \
-    ln -s libhailort.so libhailort.so.4.17.0
-
-# Copy base files from the rootfs stage
-COPY --from=rootfs / /
-
-# Set environment variables for Hailo SDK
-ENV PATH="/opt/hailort/bin:${PATH}"
-ENV LD_LIBRARY_PATH="/usr/lib/$(if [ $TARGETARCH == "amd64" ]; then echo 'x86_64'; else echo 'aarch64'; fi )-linux-gnu:${LD_LIBRARY_PATH}"
-
-# Set workdir
-WORKDIR /opt/frigate/

docker/hailo8l/h8l.hcl

@@ -1,27 +0,0 @@
-target wheels {
-  dockerfile = "docker/main/Dockerfile"
-  platforms = ["linux/arm64","linux/amd64"]
-  target = "wheels"
-}
-
-target deps {
-  dockerfile = "docker/main/Dockerfile"
-  platforms = ["linux/arm64","linux/amd64"]
-  target = "deps"
-}
-
-target rootfs {
-  dockerfile = "docker/main/Dockerfile"
-  platforms = ["linux/arm64","linux/amd64"]
-  target = "rootfs"
-}
-
-target h8l {
-  dockerfile = "docker/hailo8l/Dockerfile"
-  contexts = {
-    wheels = "target:wheels"
-    deps = "target:deps"
-    rootfs = "target:rootfs"
-  }
-  platforms = ["linux/arm64","linux/amd64"]
-}

docker/hailo8l/h8l.mk

@@ -1,15 +0,0 @@
-BOARDS += h8l
-
-local-h8l: version
-	docker buildx bake --file=docker/hailo8l/h8l.hcl h8l \
-		--set h8l.tags=frigate:latest-h8l \
-		--load
-
-build-h8l: version
-	docker buildx bake --file=docker/hailo8l/h8l.hcl h8l \
-		--set h8l.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-h8l
-
-push-h8l: build-h8l
-	docker buildx bake --file=docker/hailo8l/h8l.hcl h8l \
-	 	--set h8l.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-h8l \
-		--push

docker/hailo8l/pyhailort_build_scripts/generate_wheel_conf.py

@@ -1,67 +0,0 @@
-import json
-import os
-import platform
-import sys
-import sysconfig
-
-
-def extract_toolchain_info(compiler):
-    # Remove the "-gcc" or "-g++" suffix if present
-    if compiler.endswith("-gcc") or compiler.endswith("-g++"):
-        compiler = compiler.rsplit("-", 1)[0]
-
-    # Extract the toolchain and ABI part (e.g., "gnu")
-    toolchain_parts = compiler.split("-")
-    abi_conventions = next(
-        (part for part in toolchain_parts if part in ["gnu", "musl", "eabi", "uclibc"]),
-        "",
-    )
-
-    return abi_conventions
-
-
-def generate_wheel_conf():
-    conf_file_path = os.path.join(
-        os.path.abspath(os.path.dirname(__file__)), "wheel_conf.json"
-    )
-
-    # Extract current system and Python version information
-    py_version = f"cp{sys.version_info.major}{sys.version_info.minor}"
-    arch = platform.machine()
-    system = platform.system().lower()
-    libc_version = platform.libc_ver()[1]
-
-    # Get the compiler information
-    compiler = sysconfig.get_config_var("CC")
-    abi_conventions = extract_toolchain_info(compiler)
-
-    # Create the new configuration data
-    new_conf_data = {
-        "py_version": py_version,
-        "arch": arch,
-        "system": system,
-        "libc_version": libc_version,
-        "abi": abi_conventions,
-        "extension": {
-            "posix": "so",
-            "nt": "pyd",  # Windows
-        }[os.name],
-    }
-
-    # If the file exists, load the existing data
-    if os.path.isfile(conf_file_path):
-        with open(conf_file_path, "r") as conf_file:
-            conf_data = json.load(conf_file)
-        # Update the existing data with the new data
-        conf_data.update(new_conf_data)
-    else:
-        # If the file does not exist, use the new data
-        conf_data = new_conf_data
-
-    # Write the updated data to the file
-    with open(conf_file_path, "w") as conf_file:
-        json.dump(conf_data, conf_file, indent=4)
-
-
-if __name__ == "__main__":
-    generate_wheel_conf()

docker/hailo8l/pyhailort_build_scripts/setup.py

@@ -1,111 +0,0 @@
-import json
-import os
-
-from setuptools import find_packages, setup
-from wheel.bdist_wheel import bdist_wheel as orig_bdist_wheel
-
-
-class NonPurePythonBDistWheel(orig_bdist_wheel):
-    """Makes the wheel platform-dependent so it can be based on the _pyhailort architecture"""
-
-    def finalize_options(self):
-        orig_bdist_wheel.finalize_options(self)
-        self.root_is_pure = False
-
-
-def _get_hailort_lib_path():
-    lib_filename = "libhailort.so"
-    lib_path = os.path.join(
-        os.path.abspath(os.path.dirname(__file__)),
-        f"hailo_platform/pyhailort/{lib_filename}",
-    )
-    if os.path.exists(lib_path):
-        print(f"Found libhailort shared library at: {lib_path}")
-    else:
-        print(f"Error: libhailort shared library not found at: {lib_path}")
-        raise FileNotFoundError(f"libhailort shared library not found at: {lib_path}")
-    return lib_path
-
-
-def _get_pyhailort_lib_path():
-    conf_file_path = os.path.join(
-        os.path.abspath(os.path.dirname(__file__)), "wheel_conf.json"
-    )
-    if not os.path.isfile(conf_file_path):
-        raise FileNotFoundError(f"Configuration file not found: {conf_file_path}")
-
-    with open(conf_file_path, "r") as conf_file:
-        content = json.load(conf_file)
-        py_version = content["py_version"]
-        arch = content["arch"]
-        system = content["system"]
-        extension = content["extension"]
-        abi = content["abi"]
-
-        # Construct the filename directly
-        lib_filename = f"_pyhailort.cpython-{py_version.split('cp')[1]}-{arch}-{system}-{abi}.{extension}"
-        lib_path = os.path.join(
-            os.path.abspath(os.path.dirname(__file__)),
-            f"hailo_platform/pyhailort/{lib_filename}",
-        )
-
-        if os.path.exists(lib_path):
-            print(f"Found _pyhailort shared library at: {lib_path}")
-        else:
-            print(f"Error: _pyhailort shared library not found at: {lib_path}")
-            raise FileNotFoundError(
-                f"_pyhailort shared library not found at: {lib_path}"
-            )
-
-        return lib_path
-
-
-def _get_package_paths():
-    packages = []
-    pyhailort_lib = _get_pyhailort_lib_path()
-    hailort_lib = _get_hailort_lib_path()
-    if pyhailort_lib:
-        packages.append(pyhailort_lib)
-    if hailort_lib:
-        packages.append(hailort_lib)
-    packages.append(os.path.abspath("hailo_tutorials/notebooks/*"))
-    packages.append(os.path.abspath("hailo_tutorials/hefs/*"))
-    return packages
-
-
-if __name__ == "__main__":
-    setup(
-        author="Hailo team",
-        author_email="contact@hailo.ai",
-        cmdclass={
-            "bdist_wheel": NonPurePythonBDistWheel,
-        },
-        description="HailoRT",
-        entry_points={
-            "console_scripts": [
-                "hailo=hailo_platform.tools.hailocli.main:main",
-            ]
-        },
-        install_requires=[
-            "argcomplete",
-            "contextlib2",
-            "future",
-            "netaddr",
-            "netifaces",
-            "verboselogs",
-            "numpy==1.23.3",
-        ],
-        name="hailort",
-        package_data={
-            "hailo_platform": _get_package_paths(),
-        },
-        packages=find_packages(),
-        platforms=[
-            "linux_x86_64",
-            "linux_aarch64",
-            "win_amd64",
-        ],
-        url="https://hailo.ai/",
-        version="4.17.0",
-        zip_safe=False,
-    )

docker/hailo8l/requirements-wheels-h8l.txt

@@ -1,12 +0,0 @@
-appdirs==1.4.4
-argcomplete==2.0.0
-contextlib2==0.6.0.post1
-distlib==0.3.6
-filelock==3.8.0
-future==0.18.2
-importlib-metadata==5.1.0
-importlib-resources==5.1.2
-netaddr==0.8.0
-netifaces==0.10.9
-verboselogs==1.7
-virtualenv==20.17.0

docker/hailo8l/user_installation.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# Update package list and install dependencies
-sudo apt-get update
-sudo apt-get install -y build-essential cmake git wget linux-modules-extra-$(uname -r)
-
-arch=$(uname -m)
-
-if [[ $arch == "x86_64" ]]; then
-    sudo apt install -y linux-headers-$(uname -r);
-else
-    sudo apt install -y linux-modules-extra-$(uname -r);
-fi
-
-# Clone the HailoRT driver repository
-git clone --depth 1 --branch v4.17.0 https://github.com/hailo-ai/hailort-drivers.git
-
-# Build and install the HailoRT driver
-cd hailort-drivers/linux/pcie
-sudo make all
-sudo make install
-
-# Load the Hailo PCI driver
-sudo modprobe hailo_pci
-
-# Download and install the firmware
-cd ../../
-./download_firmware.sh
-sudo mv hailo8_fw.4.17.0.bin /lib/firmware/hailo/hailo8_fw.bin
-
-# Install udev rules
-sudo cp ./linux/pcie/51-hailo-udev.rules /etc/udev/rules.d/
-sudo udevadm control --reload-rules && sudo udevadm trigger
-
-echo "HailoRT driver installation complete."

docker/main/Dockerfile

@@ -148,8 +148,6 @@ RUN apt-get -qq update \
     gfortran openexr libatlas-base-dev libssl-dev\
     libtbb2 libtbb-dev libdc1394-22-dev libopenexr-dev \
     libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev \
-    # sqlite3 dependencies
-    tclsh \
     # scipy dependencies
     gcc gfortran libopenblas-dev liblapack-dev && \
     rm -rf /var/lib/apt/lists/*
@@ -163,16 +161,9 @@ RUN wget -q https://bootstrap.pypa.io/get-pip.py -O get-pip.py \
 COPY docker/main/requirements.txt /requirements.txt
 RUN pip3 install -r /requirements.txt
 
-# Build pysqlite3 from source to support ChromaDB
-COPY docker/main/build_pysqlite3.sh /build_pysqlite3.sh
-RUN /build_pysqlite3.sh
-
 COPY docker/main/requirements-wheels.txt /requirements-wheels.txt
 RUN pip3 wheel --wheel-dir=/wheels -r /requirements-wheels.txt
 
-COPY docker/main/requirements-wheels-post.txt /requirements-wheels-post.txt
-RUN pip3 wheel --no-deps --wheel-dir=/wheels-post -r /requirements-wheels-post.txt
-
 
 # Collect deps in a single layer
 FROM scratch AS deps-rootfs
@@ -197,15 +188,7 @@ ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn
 ENV NVIDIA_VISIBLE_DEVICES=all
 ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
-# Turn off Chroma Telemetry: https://docs.trychroma.com/telemetry#opting-out
-ENV ANONYMIZED_TELEMETRY=False
-# Allow resetting the chroma database
-ENV ALLOW_RESET=True
-# Disable tokenizer parallelism warning
-ENV TOKENIZERS_PARALLELISM=true
-
-ENV PATH="/usr/local/go2rtc/bin:/usr/local/tempio/bin:/usr/local/nginx/sbin:${PATH}"
-ENV LIBAVFORMAT_VERSION_MAJOR=60
+ENV PATH="/usr/lib/btbn-ffmpeg/bin:/usr/local/go2rtc/bin:/usr/local/tempio/bin:/usr/local/nginx/sbin:${PATH}"
 
 # Install dependencies
 RUN --mount=type=bind,source=docker/main/install_deps.sh,target=/deps/install_deps.sh \
@@ -215,14 +198,6 @@ RUN --mount=type=bind,from=wheels,source=/wheels,target=/deps/wheels \
     python3 -m pip install --upgrade pip && \
     pip3 install -U /deps/wheels/*.whl
 
-# We have to uninstall this dependency specifically
-# as it will break onnxruntime-openvino
-RUN pip3 uninstall -y onnxruntime
-
-RUN --mount=type=bind,from=wheels,source=/wheels-post,target=/deps/wheels \
-    python3 -m pip install --upgrade pip && \
-    pip3 install -U /deps/wheels/*.whl
-
 COPY --from=deps-rootfs / /
 
 RUN ldconfig

docker/main/build_pysqlite3.sh

@@ -1,35 +0,0 @@
-#!/bin/bash
-
-set -euxo pipefail
-
-SQLITE3_VERSION="96c92aba00c8375bc32fafcdf12429c58bd8aabfcadab6683e35bbb9cdebf19e" # 3.46.0
-PYSQLITE3_VERSION="0.5.3"
-
-# Fetch the source code for the latest release of Sqlite.
-if [[ ! -d "sqlite" ]]; then
-  wget https://www.sqlite.org/src/tarball/sqlite.tar.gz?r=${SQLITE3_VERSION} -O sqlite.tar.gz
-  tar xzf sqlite.tar.gz
-  cd sqlite/
-  LIBS="-lm" ./configure --disable-tcl --enable-tempstore=always
-  make sqlite3.c
-  cd ../
-  rm sqlite.tar.gz
-fi
-
-# Grab the pysqlite3 source code.
-if [[ ! -d "./pysqlite3" ]]; then
-  git clone https://github.com/coleifer/pysqlite3.git
-fi
-
-cd pysqlite3/
-git checkout ${PYSQLITE3_VERSION}
-
-# Copy the sqlite3 source amalgamation into the pysqlite3 directory so we can
-# create a self-contained extension module.
-cp "../sqlite/sqlite3.c" ./
-cp "../sqlite/sqlite3.h" ./
-
-# Create the wheel and put it in the /wheels dir.
-sed -i "s|name='pysqlite3-binary'|name=PACKAGE_NAME|g" setup.py
-python3 setup.py build_static
-pip3 wheel . -w /wheels

docker/main/install_deps.sh

@@ -39,54 +39,32 @@ apt-get -qq install --no-install-recommends --no-install-suggests -y \
 
 # btbn-ffmpeg -> amd64
 if [[ "${TARGETARCH}" == "amd64" ]]; then
-    mkdir -p /usr/lib/ffmpeg/5.0
-    mkdir -p /usr/lib/ffmpeg/7.0
+    mkdir -p /usr/lib/btbn-ffmpeg
     wget -qO btbn-ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2022-07-31-12-37/ffmpeg-n5.1-2-g915ef932a3-linux64-gpl-5.1.tar.xz"
-    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/5.0 --strip-components 1
-    rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/5.0/doc /usr/lib/ffmpeg/5.0/bin/ffplay
-    wget -qO btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-09-19-12-51/ffmpeg-n7.0.2-18-g3e6cec1286-linux64-gpl-7.0.tar.xz"
-    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/7.0 --strip-components 1
-    rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/7.0/doc /usr/lib/ffmpeg/7.0/bin/ffplay
+    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/btbn-ffmpeg --strip-components 1
+    rm -rf btbn-ffmpeg.tar.xz /usr/lib/btbn-ffmpeg/doc /usr/lib/btbn-ffmpeg/bin/ffplay
 fi
 
 # ffmpeg -> arm64
 if [[ "${TARGETARCH}" == "arm64" ]]; then
-    mkdir -p /usr/lib/ffmpeg/5.0
-    mkdir -p /usr/lib/ffmpeg/7.0
+    mkdir -p /usr/lib/btbn-ffmpeg
     wget -qO btbn-ffmpeg.tar.xz "https://github.com/NickM-27/FFmpeg-Builds/releases/download/autobuild-2022-07-31-12-37/ffmpeg-n5.1-2-g915ef932a3-linuxarm64-gpl-5.1.tar.xz"
-    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/5.0 --strip-components 1
-    rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/5.0/doc /usr/lib/ffmpeg/5.0/bin/ffplay
-    wget -qO btbn-ffmpeg.tar.xz "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2024-09-19-12-51/ffmpeg-n7.0.2-18-g3e6cec1286-linuxarm64-gpl-7.0.tar.xz"
-    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/ffmpeg/7.0 --strip-components 1
-    rm -rf btbn-ffmpeg.tar.xz /usr/lib/ffmpeg/7.0/doc /usr/lib/ffmpeg/7.0/bin/ffplay
+    tar -xf btbn-ffmpeg.tar.xz -C /usr/lib/btbn-ffmpeg --strip-components 1
+    rm -rf btbn-ffmpeg.tar.xz /usr/lib/btbn-ffmpeg/doc /usr/lib/btbn-ffmpeg/bin/ffplay
 fi
 
 # arch specific packages
 if [[ "${TARGETARCH}" == "amd64" ]]; then
-    # use debian bookworm for amd / intel-i965 driver packages
+    # use debian bookworm for hwaccel 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
-
+        intel-opencl-icd \
+        mesa-va-drivers radeontop libva-drm2 intel-media-va-driver-non-free i965-va-driver libmfx1 intel-gpu-tools
     # 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
-
     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
-    apt-get -qq update
-    apt-get -qq install --no-install-recommends --no-install-suggests -y \
-        intel-opencl-icd intel-level-zero-gpu intel-media-va-driver-non-free \
-        libmfx1 libmfxgen1 libvpl2
-
-    rm -f /usr/share/keyrings/intel-graphics.gpg
-    rm -f /etc/apt/sources.list.d/intel-gpu-jammy.list
 fi
 
 if [[ "${TARGETARCH}" == "arm64" ]]; then
@@ -94,10 +72,6 @@ if [[ "${TARGETARCH}" == "arm64" ]]; then
         libva-drm2 mesa-va-drivers
 fi
 
-# install vulkan
-apt-get -qq install --no-install-recommends --no-install-suggests -y \
-    libvulkan1 mesa-vulkan-drivers
-
 apt-get purge gnupg apt-transport-https xz-utils -y
 apt-get clean autoclean -y
 apt-get autoremove --purge -y

docker/main/requirements-wheels-post.txt

@@ -1,3 +0,0 @@
-# ONNX
-onnxruntime-openvino == 1.19.* ; platform_machine == 'x86_64'
-onnxruntime == 1.19.* ; platform_machine == 'aarch64'

docker/main/requirements-wheels.txt

@@ -1,8 +1,8 @@
 click == 8.1.*
 Flask == 3.0.*
-Flask_Limiter == 3.8.*
+Flask_Limiter == 3.7.*
 imutils == 0.5.*
-joserfc == 1.0.*
+joserfc == 0.11.*
 markupsafe == 2.1.*
 mypy == 1.6.1
 numpy == 1.26.*
@@ -11,13 +11,13 @@ opencv-python-headless == 4.9.0.*
 paho-mqtt == 2.1.*
 pandas == 2.2.*
 peewee == 3.17.*
-peewee_migrate == 1.13.*
+peewee_migrate == 1.12.*
 psutil == 5.9.*
-pydantic == 2.8.*
+pydantic == 2.7.*
 git+https://github.com/fbcotter/py3nvml#egg=py3nvml
 PyYAML == 6.0.*
 pytz == 2024.1
-pyzmq == 26.2.*
+pyzmq == 26.0.*
 ruamel.yaml == 0.18.*
 tzlocal == 5.2
 types-PyYAML == 6.0.*
@@ -28,15 +28,5 @@ norfair == 2.2.*
 setproctitle == 1.3.*
 ws4py == 0.5.*
 unidecode == 1.3.*
-# OpenVino (ONNX installed in wheels-post)
-openvino == 2024.3.*
-# Embeddings
-chromadb == 0.5.0
-onnx_clip == 4.0.*
-# Generative AI
-google-generativeai == 0.6.*
-ollama == 0.2.*
-openai == 1.30.*
-# push notifications
-py-vapid == 1.9.*
-pywebpush == 2.0.*
+onnxruntime == 1.18.*
+openvino == 2024.1.*

docker/main/rootfs/etc/s6-overlay/s6-rc.d/chroma-log/consumer-for

@@ -1 +0,0 @@
-chroma

docker/main/rootfs/etc/s6-overlay/s6-rc.d/chroma-log/pipeline-name

@@ -1 +0,0 @@
-chroma-pipeline

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

@@ -1,4 +0,0 @@
-#!/command/with-contenv bash
-# shellcheck shell=bash
-
-exec logutil-service /dev/shm/logs/chroma

docker/main/rootfs/etc/s6-overlay/s6-rc.d/chroma-log/type

@@ -1 +0,0 @@
-longrun

docker/main/rootfs/etc/s6-overlay/s6-rc.d/chroma/finish

@@ -1,28 +0,0 @@
-#!/command/with-contenv bash
-# shellcheck shell=bash
-# Take down the S6 supervision tree when the service exits
-
-set -o errexit -o nounset -o pipefail
-
-# Logs should be sent to stdout so that s6 can collect them
-
-declare exit_code_container
-exit_code_container=$(cat /run/s6-linux-init-container-results/exitcode)
-readonly exit_code_container
-readonly exit_code_service="${1}"
-readonly exit_code_signal="${2}"
-readonly service="ChromaDB"
-
-echo "[INFO] Service ${service} exited with code ${exit_code_service} (by signal ${exit_code_signal})"
-
-if [[ "${exit_code_service}" -eq 256 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo $((128 + exit_code_signal)) >/run/s6-linux-init-container-results/exitcode
-  fi
-elif [[ "${exit_code_service}" -ne 0 ]]; then
-  if [[ "${exit_code_container}" -eq 0 ]]; then
-    echo "${exit_code_service}" >/run/s6-linux-init-container-results/exitcode
-  fi
-fi
-
-exec /run/s6/basedir/bin/halt

docker/main/rootfs/etc/s6-overlay/s6-rc.d/chroma/producer-for

@@ -1 +0,0 @@
-chroma-log

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

@@ -1,27 +0,0 @@
-#!/command/with-contenv bash
-# shellcheck shell=bash
-# Start the Frigate service
-
-set -o errexit -o nounset -o pipefail
-
-# Logs should be sent to stdout so that s6 can collect them
-
-# Tell S6-Overlay not to restart this service
-s6-svc -O .
-
-search_enabled=`python3 /usr/local/semantic_search/get_search_settings.py | jq -r .enabled`
-
-# Replace the bash process with the Frigate process, redirecting stderr to stdout
-exec 2>&1
-
-if [[ "$search_enabled" == 'true' ]]; then
-    echo "[INFO] Starting ChromaDB..."
-    exec /usr/local/chroma run --path /config/chroma --host 127.0.0.1
-else
-    while true
-    do
-        sleep 9999
-        continue
-    done
-    exit 0
-fi

docker/main/rootfs/etc/s6-overlay/s6-rc.d/chroma/timeout-kill

@@ -1 +0,0 @@
-120000

docker/main/rootfs/etc/s6-overlay/s6-rc.d/chroma/type

@@ -1 +0,0 @@
-longrun

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

@@ -44,6 +44,8 @@ function migrate_db_path() {
 
 echo "[INFO] Preparing Frigate..."
 migrate_db_path
+export LIBAVFORMAT_VERSION_MAJOR=$(ffmpeg -version | grep -Po 'libavformat\W+\K\d+')
+
 echo "[INFO] Starting Frigate..."
 
 cd /opt/frigate || echo "[ERROR] Failed to change working directory to /opt/frigate"

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

@@ -43,6 +43,8 @@ function get_ip_and_port_from_supervisor() {
     export FRIGATE_GO2RTC_WEBRTC_CANDIDATE_INTERNAL="${ip_address}:${webrtc_port}"
 }
 
+export LIBAVFORMAT_VERSION_MAJOR=$(ffmpeg -version | grep -Po 'libavformat\W+\K\d+')
+
 if [[ -f "/dev/shm/go2rtc.yaml" ]]; then
     echo "[INFO] Removing stale config from last run..."
     rm /dev/shm/go2rtc.yaml

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

@@ -4,7 +4,7 @@
 
 set -o errexit -o nounset -o pipefail
 
-dirs=(/dev/shm/logs/frigate /dev/shm/logs/go2rtc /dev/shm/logs/nginx /dev/shm/logs/certsync /dev/shm/logs/chroma)
+dirs=(/dev/shm/logs/frigate /dev/shm/logs/go2rtc /dev/shm/logs/nginx /dev/shm/logs/certsync)
 
 mkdir -p "${dirs[@]}"
 chown nobody:nogroup "${dirs[@]}"

docker/main/rootfs/usr/local/chroma

@@ -1,14 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-s
-__import__("pysqlite3")
-
-import re
-import sys
-
-sys.modules["sqlite3"] = sys.modules.pop("pysqlite3")
-
-from chromadb.cli.cli import app
-
-if __name__ == "__main__":
-    sys.argv[0] = re.sub(r"(-script\.pyw|\.exe)?$", "", sys.argv[0])
-    sys.exit(app())

docker/main/rootfs/usr/local/go2rtc/create_config.py

@@ -2,19 +2,16 @@
 
 import json
 import os
-import shutil
 import sys
 from pathlib import Path
 
 import yaml
 
 sys.path.insert(0, "/opt/frigate")
-from frigate.const import (
-    BIRDSEYE_PIPE,
-    DEFAULT_FFMPEG_VERSION,
-    INCLUDED_FFMPEG_VERSIONS,
+from frigate.const import BIRDSEYE_PIPE  # noqa: E402
+from frigate.ffmpeg_presets import (  # noqa: E402
+    parse_preset_hardware_acceleration_encode,
 )
-from frigate.ffmpeg_presets import parse_preset_hardware_acceleration_encode
 
 sys.path.remove("/opt/frigate")
 
@@ -108,32 +105,16 @@ else:
             **FRIGATE_ENV_VARS
         )
 
-# ensure ffmpeg path is set correctly
-path = config.get("ffmpeg", {}).get("path", "default")
-if path == "default":
-    if shutil.which("ffmpeg") is None:
-        ffmpeg_path = f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg"
-    else:
-        ffmpeg_path = "ffmpeg"
-elif path in INCLUDED_FFMPEG_VERSIONS:
-    ffmpeg_path = f"/usr/lib/ffmpeg/{path}/bin/ffmpeg"
-else:
-    ffmpeg_path = f"{path}/bin/ffmpeg"
-
-if go2rtc_config.get("ffmpeg") is None:
-    go2rtc_config["ffmpeg"] = {"bin": ffmpeg_path}
-elif go2rtc_config["ffmpeg"].get("bin") is None:
-    go2rtc_config["ffmpeg"]["bin"] = ffmpeg_path
-
 # need to replace ffmpeg command when using ffmpeg4
-if int(os.environ.get("LIBAVFORMAT_VERSION_MAJOR", "59") or "59") < 59:
-    if go2rtc_config["ffmpeg"].get("rtsp") is None:
+if int(os.environ["LIBAVFORMAT_VERSION_MAJOR"]) < 59:
+    if go2rtc_config.get("ffmpeg") is None:
+        go2rtc_config["ffmpeg"] = {
+            "rtsp": "-fflags nobuffer -flags low_delay -stimeout 5000000 -user_agent go2rtc/ffmpeg -rtsp_transport tcp -i {input}"
+        }
+    elif go2rtc_config["ffmpeg"].get("rtsp") is None:
         go2rtc_config["ffmpeg"]["rtsp"] = (
             "-fflags nobuffer -flags low_delay -stimeout 5000000 -user_agent go2rtc/ffmpeg -rtsp_transport tcp -i {input}"
         )
-else:
-    if go2rtc_config.get("ffmpeg") is None:
-        go2rtc_config["ffmpeg"] = {"path": ""}
 
 for name in go2rtc_config.get("streams", {}):
     stream = go2rtc_config["streams"][name]
@@ -164,7 +145,7 @@ if config.get("birdseye", {}).get("restream", False):
     birdseye: dict[str, any] = config.get("birdseye")
 
     input = f"-f rawvideo -pix_fmt yuv420p -video_size {birdseye.get('width', 1280)}x{birdseye.get('height', 720)} -r 10 -i {BIRDSEYE_PIPE}"
-    ffmpeg_cmd = f"exec:{parse_preset_hardware_acceleration_encode(ffmpeg_path, config.get('ffmpeg', {}).get('hwaccel_args'), input, '-rtsp_transport tcp -f rtsp {output}')}"
+    ffmpeg_cmd = f"exec:{parse_preset_hardware_acceleration_encode(config.get('ffmpeg', {}).get('hwaccel_args'), input, '-rtsp_transport tcp -f rtsp {output}')}"
 
     if go2rtc_config.get("streams"):
         go2rtc_config["streams"]["birdseye"] = ffmpeg_cmd

docker/main/rootfs/usr/local/semantic_search/get_search_settings.py

@@ -1,28 +0,0 @@
-"""Prints the semantic_search config as json to stdout."""
-
-import json
-import os
-
-import yaml
-
-config_file = os.environ.get("CONFIG_FILE", "/config/config.yml")
-
-# Check if we can use .yaml instead of .yml
-config_file_yaml = config_file.replace(".yml", ".yaml")
-if os.path.isfile(config_file_yaml):
-    config_file = config_file_yaml
-
-try:
-    with open(config_file) as f:
-        raw_config = f.read()
-
-    if config_file.endswith((".yaml", ".yml")):
-        config: dict[str, any] = yaml.safe_load(raw_config)
-    elif config_file.endswith(".json"):
-        config: dict[str, any] = json.loads(raw_config)
-except FileNotFoundError:
-    config: dict[str, any] = {}
-
-search_config: dict[str, any] = config.get("semantic_search", {"enabled": False})
-
-print(json.dumps(search_config))

docker/rockchip/Dockerfile

@@ -22,6 +22,5 @@ ADD https://github.com/MarcA711/rknn-toolkit2/releases/download/v2.0.0/librknnrt
 
 RUN rm -rf /usr/lib/btbn-ffmpeg/bin/ffmpeg
 RUN rm -rf /usr/lib/btbn-ffmpeg/bin/ffprobe
-ADD --chmod=111 https://github.com/MarcA711/Rockchip-FFmpeg-Builds/releases/download/6.1-5/ffmpeg /usr/lib/ffmpeg/6.0/bin/
-ADD --chmod=111 https://github.com/MarcA711/Rockchip-FFmpeg-Builds/releases/download/6.1-5/ffprobe /usr/lib/ffmpeg/6.0/bin/
-ENV PATH="/usr/lib/ffmpeg/6.0/bin/:${PATH}"
+ADD --chmod=111 https://github.com/MarcA711/Rockchip-FFmpeg-Builds/releases/download/6.1-5/ffmpeg /usr/lib/btbn-ffmpeg/bin/
+ADD --chmod=111 https://github.com/MarcA711/Rockchip-FFmpeg-Builds/releases/download/6.1-5/ffprobe /usr/lib/btbn-ffmpeg/bin/

docker/rockchip/rk.mk

@@ -1,15 +1,10 @@
 BOARDS += rk
 
 local-rk: version
-	docker buildx bake --file=docker/rockchip/rk.hcl rk \
-		--set rk.tags=frigate:latest-rk \
-		--load
+	docker buildx bake --load --file=docker/rockchip/rk.hcl --set rk.tags=frigate:latest-rk rk
 
 build-rk: version
-	docker buildx bake --file=docker/rockchip/rk.hcl rk \
-		--set rk.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rk
+	docker buildx bake --file=docker/rockchip/rk.hcl --set rk.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rk rk
 
 push-rk: build-rk
-	docker buildx bake --file=docker/rockchip/rk.hcl rk \
-		--set rk.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rk \
-		--push
+	docker buildx bake --push --file=docker/rockchip/rk.hcl --set rk.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rk rk

docker/rocm/Dockerfile

@@ -23,11 +23,11 @@ COPY docker/rocm/rocm-pin-600 /etc/apt/preferences.d/
 
 RUN apt-get update
 
-RUN apt-get -y install --no-install-recommends migraphx hipfft roctracer
+RUN apt-get -y install --no-install-recommends migraphx
 RUN apt-get -y install --no-install-recommends migraphx-dev
 
 RUN mkdir -p /opt/rocm-dist/opt/rocm-$ROCM/lib
-RUN cd /opt/rocm-$ROCM/lib && cp -dpr libMIOpen*.so* libamd*.so* libhip*.so* libhsa*.so* libmigraphx*.so* librocm*.so* librocblas*.so* libroctracer*.so* librocfft*.so* /opt/rocm-dist/opt/rocm-$ROCM/lib/
+RUN cd /opt/rocm-$ROCM/lib && cp -dpr libMIOpen*.so* libamd*.so* libhip*.so* libhsa*.so* libmigraphx*.so* librocm*.so* librocblas*.so* /opt/rocm-dist/opt/rocm-$ROCM/lib/
 RUN cd /opt/rocm-dist/opt/ && ln -s rocm-$ROCM rocm
 
 RUN mkdir -p /opt/rocm-dist/etc/ld.so.conf.d/
@@ -69,11 +69,7 @@ RUN apt-get -y install libnuma1
 
 WORKDIR /opt/frigate/
 COPY --from=rootfs / /
-
-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/rootfs/ /
 
 #######################################################################
 FROM scratch AS rocm-dist
@@ -105,3 +101,6 @@ ENV HSA_OVERRIDE_GFX_VERSION=$HSA_OVERRIDE_GFX_VERSION
 #######################################################################
 FROM rocm-prelim-hsa-override$HSA_OVERRIDE as rocm-deps
 
+# Request yolov8 download at startup
+ENV DOWNLOAD_YOLOV8=1
+

docker/rocm/requirements-wheels-rocm.txt

@@ -1 +0,0 @@
-onnxruntime-rocm @ https://github.com/NickM-27/frigate-onnxruntime-rocm/releases/download/v1.0.0/onnxruntime_rocm-1.17.3-cp39-cp39-linux_x86_64.whl

docker/rocm/rocm.mk

@@ -4,50 +4,14 @@ BOARDS += rocm
 ROCM_CHIPSETS:=gfx900:9.0.0 gfx1030:10.3.0 gfx1100:11.0.0
 
 local-rocm: version
-	$(foreach chipset,$(ROCM_CHIPSETS), \
-		AMDGPU=$(word 1,$(subst :, ,$(chipset))) \
-		HSA_OVERRIDE_GFX_VERSION=$(word 2,$(subst :, ,$(chipset))) \
-		HSA_OVERRIDE=1 \
-		docker buildx bake --file=docker/rocm/rocm.hcl rocm \
-			--set rocm.tags=frigate:latest-rocm-$(word 1,$(subst :, ,$(chipset))) \
-			--load \
-	&&) true
-	
-	unset HSA_OVERRIDE_GFX_VERSION && \
-	HSA_OVERRIDE=0 \
-	AMDGPU=gfx \
-	docker buildx bake --file=docker/rocm/rocm.hcl rocm \
-		--set rocm.tags=frigate:latest-rocm \
-		--load
+	$(foreach chipset,$(ROCM_CHIPSETS),AMDGPU=$(word 1,$(subst :, ,$(chipset))) HSA_OVERRIDE_GFX_VERSION=$(word 2,$(subst :, ,$(chipset))) HSA_OVERRIDE=1 docker buildx bake --load --file=docker/rocm/rocm.hcl --set rocm.tags=frigate:latest-rocm-$(word 1,$(subst :, ,$(chipset))) rocm;)
+	unset HSA_OVERRIDE_GFX_VERSION && HSA_OVERRIDE=0 AMDGPU=gfx docker buildx bake --load --file=docker/rocm/rocm.hcl --set rocm.tags=frigate:latest-rocm rocm
 
 build-rocm: version
-	$(foreach chipset,$(ROCM_CHIPSETS), \
-		AMDGPU=$(word 1,$(subst :, ,$(chipset))) \
-		HSA_OVERRIDE_GFX_VERSION=$(word 2,$(subst :, ,$(chipset))) \
-		HSA_OVERRIDE=1 \
-		docker buildx bake --file=docker/rocm/rocm.hcl rocm \
-			--set rocm.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rocm-$(chipset) \
-	&&) true
-
-	unset HSA_OVERRIDE_GFX_VERSION && \
-	HSA_OVERRIDE=0 \
-	AMDGPU=gfx \
-	docker buildx bake --file=docker/rocm/rocm.hcl rocm \
-		--set rocm.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rocm
+	$(foreach chipset,$(ROCM_CHIPSETS),AMDGPU=$(word 1,$(subst :, ,$(chipset))) HSA_OVERRIDE_GFX_VERSION=$(word 2,$(subst :, ,$(chipset))) HSA_OVERRIDE=1 docker buildx bake --file=docker/rocm/rocm.hcl --set rocm.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rocm-$(chipset) rocm;)
+	unset HSA_OVERRIDE_GFX_VERSION && HSA_OVERRIDE=0 AMDGPU=gfx docker buildx bake --file=docker/rocm/rocm.hcl --set rocm.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rocm rocm
 
 push-rocm: build-rocm
-	$(foreach chipset,$(ROCM_CHIPSETS), \
-		AMDGPU=$(word 1,$(subst :, ,$(chipset))) \
-		HSA_OVERRIDE_GFX_VERSION=$(word 2,$(subst :, ,$(chipset))) \
-		HSA_OVERRIDE=1 \
-		docker buildx bake --file=docker/rocm/rocm.hcl rocm \
-			--set rocm.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rocm-$(chipset) \
-			--push \
-	&&) true
+	$(foreach chipset,$(ROCM_CHIPSETS),AMDGPU=$(word 1,$(subst :, ,$(chipset))) HSA_OVERRIDE_GFX_VERSION=$(word 2,$(subst :, ,$(chipset))) HSA_OVERRIDE=1 docker buildx bake --push --file=docker/rocm/rocm.hcl --set rocm.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rocm-$(chipset) rocm;)
+	unset HSA_OVERRIDE_GFX_VERSION && HSA_OVERRIDE=0 AMDGPU=gfx docker buildx bake --push --file=docker/rocm/rocm.hcl --set rocm.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rocm rocm
 
-	unset HSA_OVERRIDE_GFX_VERSION && \
-	HSA_OVERRIDE=0 \
-	AMDGPU=gfx \
-	docker buildx bake --file=docker/rocm/rocm.hcl rocm \
-		--set rocm.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rocm \
-		--push

docker/rocm/rootfs/etc/s6-overlay/s6-rc.d/compile-rocm-models/run

@@ -0,0 +1,20 @@
+#!/command/with-contenv bash
+# shellcheck shell=bash
+# Compile YoloV8 ONNX files into ROCm MIGraphX files
+
+OVERRIDE=$(cd /opt/frigate && python3 -c 'import frigate.detectors.plugins.rocm as rocm; print(rocm.auto_override_gfx_version())')
+
+if ! test -z "$OVERRIDE"; then
+  echo "Using HSA_OVERRIDE_GFX_VERSION=${OVERRIDE}"
+  export HSA_OVERRIDE_GFX_VERSION=$OVERRIDE
+fi
+
+for onnx in /config/model_cache/yolov8/*.onnx
+do
+  mxr="${onnx%.onnx}.mxr"
+  if ! test -f $mxr; then
+    echo "processing $onnx into $mxr"
+    /opt/rocm/bin/migraphx-driver compile $onnx --optimize --gpu --enable-offload-copy --binary -o $mxr
+  fi
+done
+

docker/rocm/rootfs/etc/s6-overlay/s6-rc.d/compile-rocm-models/type

@@ -0,0 +1 @@
+oneshot

docker/rocm/rootfs/etc/s6-overlay/s6-rc.d/compile-rocm-models/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/compile-rocm-models/run

docker/rpi/Dockerfile

@@ -12,7 +12,5 @@ RUN rm -rf /usr/lib/btbn-ffmpeg/
 RUN --mount=type=bind,source=docker/rpi/install_deps.sh,target=/deps/install_deps.sh \
     /deps/install_deps.sh
 
-ENV LIBAVFORMAT_VERSION_MAJOR=58
-
 WORKDIR /opt/frigate/
 COPY --from=rootfs / /

docker/rpi/rpi.mk

@@ -1,15 +1,10 @@
 BOARDS += rpi
 
 local-rpi: version
-	docker buildx bake --file=docker/rpi/rpi.hcl rpi \
-		--set rpi.tags=frigate:latest-rpi \
-		--load
+	docker buildx bake --load --file=docker/rpi/rpi.hcl --set rpi.tags=frigate:latest-rpi rpi
 
 build-rpi: version
-	docker buildx bake --file=docker/rpi/rpi.hcl rpi \
-		--set rpi.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rpi
+	docker buildx bake --file=docker/rpi/rpi.hcl --set rpi.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rpi rpi
 
 push-rpi: build-rpi
-	docker buildx bake --file=docker/rpi/rpi.hcl rpi \
-		--set rpi.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rpi \
-		--push
+	docker buildx bake --push --file=docker/rpi/rpi.hcl --set rpi.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rpi rpi

docker/tensorrt/Dockerfile.amd64

@@ -12,28 +12,12 @@ ARG TARGETARCH
 COPY docker/tensorrt/requirements-amd64.txt /requirements-tensorrt.txt
 RUN mkdir -p /trt-wheels && pip3 wheel --wheel-dir=/trt-wheels -r /requirements-tensorrt.txt
 
-# Build CuDNN
-FROM wget AS cudnn-deps
-
-ARG COMPUTE_LEVEL
-
-RUN apt-get update \
-    && apt-get install -y git build-essential
-
-RUN wget https://developer.download.nvidia.com/compute/cuda/repos/debian11/x86_64/cuda-keyring_1.1-1_all.deb \
-&& dpkg -i cuda-keyring_1.1-1_all.deb \
-&& apt-get update \
-&& apt-get -y install cuda-toolkit \
-&& rm -rf /var/lib/apt/lists/*
-
 FROM tensorrt-base AS frigate-tensorrt
 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 && \
     ldconfig
-COPY --from=cudnn-deps /usr/local/cuda-12.6 /usr/local/cuda
 
-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 / /
 
@@ -42,7 +26,6 @@ FROM devcontainer AS devcontainer-trt
 
 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=cudnn-deps /usr/local/cuda-12.6 /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 \

docker/tensorrt/requirements-amd64.txt

@@ -8,7 +8,5 @@ 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.14.0; platform_machine == 'x86_64'
-onnxruntime-gpu==1.17.*; platform_machine == 'x86_64'
 protobuf==3.20.3; platform_machine == 'x86_64'

docker/tensorrt/trt.mk

@@ -7,35 +7,20 @@ JETPACK4_ARGS := ARCH=arm64 BASE_IMAGE=$(JETPACK4_BASE) SLIM_BASE=$(JETPACK4_BAS
 JETPACK5_ARGS := ARCH=arm64 BASE_IMAGE=$(JETPACK5_BASE) SLIM_BASE=$(JETPACK5_BASE) TRT_BASE=$(JETPACK5_BASE)
 
 local-trt: version
-	$(X86_DGPU_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl tensorrt \
-		--set tensorrt.tags=frigate:latest-tensorrt \
-		--load
+	$(X86_DGPU_ARGS) docker buildx bake --load --file=docker/tensorrt/trt.hcl --set tensorrt.tags=frigate:latest-tensorrt tensorrt
 
 local-trt-jp4: version
-	$(JETPACK4_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl tensorrt \
-		--set tensorrt.tags=frigate:latest-tensorrt-jp4 \
-		--load
+	$(JETPACK4_ARGS) docker buildx bake --load --file=docker/tensorrt/trt.hcl --set tensorrt.tags=frigate:latest-tensorrt-jp4 tensorrt
 
 local-trt-jp5: version
-	$(JETPACK5_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl tensorrt \
-		--set tensorrt.tags=frigate:latest-tensorrt-jp5 \
-		--load
+	$(JETPACK5_ARGS) docker buildx bake --load --file=docker/tensorrt/trt.hcl --set tensorrt.tags=frigate:latest-tensorrt-jp5 tensorrt
 
 build-trt:
-	$(X86_DGPU_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl tensorrt \
-		--set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt
-	$(JETPACK4_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl tensorrt \
-		--set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt-jp4
-	$(JETPACK5_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl tensorrt \
-		--set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt-jp5
+	$(X86_DGPU_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl --set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt tensorrt
+	$(JETPACK4_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl --set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt-jp4 tensorrt
+	$(JETPACK5_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl --set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt-jp5 tensorrt
 
 push-trt: build-trt
-	$(X86_DGPU_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl tensorrt \
-		--set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt \
-		--push
-	$(JETPACK4_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl tensorrt \
-		--set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt-jp4 \
-		--push
-	$(JETPACK5_ARGS) docker buildx bake --file=docker/tensorrt/trt.hcl tensorrt \
-		--set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt-jp5 \
-		--push
+	$(X86_DGPU_ARGS) docker buildx bake --push --file=docker/tensorrt/trt.hcl --set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt tensorrt
+	$(JETPACK4_ARGS) docker buildx bake --push --file=docker/tensorrt/trt.hcl --set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt-jp4 tensorrt
+	$(JETPACK5_ARGS) docker buildx bake --push --file=docker/tensorrt/trt.hcl --set tensorrt.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-tensorrt-jp5 tensorrt

docker/webonly/Dockerfile

@@ -0,0 +1,19 @@
+# syntax=docker/dockerfile:1.6
+
+# Frigate web build
+# This should be architecture agnostic, so speed up the build on multiarch by not using QEMU.
+FROM --platform=$BUILDPLATFORM node:20 AS web-build
+
+WORKDIR /work
+COPY web/package.json web/package-lock.json ./
+RUN npm install
+
+COPY web/ ./
+RUN npm run build \
+    && mv dist/BASE_PATH/monacoeditorwork/* dist/assets/ \
+    && rm -rf dist/BASE_PATH
+
+FROM --platform=$BUILDPLATFORM ghcr.io/blakeblackshear/frigate:stable AS frigate
+WORKDIR /opt/frigate/
+RUN rm -rf web/ && mkdir web
+COPY --from=web-build /work/dist/ web/

docs/docs/configuration/advanced.md

@@ -41,7 +41,7 @@ environment_vars:
 
 ### `database`
 
-Tracked object and recording information is managed in a sqlite database at `/config/frigate.db`. If that database is deleted, recordings will be orphaned and will need to be cleaned up manually. They also won't show up in the Media Browser within Home Assistant.
+Event and recording information is managed in a sqlite database at `/config/frigate.db`. If that database is deleted, recordings will be orphaned and will need to be cleaned up manually. They also won't show up in the Media Browser within Home Assistant.
 
 If you are storing your database on a network share (SMB, NFS, etc), you may get a `database is locked` error message on startup. You can customize the location of the database in the config if necessary.
 
@@ -162,15 +162,15 @@ listen [::]:5000 ipv6only=off;
 
 ### Custom ffmpeg build
 
-Included with Frigate is a build of ffmpeg that works for the vast majority of users. However, there exists some hardware setups which have incompatibilities with the included build. In this case, statically built ffmpeg binary can be downloaded to /config and used.
+Included with Frigate is a build of ffmpeg that works for the vast majority of users. However, there exists some hardware setups which have incompatibilities with the included build. In this case, a docker volume mapping can be used to overwrite the included ffmpeg build with an ffmpeg build that works for your specific hardware setup.
 
 To do this:
 
-1. Download your ffmpeg build and uncompress to the Frigate config folder.
+1. Download your ffmpeg build and uncompress to a folder on the host (let's use `/home/appdata/frigate/custom-ffmpeg` for this example).
 2. Update your docker-compose or docker CLI to include `'/home/appdata/frigate/custom-ffmpeg':'/usr/lib/btbn-ffmpeg':'ro'` in the volume mappings.
 3. Restart Frigate and the custom version will be used if the mapping was done correctly.
 
-NOTE: The folder that is set for the config needs to be the folder that contains `/bin`. So if the full structure is `/home/appdata/frigate/custom-ffmpeg/bin/ffmpeg` then the `ffmpeg -> path` field should be `/config/custom-ffmpeg/bin`.
+NOTE: The folder that is mapped from the host needs to be the folder that contains `/bin`. So if the full structure is `/home/appdata/frigate/custom-ffmpeg/bin/ffmpeg` then `/home/appdata/frigate/custom-ffmpeg` needs to be mapped to `/usr/lib/btbn-ffmpeg`.
 
 ### Custom go2rtc version
 

docs/docs/configuration/camera_specific.md

@@ -187,4 +187,4 @@ ffmpeg:
 
 ### TP-Link VIGI Cameras
 
-TP-Link VIGI cameras need some adjustments to the main stream settings on the camera itself to avoid issues. The stream needs to be configured as `H264` with `Smart Coding` set to `off`. Without these settings you may have problems when trying to watch recorded footage. For example Firefox will stop playback after a few seconds and show the following error message: `The media playback was aborted due to a corruption problem or because the media used features your browser did not support.`.
+TP-Link VIGI cameras need some adjustments to the main stream settings on the camera itself to avoid issues. The stream needs to be configured as `H264` with `Smart Coding` set to `off`. Without these settings you may have problems when trying to watch recorded events. For example Firefox will stop playback after a few seconds and show the following error message: `The media playback was aborted due to a corruption problem or because the media used features your browser did not support.`.

docs/docs/configuration/cameras.md

@@ -7,7 +7,7 @@ title: Camera Configuration
 
 Several inputs can be configured for each camera and the role of each input can be mixed and matched based on your needs. This allows you to use a lower resolution stream for object detection, but create recordings from a higher resolution stream, or vice versa.
 
-A camera is enabled by default but can be temporarily disabled by using `enabled: False`. Existing tracked objects and recordings can still be accessed. Live streams, recording and detecting are not working. Camera specific configurations will be used.
+A camera is enabled by default but can be temporarily disabled by using `enabled: False`. Existing events and recordings can still be accessed. Live streams, recording and detecting are not working. Camera specific configurations will be used.
 
 Each role can only be assigned to one input per camera. The options for roles are as follows:
 
@@ -46,14 +46,6 @@ cameras:
   side: ...
 ```
 
-:::note
-
-If you only define one stream in your `inputs` and do not assign a `detect` role to it, Frigate will automatically assign it the `detect` role. Frigate will always decode a stream to support motion detection, Birdseye, the API image endpoints, and other features, even if you have disabled object detection with `enabled: False` in your config's `detect` section.
-
-If you plan to use Frigate for recording only, it is still recommended to define a `detect` role for a low resolution stream to minimize resource usage from the required stream decoding.
-
-:::
-
 For camera model specific settings check the [camera specific](camera_specific.md) infos.
 
 ## Setting up camera PTZ controls

docs/docs/configuration/genai.md

@@ -1,149 +0,0 @@
----
-id: genai
-title: Generative AI
----
-
-Generative AI can be used to automatically generate descriptions based on the thumbnails of your tracked objects. This helps with [Semantic Search](/configuration/semantic_search) in Frigate by providing detailed text descriptions as a basis of the search query.
-
-Semantic Search must be enabled to use Generative AI. Descriptions are accessed via the _Explore_ view in the Frigate UI by clicking on a tracked object's thumbnail.
-
-## Configuration
-
-Generative AI can be enabled for all cameras or only for specific cameras. There are currently 3 providers available to integrate with Frigate.
-
-If the provider you choose requires an API key, you may either directly paste it in your configuration, or store it in an environment variable prefixed with `FRIGATE_`.
-
-```yaml
-genai:
-  enabled: True
-  provider: gemini
-  api_key: "{FRIGATE_GEMINI_API_KEY}"
-  model: gemini-1.5-flash
-
-cameras:
-  front_camera: ...
-  indoor_camera:
-    genai: # <- disable GenAI for your indoor camera
-      enabled: False
-```
-
-## Ollama
-
-[Ollama](https://ollama.com/) allows you to self-host large language models and keep everything running locally. It provides a nice API over [llama.cpp](https://github.com/ggerganov/llama.cpp). It is highly recommended to host this server on a machine with an Nvidia graphics card, or on a Apple silicon Mac for best performance. Most of the 7b parameter 4-bit vision models will fit inside 8GB of VRAM. There is also a [docker container](https://hub.docker.com/r/ollama/ollama) available.
-
-### Supported Models
-
-You must use a vision capable model with Frigate. Current model variants can be found [in their model library](https://ollama.com/library). At the time of writing, this includes `llava`, `llava-llama3`, `llava-phi3`, and `moondream`.
-
-:::note
-
-You should have at least 8 GB of RAM available (or VRAM if running on GPU) to run the 7B models, 16 GB to run the 13B models, and 32 GB to run the 33B models.
-
-:::
-
-### Configuration
-
-```yaml
-genai:
-  enabled: True
-  provider: ollama
-  base_url: http://localhost:11434
-  model: llava
-```
-
-## Google Gemini
-
-Google Gemini has a free tier allowing [15 queries per minute](https://ai.google.dev/pricing) to the API, which is more than sufficient for standard Frigate usage.
-
-### Supported Models
-
-You must use a vision capable model with Frigate. Current model variants can be found [in their documentation](https://ai.google.dev/gemini-api/docs/models/gemini). At the time of writing, this includes `gemini-1.5-pro` and `gemini-1.5-flash`.
-
-### Get API Key
-
-To start using Gemini, you must first get an API key from [Google AI Studio](https://aistudio.google.com).
-
-1. Accept the Terms of Service
-2. Click "Get API Key" from the right hand navigation
-3. Click "Create API key in new project"
-4. Copy the API key for use in your config
-
-### Configuration
-
-```yaml
-genai:
-  enabled: True
-  provider: gemini
-  api_key: "{FRIGATE_GEMINI_API_KEY}"
-  model: gemini-1.5-flash
-```
-
-## OpenAI
-
-OpenAI does not have a free tier for their API. With the release of gpt-4o, pricing has been reduced and each generation should cost fractions of a cent if you choose to go this route.
-
-### Supported Models
-
-You must use a vision capable model with Frigate. Current model variants can be found [in their documentation](https://platform.openai.com/docs/models). At the time of writing, this includes `gpt-4o` and `gpt-4-turbo`.
-
-### Get API Key
-
-To start using OpenAI, you must first [create an API key](https://platform.openai.com/api-keys) and [configure billing](https://platform.openai.com/settings/organization/billing/overview).
-
-### Configuration
-
-```yaml
-genai:
-  enabled: True
-  provider: openai
-  api_key: "{FRIGATE_OPENAI_API_KEY}"
-  model: gpt-4o
-```
-
-## Custom Prompts
-
-Frigate sends multiple frames from the tracked object along with a prompt to your Generative AI provider asking it to generate a description. The default prompt is as follows:
-
-```
-Describe the {label} in the sequence of images with as much detail as possible. Do not describe the background.
-```
-
-:::tip
-
-Prompts can use variable replacements like `{label}`, `{sub_label}`, and `{camera}` to substitute information from the tracked object as part of the prompt.
-
-:::
-
-You are also able to define custom prompts in your configuration.
-
-```yaml
-genai:
-  enabled: True
-  provider: ollama
-  base_url: http://localhost:11434
-  model: llava
-  prompt: "Describe the {label} in these images from the {camera} security camera."
-  object_prompts:
-    person: "Describe the main person in these images (gender, age, clothing, activity, etc). Do not include where the activity is occurring (sidewalk, concrete, driveway, etc)."
-    car: "Label the primary vehicle in these images with just the name of the company if it is a delivery vehicle, or the color make and model."
-```
-
-Prompts can also be overriden at the camera level to provide a more detailed prompt to the model about your specific camera, if you desire.
-
-```yaml
-cameras:
-  front_door:
-    genai:
-      prompt: "Describe the {label} in these images from the {camera} security camera at the front door of a house, aimed outward toward the street."
-      object_prompts:
-        person: "Describe the main person in these images (gender, age, clothing, activity, etc). Do not include where the activity is occurring (sidewalk, concrete, driveway, etc). If delivering a package, include the company the package is from."
-        cat: "Describe the cat in these images (color, size, tail). Indicate whether or not the cat is by the flower pots. If the cat is chasing a mouse, make up a name for the mouse."
-```
-
-### Experiment with prompts
-
-Many providers also have a public facing chat interface for their models. Download a couple of different thumbnails or snapshots from Frigate and try new things in the playground to get descriptions to your liking before updating the prompt in Frigate.
-
-- OpenAI - [ChatGPT](https://chatgpt.com)
-- Gemini - [Google AI Studio](https://aistudio.google.com)
-- Ollama - [Open WebUI](https://docs.openwebui.com/)

docs/docs/configuration/hardware_acceleration.md

@@ -65,33 +65,24 @@ Or map in all the `/dev/video*` devices.
 
 ## Intel-based CPUs
 
-**Recommended hwaccel Preset**
-
-| CPU Generation | Intel Driver | Recommended Preset | Notes                               |
-| -------------- | ------------ | ------------------ | ----------------------------------- |
-| gen1 - gen7    | i965         | preset-vaapi       | qsv is not supported                |
-| gen8 - gen12   | iHD          | preset-vaapi       | preset-intel-qsv-* can also be used |
-| gen13+         | iHD / Xe     | preset-intel-qsv-* |                                     |
-| Intel Arc GPU  | iHD / Xe     | preset-intel-qsv-* |                                     |
-
-:::note
-
-The default driver is `iHD`. You may need to change the driver to `i965` by adding the following environment variable `LIBVA_DRIVER_NAME=i965` to your docker-compose file or [in the `frigate.yaml` for HA OS users](advanced.md#environment_vars).
-
-See [The Intel Docs](https://www.intel.com/content/www/us/en/support/articles/000005505/processors.html to figure out what generation your CPU is.)
-
-:::
-
 ### Via VAAPI
 
-VAAPI supports automatic profile selection so it will work automatically with both H.264 and H.265 streams.
+VAAPI supports automatic profile selection so it will work automatically with both H.264 and H.265 streams. VAAPI is recommended for all generations of Intel-based CPUs.
 
 ```yaml
 ffmpeg:
   hwaccel_args: preset-vaapi
 ```
 
-### Via Quicksync
+:::note
+
+With some of the processors, like the J4125, the default driver `iHD` doesn't seem to work correctly for hardware acceleration. You may need to change the driver to `i965` by adding the following environment variable `LIBVA_DRIVER_NAME=i965` to your docker-compose file or [in the `frigate.yaml` for HA OS users](advanced.md#environment_vars).
+
+:::
+
+### Via Quicksync (>=10th Generation only)
+
+If VAAPI does not work for you, you can try QSV if your processor supports it. QSV must be set specifically based on the video encoding of the stream.
 
 #### H.264 streams
 

docs/docs/configuration/index.md

@@ -56,11 +56,6 @@ go2rtc:
     password: "{FRIGATE_GO2RTC_RTSP_PASSWORD}"
 ```
 
-```yaml
-genai:
-  api_key: "{FRIGATE_GENAI_API_KEY}"
-```
-
 ## Common configuration examples
 
 Here are some common starter configuration examples. Refer to the [reference config](./reference.md) for detailed information about all the config values.
@@ -72,7 +67,7 @@ Here are some common starter configuration examples. Refer to the [reference con
 - Hardware acceleration for decoding video
 - USB Coral detector
 - Save all video with any detectable motion for 7 days regardless of whether any objects were detected or not
-- Continue to keep all video if it qualified as an alert or detection for 30 days
+- Continue to keep all video if it was during any event for 30 days
 - Save snapshots for 30 days
 - Motion mask for the camera timestamp
 
@@ -95,12 +90,10 @@ record:
   retain:
     days: 7
     mode: motion
-  alerts:
+  events:
     retain:
-      days: 30
-  detections:
-    retain:
-      days: 30
+      default: 30
+      mode: motion
 
 snapshots:
   enabled: True
@@ -130,7 +123,7 @@ cameras:
 - VAAPI hardware acceleration for decoding video
 - USB Coral detector
 - Save all video with any detectable motion for 7 days regardless of whether any objects were detected or not
-- Continue to keep all video if it qualified as an alert or detection for 30 days
+- Continue to keep all video if it was during any event for 30 days
 - Save snapshots for 30 days
 - Motion mask for the camera timestamp
 
@@ -151,12 +144,10 @@ record:
   retain:
     days: 7
     mode: motion
-  alerts:
+  events:
     retain:
-      days: 30
-  detections:
-    retain:
-      days: 30
+      default: 30
+      mode: motion
 
 snapshots:
   enabled: True
@@ -186,7 +177,7 @@ cameras:
 - VAAPI hardware acceleration for decoding video
 - OpenVino detector
 - Save all video with any detectable motion for 7 days regardless of whether any objects were detected or not
-- Continue to keep all video if it qualified as an alert or detection for 30 days
+- Continue to keep all video if it was during any event for 30 days
 - Save snapshots for 30 days
 - Motion mask for the camera timestamp
 
@@ -218,12 +209,10 @@ record:
   retain:
     days: 7
     mode: motion
-  alerts:
+  events:
     retain:
-      days: 30
-  detections:
-    retain:
-      days: 30
+      default: 30
+      mode: motion
 
 snapshots:
   enabled: True

docs/docs/configuration/motion_detection.md

@@ -13,11 +13,11 @@ Once motion is detected, it tries to group up nearby areas of motion together in
 
 The default motion settings should work well for the majority of cameras, however there are cases where tuning motion detection can lead to better and more optimal results. Each camera has its own environment with different variables that affect motion, this means that the same motion settings will not fit all of your cameras.
 
-Before tuning motion it is important to understand the goal. In an optimal configuration, motion from people and cars would be detected, but not grass moving, lighting changes, timestamps, etc. If your motion detection is too sensitive, you will experience higher CPU loads and greater false positives from the increased rate of object detection. If it is not sensitive enough, you will miss objects that you want to track.
+Before tuning motion it is important to understand the goal. In an optimal configuration, motion from people and cars would be detected, but not grass moving, lighting changes, timestamps, etc. If your motion detection is too sensitive, you will experience higher CPU loads and greater false positives from the increased rate of object detection. If it is not sensitive enough, you will miss events.
 
 ## Create Motion Masks
 
-First, mask areas with regular motion not caused by the objects you want to detect. The best way to find candidates for motion masks is by watching the debug stream with motion boxes enabled. Good use cases for motion masks are timestamps or tree limbs and large bushes that regularly move due to wind. When possible, avoid creating motion masks that would block motion detection for objects you want to track **even if they are in locations where you don't want alerts or detections**. Motion masks should not be used to avoid detecting objects in specific areas. More details can be found [in the masks docs.](/configuration/masks.md).
+First, mask areas with regular motion not caused by the objects you want to detect. The best way to find candidates for motion masks is by watching the debug stream with motion boxes enabled. Good use cases for motion masks are timestamps or tree limbs and large bushes that regularly move due to wind. When possible, avoid creating motion masks that would block motion detection for objects you want to track **even if they are in locations where you don't want events**. Motion masks should not be used to avoid detecting objects in specific areas. More details can be found [in the masks docs.](/configuration/masks.md).
 
 ## Prepare For Testing
 
@@ -29,7 +29,7 @@ Now that things are set up, find a time to tune that represents normal circumsta
 
 :::note
 
-Remember that motion detection is just used to determine when object detection should be used. You should aim to have motion detection sensitive enough that you won't miss objects you want to detect with object detection. The goal is to prevent object detection from running constantly for every small pixel change in the image. Windy days are still going to result in lots of motion being detected.
+Remember that motion detection is just used to determine when object detection should be used. You should aim to have motion detection sensitive enough that you won't miss events from objects you want to detect with object detection. The goal is to prevent object detection from running constantly for every small pixel change in the image. Windy days are still going to result in lots of motion being detected.
 
 :::
 
@@ -94,7 +94,7 @@ motion:
 
 :::tip
 
-Some cameras like doorbell cameras may have missed detections when someone walks directly in front of the camera and the lightning_threshold causes motion detection to be re-calibrated. In this case, it may be desirable to increase the `lightning_threshold` to ensure these objects are not missed.
+Some cameras like doorbell cameras may have missed detections when someone walks directly in front of the camera and the lightning_threshold causes motion detection to be re-calibrated. In this case, it may be desirable to increase the `lightning_threshold` to ensure these events are not missed.
 
 :::
 

docs/docs/configuration/notifications.md

@@ -1,42 +0,0 @@
----
-id: notifications
-title: Notifications
----
-
-# Notifications
-
-Frigate offers native notifications using the [WebPush Protocol](https://web.dev/articles/push-notifications-web-push-protocol) which uses the [VAPID spec](https://tools.ietf.org/html/draft-thomson-webpush-vapid) to deliver notifications to web apps using encryption.
-
-## Setting up Notifications
-
-In order to use notifications the following requirements must be met:
-
-- Frigate must be accessed via a secure https connection
-- A supported browser must be used. Currently Chrome, Firefox, and Safari are known to be supported.
-- In order for notifications to be usable externally, Frigate must be accessible externally
-
-### Configuration
-
-To configure notifications, go to the Frigate WebUI -> Settings -> Notifications and enable, then fill out the fields and save.
-
-### Registration
-
-Once notifications are enabled, press the `Register for Notifications` button on all devices that you would like to receive notifications on. This will register the background worker. After this Frigate must be restarted and then notifications will begin to be sent.
-
-## Supported Notifications
-
-Currently notifications are only supported for review alerts. More notifications will be supported in the future.
-
-:::note
-
-Currently, only Chrome supports images in notifications. Safari and Firefox will only show a title and message in the notification.
-
-:::
-
-## Reduce Notification Latency
-
-Different platforms handle notifications differently, some settings changes may be required to get optimal notification delivery.
-
-### Android
-
-Most Android phones have battery optimization settings. To get reliable Notification delivery the browser (Chrome, Firefox) should have battery optimizations disabled. If Frigate is running as a PWA then the Frigate app should have battery optimizations disabled as well.

docs/docs/configuration/object_detectors.md

@@ -3,32 +3,9 @@ id: object_detectors
 title: Object Detectors
 ---
 
-# Supported Hardware
-
-Frigate supports multiple different detectors that work on different types of hardware:
-
-**Most Hardware**
-- [Coral EdgeTPU](#edge-tpu-detector): The Google Coral EdgeTPU is available in USB and m.2 format allowing for a wide range of compatibility with devices.
-- [Hailo](#hailo-8l): The Hailo8 AI Acceleration module is available in m.2 format with a HAT for RPi devices, offering a wide range of compatibility with devices.
-
-**AMD**
-- [ROCm](#amdrocm-gpu-detector): ROCm can run on AMD Discrete GPUs to provide efficient object detection.
-- [ONNX](#onnx): ROCm will automatically be detected and used as a detector in the `-rocm` Frigate image when a supported ONNX model is configured.
-
-**Intel**
-- [OpenVino](#openvino-detector): OpenVino can run on Intel Arc GPUs, Intel integrated GPUs, and Intel CPUs to provide efficient object detection.
-- [ONNX](#onnx): OpenVINO will automatically be detected and used as a detector in the default Frigate image when a supported ONNX model is configured.
-
-**Nvidia**
-- [TensortRT](#nvidia-tensorrt-detector): TensorRT can run on Nvidia GPUs, using one of many default models.
-- [ONNX](#onnx): TensorRT will automatically be detected and used as a detector in the `-tensorrt` Frigate image when a supported ONNX model is configured.
-
-**Rockchip**
-- [RKNN](#rockchip-platform): RKNN models can run on Rockchip devices with included NPUs.
-
 # Officially Supported Detectors
 
-Frigate provides the following builtin detector types: `cpu`, `edgetpu`, `openvino`, `tensorrt`, `rknn`, and `hailo8l`. By default, Frigate will use a single CPU detector. Other detectors may require additional configuration as described below. When using multiple detectors they will run in dedicated processes, but pull from a common queue of detection requests from across all cameras.
+Frigate provides the following builtin detector types: `cpu`, `edgetpu`, `openvino`, `tensorrt`, and `rknn`. By default, Frigate will use a single CPU detector. Other detectors may require additional configuration as described below. When using multiple detectors they will run in dedicated processes, but pull from a common queue of detection requests from across all cameras.
 
 ## CPU Detector (not recommended)
 
@@ -145,22 +122,6 @@ The OpenVINO device to be used is specified using the `"device"` attribute accor
 
 OpenVINO is supported on 6th Gen Intel platforms (Skylake) and newer. It will also run on AMD CPUs despite having no official support for it. A supported Intel platform is required to use the `GPU` device with OpenVINO. For detailed system requirements, see [OpenVINO System Requirements](https://docs.openvino.ai/2024/about-openvino/release-notes-openvino/system-requirements.html)
 
-:::tip
-
-When using many cameras one detector may not be enough to keep up. Multiple detectors can be defined assuming GPU resources are available. An example configuration would be:
-
-```yaml
-detectors:
-  ov_0:
-    type: openvino
-    device: GPU
-  ov_1:
-    type: openvino
-    device: GPU
-```
-
-:::
-
 ### Supported Models
 
 #### SSDLite MobileNet v2
@@ -317,173 +278,6 @@ model:
   height: 320
 ```
 
-## AMD/ROCm GPU detector
-
-### Setup
-
-The `rocm` detector supports running YOLO-NAS models on AMD GPUs. Use a frigate docker image with `-rocm` suffix, for example `ghcr.io/blakeblackshear/frigate:stable-rocm`.
-
-### Docker settings for GPU access
-
-ROCm needs access to the `/dev/kfd` and `/dev/dri` devices. When docker or frigate is not run under root then also `video` (and possibly `render` and `ssl/_ssl`) groups should be added.
-
-When running docker directly the following flags should be added for device access:
-
-```bash
-$ docker run --device=/dev/kfd --device=/dev/dri  \
-    ...
-```
-
-When using docker compose:
-
-```yaml
-services:
-  frigate:
----
-devices:
-  - /dev/dri
-  - /dev/kfd
-```
-
-For reference on recommended settings see [running ROCm/pytorch in Docker](https://rocm.docs.amd.com/projects/install-on-linux/en/develop/how-to/3rd-party/pytorch-install.html#using-docker-with-pytorch-pre-installed).
-
-### Docker settings for overriding the GPU chipset
-
-Your GPU might work just fine without any special configuration but in many cases they need manual settings. AMD/ROCm software stack comes with a limited set of GPU drivers and for newer or missing models you will have to override the chipset version to an older/generic version to get things working.
-
-Also AMD/ROCm does not "officially" support integrated GPUs. It still does work with most of them just fine but requires special settings. One has to configure the `HSA_OVERRIDE_GFX_VERSION` environment variable. See the [ROCm bug report](https://github.com/ROCm/ROCm/issues/1743) for context and examples.
-
-For the rocm frigate build there is some automatic detection:
-
-- gfx90c -> 9.0.0
-- gfx1031 -> 10.3.0
-- gfx1103 -> 11.0.0
-
-If you have something else you might need to override the `HSA_OVERRIDE_GFX_VERSION` at Docker launch. Suppose the version you want is `9.0.0`, then you should configure it from command line as:
-
-```bash
-$ docker run -e HSA_OVERRIDE_GFX_VERSION=9.0.0 \
-    ...
-```
-
-When using docker compose:
-
-```yaml
-services:
-  frigate:
-...
-environment:
-  HSA_OVERRIDE_GFX_VERSION: "9.0.0"
-```
-
-Figuring out what version you need can be complicated as you can't tell the chipset name and driver from the AMD brand name.
-
-- first make sure that rocm environment is running properly by running `/opt/rocm/bin/rocminfo` in the frigate container -- it should list both the CPU and the GPU with their properties
-- find the chipset version you have (gfxNNN) from the output of the `rocminfo` (see below)
-- use a search engine to query what `HSA_OVERRIDE_GFX_VERSION` you need for the given gfx name ("gfxNNN ROCm HSA_OVERRIDE_GFX_VERSION")
-- override the `HSA_OVERRIDE_GFX_VERSION` with relevant value
-- if things are not working check the frigate docker logs
-
-#### Figuring out if AMD/ROCm is working and found your GPU
-
-```bash
-$ docker exec -it frigate /opt/rocm/bin/rocminfo
-```
-
-#### Figuring out your AMD GPU chipset version:
-
-We unset the `HSA_OVERRIDE_GFX_VERSION` to prevent an existing override from messing up the result:
-
-```bash
-$ docker exec -it frigate /bin/bash -c '(unset HSA_OVERRIDE_GFX_VERSION && /opt/rocm/bin/rocminfo |grep gfx)'
-```
-
-### Supported Models
-
-There is no default model provided, the following formats are supported:
-
-#### YOLO-NAS
-
-[YOLO-NAS](https://github.com/Deci-AI/super-gradients/blob/master/YOLONAS.md) models are supported, but not included by default. You can build and download a compatible model with pre-trained weights using [this notebook](https://github.com/frigate/blob/dev/notebooks/YOLO_NAS_Pretrained_Export.ipynb) [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/blakeblackshear/frigate/blob/dev/notebooks/YOLO_NAS_Pretrained_Export.ipynb).
-
-:::warning
-
-The pre-trained YOLO-NAS weights from DeciAI are subject to their license and can't be used commercially. For more information, see: https://docs.deci.ai/super-gradients/latest/LICENSE.YOLONAS.html
-
-:::
-
-The input image size in this notebook is set to 320x320. This results in lower CPU usage and faster inference times without impacting performance in most cases due to the way Frigate crops video frames to areas of interest before running detection. The notebook and config can be updated to 640x640 if desired.
-
-After placing the downloaded onnx model in your config folder, you can use the following configuration:
-
-```yaml
-detectors:
-  onnx:
-    type: rocm
-
-model:
-  model_type: yolonas
-  width: 320 # <--- should match whatever was set in notebook
-  height: 320 # <--- should match whatever was set in notebook
-  input_pixel_format: bgr
-  path: /config/yolo_nas_s.onnx
-  labelmap_path: /labelmap/coco-80.txt
-```
-
-Note that the labelmap uses a subset of the complete COCO label set that has only 80 objects.
-
-## ONNX
-
-ONNX is an open format for building machine learning models, Frigate supports running ONNX models on CPU, OpenVINO, and TensorRT. On startup Frigate will automatically try to use a GPU if one is available.
-
-:::tip
-
-When using many cameras one detector may not be enough to keep up. Multiple detectors can be defined assuming GPU resources are available. An example configuration would be:
-
-```yaml
-detectors:
-  onnx_0:
-    type: onnx
-  onnx_1:
-    type: onnx
-```
-
-:::
-
-### Supported Models
-
-There is no default model provided, the following formats are supported:
-
-#### YOLO-NAS
-
-[YOLO-NAS](https://github.com/Deci-AI/super-gradients/blob/master/YOLONAS.md) models are supported, but not included by default. You can build and download a compatible model with pre-trained weights using [this notebook](https://github.com/frigate/blob/dev/notebooks/YOLO_NAS_Pretrained_Export.ipynb) [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/blakeblackshear/frigate/blob/dev/notebooks/YOLO_NAS_Pretrained_Export.ipynb).
-
-:::warning
-
-The pre-trained YOLO-NAS weights from DeciAI are subject to their license and can't be used commercially. For more information, see: https://docs.deci.ai/super-gradients/latest/LICENSE.YOLONAS.html
-
-:::
-
-The input image size in this notebook is set to 320x320. This results in lower CPU usage and faster inference times without impacting performance in most cases due to the way Frigate crops video frames to areas of interest before running detection. The notebook and config can be updated to 640x640 if desired.
-
-After placing the downloaded onnx model in your config folder, you can use the following configuration:
-
-```yaml
-detectors:
-  onnx:
-    type: onnx
-
-model:
-  model_type: yolonas
-  width: 320 # <--- should match whatever was set in notebook
-  height: 320 # <--- should match whatever was set in notebook
-  input_pixel_format: bgr
-  path: /config/yolo_nas_s.onnx
-  labelmap_path: /labelmap/coco-80.txt
-```
-
-Note that the labelmap uses a subset of the complete COCO label set that has only 80 objects.
-
 ## Deepstack / CodeProject.AI Server Detector
 
 The Deepstack / CodeProject.AI Server detector for Frigate allows you to integrate Deepstack and CodeProject.AI object detection capabilities into Frigate. CodeProject.AI and DeepStack are open-source AI platforms that can be run on various devices such as the Raspberry Pi, Nvidia Jetson, and other compatible hardware. It is important to note that the integration is performed over the network, so the inference times may not be as fast as native Frigate detectors, but it still provides an efficient and reliable solution for object detection and tracking.
@@ -592,25 +386,3 @@ $ cat /sys/kernel/debug/rknpu/load
 
 - All models are automatically downloaded and stored in the folder `config/model_cache/rknn_cache`. After upgrading Frigate, you should remove older models to free up space.
 - You can also provide your own `.rknn` model. You should not save your own models in the `rknn_cache` folder, store them directly in the `model_cache` folder or another subfolder. To convert a model to `.rknn` format see the `rknn-toolkit2` (requires a x86 machine). Note, that there is only post-processing for the supported models.
-
-## Hailo-8l
-
-This detector is available for use with Hailo-8 AI Acceleration Module.
-
-### Configuration
-
-```yaml
-detectors:
-  hailo8l:
-    type: hailo8l
-    device: PCIe
-    model:
-      path: /config/model_cache/h8l_cache/ssd_mobilenet_v1.hef
-
-model:
-  width: 300
-  height: 300
-  input_tensor: nhwc
-  input_pixel_format: bgr
-  model_type: ssd
-```

docs/docs/configuration/object_filters.md

@@ -20,13 +20,15 @@ For object filters in your configuration, any single detection below `min_score`
 
 In frame 2, the score is below the `min_score` value, so Frigate ignores it and it becomes a 0.0. The computed score is the median of the score history (padding to at least 3 values), and only when that computed score crosses the `threshold` is the object marked as a true positive. That happens in frame 4 in the example.
 
+show image of snapshot vs event with differing scores
+
 ### Minimum Score
 
-Any detection below `min_score` will be immediately thrown out and never tracked because it is considered a false positive. If `min_score` is too low then false positives may be detected and tracked which can confuse the object tracker and may lead to wasted resources. If `min_score` is too high then lower scoring true positives like objects that are further away or partially occluded may be thrown out which can also confuse the tracker and cause valid tracked objects to be lost or disjointed.
+Any detection below `min_score` will be immediately thrown out and never tracked because it is considered a false positive. If `min_score` is too low then false positives may be detected and tracked which can confuse the object tracker and may lead to wasted resources. If `min_score` is too high then lower scoring true positives like objects that are further away or partially occluded may be thrown out which can also confuse the tracker and cause valid events to be lost or disjointed.
 
 ### Threshold
 
-`threshold` is used to determine that the object is a true positive. Once an object is detected with a score >= `threshold` object is considered a true positive. If `threshold` is too low then some higher scoring false positives may create an tracked object. If `threshold` is too high then true positive tracked objects may be missed due to the object never scoring high enough.
+`threshold` is used to determine that the object is a true positive. Once an object is detected with a score >= `threshold` object is considered a true positive. If `threshold` is too low then some higher scoring false positives may create an event. If `threshold` is too high then true positive events may be missed due to the object never scoring high enough.
 
 ## Object Shape
 
@@ -50,7 +52,7 @@ Conceptually, a ratio of 1 is a square, 0.5 is a "tall skinny" box, and 2 is a "
 
 ### Zones
 
-[Required zones](/configuration/zones.md) can be a great tool to reduce false positives that may be detected in the sky or other areas that are not of interest. The required zones will only create tracked objects for objects that enter the zone.
+[Required zones](/configuration/zones.md) can be a great tool to reduce false positives that may be detected in the sky or other areas that are not of interest. The required zones will only create events for objects that enter the zone.
 
 ### Object Masks
 

docs/docs/configuration/record.md

@@ -3,7 +3,7 @@ id: record
 title: Recording
 ---
 
-Recordings can be enabled and are stored at `/media/frigate/recordings`. The folder structure for the recordings is `YYYY-MM-DD/HH/<camera_name>/MM.SS.mp4` in **UTC time**. These recordings are written directly from your camera stream without re-encoding. Each camera supports a configurable retention policy in the config. Frigate chooses the largest matching retention value between the recording retention and the tracked object retention when determining if a recording should be removed.
+Recordings can be enabled and are stored at `/media/frigate/recordings`. The folder structure for the recordings is `YYYY-MM-DD/HH/<camera_name>/MM.SS.mp4` in **UTC time**. These recordings are written directly from your camera stream without re-encoding. Each camera supports a configurable retention policy in the config. Frigate chooses the largest matching retention value between the recording retention and the event retention when determining if a recording should be removed.
 
 New recording segments are written from the camera stream to cache, they are only moved to disk if they match the setup recording retention policy.
 
@@ -13,7 +13,7 @@ H265 recordings can be viewed in Chrome 108+, Edge and Safari only. All other br
 
 ### Most conservative: Ensure all video is saved
 
-For users deploying Frigate in environments where it is important to have contiguous video stored even if there was no detectable motion, the following config will store all video for 3 days. After 3 days, only video containing motion and overlapping with alerts or detections will be retained until 30 days have passed.
+For users deploying Frigate in environments where it is important to have contiguous video stored even if there was no detectable motion, the following config will store all video for 3 days. After 3 days, only video containing motion and overlapping with events will be retained until 30 days have passed.
 
 ```yaml
 record:
@@ -21,13 +21,9 @@ record:
   retain:
     days: 3
     mode: all
-  alerts:
+  events:
     retain:
-      days: 30
-      mode: motion
-  detections:
-    retain:
-      days: 30
+      default: 30
       mode: motion
 ```
 
@@ -41,28 +37,25 @@ record:
   retain:
     days: 3
     mode: motion
-  alerts:
+  events:
     retain:
-      days: 30
-      mode: motion
-  detections:
-    retain:
-      days: 30
+      default: 30
       mode: motion
 ```
 
-### Minimum: Alerts only
+### Minimum: Events only
 
-If you only want to retain video that occurs during a tracked object, this config will discard video unless an alert is ongoing.
+If you only want to retain video that occurs during an event, this config will discard video unless an event is ongoing.
 
 ```yaml
 record:
   enabled: True
   retain:
     days: 0
-  alerts:
+    mode: all
+  events:
     retain:
-      days: 30
+      default: 30
       mode: motion
 ```
 
@@ -72,7 +65,7 @@ As of Frigate 0.12 if there is less than an hour left of storage, the oldest 2 h
 
 ## Configuring Recording Retention
 
-Frigate supports both continuous and tracked object based recordings with separate retention modes and retention periods.
+Frigate supports both continuous and event based recordings with separate retention modes and retention periods.
 
 :::tip
 
@@ -93,28 +86,25 @@ record:
 
 Continuous recording supports different retention modes [which are described below](#what-do-the-different-retain-modes-mean)
 
-### Object Recording
+### Event Recording
 
-The number of days to record review items can be specified for review items classified as alerts as well as tracked objects.
+If you only used clips in previous versions with recordings disabled, you can use the following config to get the same behavior. This is also the default behavior when recordings are enabled.
 
 ```yaml
 record:
   enabled: True
-  alerts:
+  events:
     retain:
-      days: 10 # <- number of days to keep alert recordings
-  detections:
-    retain:
-      days: 10 # <- number of days to keep detections recordings
+      default: 10 # <- number of days to keep event recordings
 ```
 
-This configuration will retain recording segments that overlap with alerts and detections for 10 days. Because multiple tracked objects can reference the same recording segments, this avoids storing duplicate footage for overlapping tracked objects and reduces overall storage needs.
+This configuration will retain recording segments that overlap with events and have active tracked objects for 10 days. Because multiple events can reference the same recording segments, this avoids storing duplicate footage for overlapping events and reduces overall storage needs.
 
 **WARNING**: Recordings still must be enabled in the config. If a camera has recordings disabled in the config, enabling via the methods listed above will have no effect.
 
 ## What do the different retain modes mean?
 
-Frigate saves from the stream with the `record` role in 10 second segments. These options determine which recording segments are kept for continuous recording (but can also affect tracked objects).
+Frigate saves from the stream with the `record` role in 10 second segments. These options determine which recording segments are kept for continuous recording (but can also affect events).
 
 Let's say you have Frigate configured so that your doorbell camera would retain the last **2** days of continuous recording.
 
@@ -122,7 +112,11 @@ Let's say you have Frigate configured so that your doorbell camera would retain
 - With the `motion` option the only parts of those 48 hours would be segments that Frigate detected motion. This is the middle ground option that won't keep all 48 hours, but will likely keep all segments of interest along with the potential for some extra segments.
 - With the `active_objects` option the only segments that would be kept are those where there was a true positive object that was not considered stationary.
 
-The same options are available with alerts and detections, except it will only save the recordings when it overlaps with a review item of that type.
+The same options are available with events. Let's consider a scenario where you drive up and park in your driveway, go inside, then come back out 4 hours later.
+
+- With the `all` option all segments for the duration of the event would be saved for the event. This event would have 4 hours of footage.
+- With the `motion` option all segments for the duration of the event with motion would be saved. This means any segment where a car drove by in the street, person walked by, lighting changed, etc. would be saved.
+- With the `active_objects` it would only keep segments where the object was active. In this case the only segments that would be saved would be the ones where the car was driving up, you going inside, you coming outside, and the car driving away. Essentially reducing the 4 hours to a minute or two of event footage.
 
 A configuration example of the above retain modes where all `motion` segments are stored for 7 days and `active objects` are stored for 14 days would be as follows:
 
@@ -132,18 +126,33 @@ record:
   retain:
     days: 7
     mode: motion
-  alerts:
+  events:
     retain:
-      days: 14
-      mode: active_objects
-  detections:
-    retain:
-      days: 14
+      default: 14
       mode: active_objects
 ```
 
 The above configuration example can be added globally or on a per camera basis.
 
+### Object Specific Retention
+
+You can also set specific retention length for an object type. The below configuration example builds on from above but also specifies that recordings of dogs only need to be kept for 2 days and recordings of cars should be kept for 7 days.
+
+```yaml
+record:
+  enabled: True
+  retain:
+    days: 7
+    mode: motion
+  events:
+    retain:
+      default: 14
+      mode: active_objects
+      objects:
+        dog: 2
+        car: 7
+```
+
 ## Can I have "continuous" recordings, but only at certain times?
 
 Using Frigate UI, HomeAssistant, or MQTT, cameras can be automated to only record in certain situations or at certain times.

docs/docs/configuration/reference.md

@@ -210,10 +210,6 @@ birdseye:
 # Optional: ffmpeg configuration
 # More information about presets at https://docs.frigate.video/configuration/ffmpeg_presets
 ffmpeg:
-  # Optional: ffmpeg binry path (default: shown below)
-  # can also be set to `7.0` or `5.0` to specify one of the included versions
-  # or can be set to any path that holds `bin/ffmpeg` & `bin/ffprobe`
-  path: "default"
   # Optional: global ffmpeg args (default: shown below)
   global_args: -hide_banner -loglevel warning -threads 2
   # Optional: global hwaccel args (default: auto detect)
@@ -275,13 +271,13 @@ detect:
   # especially when using separate streams for detect and record.
   # Use this setting to make the timeline bounding boxes more closely align
   # with the recording. The value can be positive or negative.
-  # TIP: Imagine there is an tracked object clip with a person walking from left to right.
-  #      If the tracked object lifecycle bounding box is consistently to the left of the person
+  # TIP: Imagine there is an event clip with a person walking from left to right.
+  #      If the event timeline bounding box is consistently to the left of the person
   #      then the value should be decreased. Similarly, if a person is walking from
   #      left to right and the bounding box is consistently ahead of the person
   #      then the value should be increased.
   # TIP: This offset is dynamic so you can change the value and it will update existing
-  #      tracked objects, this makes it easy to tune.
+  #      events, this makes it easy to tune.
   # WARNING: Fast moving objects will likely not have the bounding box align.
   annotation_offset: 0
 
@@ -376,14 +372,6 @@ motion:
   # Optional: Delay when updating camera motion through MQTT from ON -> OFF (default: shown below).
   mqtt_off_delay: 30
 
-# Optional: Notification Configuration
-notifications:
-  # Optional: Enable notification service (default: shown below)
-  enabled: False
-  # Optional: Email for push service to reach out to
-  # NOTE: This is required to use notifications
-  email: "admin@example.com"
-
 # Optional: Record configuration
 # NOTE: Can be overridden at the camera level
 record:
@@ -398,9 +386,9 @@ record:
   sync_recordings: False
   # Optional: Retention settings for recording
   retain:
-    # Optional: Number of days to retain recordings regardless of tracked objects (default: shown below)
-    # NOTE: This should be set to 0 and retention should be defined in alerts and detections section below
-    #       if you only want to retain recordings of alerts and detections.
+    # Optional: Number of days to retain recordings regardless of events (default: shown below)
+    # NOTE: This should be set to 0 and retention should be defined in events section below
+    #       if you only want to retain recordings of events.
     days: 0
     # Optional: Mode for retention. Available options are: all, motion, and active_objects
     #   all - save all recording segments regardless of activity
@@ -423,48 +411,34 @@ record:
     # Optional: Quality of recording preview (default: shown below).
     # Options are: very_low, low, medium, high, very_high
     quality: medium
-  # Optional: alert recording settings
-  alerts:
-    # Optional: Number of seconds before the alert to include (default: shown below)
+  # Optional: Event recording settings
+  events:
+    # Optional: Number of seconds before the event to include (default: shown below)
     pre_capture: 5
-    # Optional: Number of seconds after the alert to include (default: shown below)
+    # Optional: Number of seconds after the event to include (default: shown below)
     post_capture: 5
-    # Optional: Retention settings for recordings of alerts
+    # Optional: Objects to save recordings for. (default: all tracked objects)
+    objects:
+      - person
+    # Optional: Retention settings for recordings of events
     retain:
-      # Required: Retention days (default: shown below)
-      days: 14
+      # Required: Default retention days (default: shown below)
+      default: 10
       # Optional: Mode for retention. (default: shown below)
-      #   all - save all recording segments for alerts regardless of activity
-      #   motion - save all recordings segments for alerts with any detected motion
-      #   active_objects - save all recording segments for alerts with active/moving objects
-      #
-      # NOTE: If the retain mode for the camera is more restrictive than the mode configured
-      #       here, the segments will already be gone by the time this mode is applied.
-      #       For example, if the camera retain mode is "motion", the segments without motion are
-      #       never stored, so setting the mode to "all" here won't bring them back.
-      mode: motion
-  # Optional: detection recording settings
-  detections:
-    # Optional: Number of seconds before the detection to include (default: shown below)
-    pre_capture: 5
-    # Optional: Number of seconds after the detection to include (default: shown below)
-    post_capture: 5
-    # Optional: Retention settings for recordings of detections
-    retain:
-      # Required: Retention days (default: shown below)
-      days: 14
-      # Optional: Mode for retention. (default: shown below)
-      #   all - save all recording segments for detections regardless of activity
-      #   motion - save all recordings segments for detections with any detected motion
-      #   active_objects - save all recording segments for detections with active/moving objects
+      #   all - save all recording segments for events regardless of activity
+      #   motion - save all recordings segments for events with any detected motion
+      #   active_objects - save all recording segments for event with active/moving objects
       #
       # NOTE: If the retain mode for the camera is more restrictive than the mode configured
       #       here, the segments will already be gone by the time this mode is applied.
       #       For example, if the camera retain mode is "motion", the segments without motion are
       #       never stored, so setting the mode to "all" here won't bring them back.
       mode: motion
+      # Optional: Per object retention days
+      objects:
+        person: 15
 
-# Optional: Configuration for the jpg snapshots written to the clips directory for each tracked object
+# Optional: Configuration for the jpg snapshots written to the clips directory for each event
 # NOTE: Can be overridden at the camera level
 snapshots:
   # Optional: Enable writing jpg snapshot to /media/frigate/clips (default: shown below)
@@ -491,35 +465,6 @@ snapshots:
   # Optional: quality of the encoded jpeg, 0-100 (default: shown below)
   quality: 70
 
-# Optional: Configuration for semantic search capability
-semantic_search:
-  # Optional: Enable semantic search (default: shown below)
-  enabled: False
-  # Optional: Re-index embeddings database from historical tracked objects (default: shown below)
-  reindex: False
-
-# 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
-# to Google or OpenAI's LLMs to generate descriptions. It can be overridden at
-# the camera level (enabled: False) to enhance privacy for indoor cameras.
-genai:
-  # Optional: Enable AI description generation (default: shown below)
-  enabled: False
-  # Required if enabled: Provider must be one of ollama, gemini, or openai
-  provider: ollama
-  # Required if provider is ollama. May also be used for an OpenAI API compatible backend with the openai provider.
-  base_url: http://localhost::11434
-  # Required if gemini or openai
-  api_key: "{FRIGATE_GENAI_API_KEY}"
-  # Optional: The default prompt for generating descriptions. Can use replacement
-  # variables like "label", "sub_label", "camera" to make more dynamic. (default: shown below)
-  prompt: "Describe the {label} in the sequence of images with as much detail as possible. Do not describe the background."
-  # Optional: Object specific prompts to customize description results
-  # Format: {label}: {prompt}
-  object_prompts:
-    person: "My special person prompt."
-
 # Optional: Restream configuration
 # Uses https://github.com/AlexxIT/go2rtc (v1.9.2)
 go2rtc:
@@ -712,18 +657,6 @@ cameras:
       # By default the cameras are sorted alphabetically.
       order: 0
 
-    # Optional: Configuration for AI generated tracked object descriptions
-    genai:
-      # Optional: Enable AI description generation (default: shown below)
-      enabled: False
-      # Optional: The default prompt for generating descriptions. Can use replacement
-      # variables like "label", "sub_label", "camera" to make more dynamic. (default: shown below)
-      prompt: "Describe the {label} in the sequence of images with as much detail as possible. Do not describe the background."
-      # Optional: Object specific prompts to customize description results
-      # Format: {label}: {prompt}
-      object_prompts:
-        person: "My special person prompt."
-
 # Optional
 ui:
   # Optional: Set a timezone to use in the UI (default: use browser local time)

docs/docs/configuration/restream.md

@@ -21,7 +21,7 @@ Birdseye RTSP restream can be accessed at `rtsp://<frigate_host>:8554/birdseye`.
 
 ```yaml
 birdseye:
-  restream: True
+  restream: true
 ```
 
 ### Securing Restream With Authentication

docs/docs/configuration/review.md

@@ -7,13 +7,13 @@ The Review page of the Frigate UI is for quickly reviewing historical footage of
 
 Review items are filterable by date, object type, and camera.
 
-### Review items vs. tracked objects (formerly "events")
+### Review items vs. events
 
 In Frigate 0.13 and earlier versions, the UI presented "events". An event was synonymous with a tracked or detected object. In Frigate 0.14 and later, a review item is a time period where any number of tracked objects were active.
 
 For example, consider a situation where two people walked past your house. One was walking a dog. At the same time, a car drove by on the street behind them.
 
-In this scenario, Frigate 0.13 and earlier would show 4 "events" in the UI - one for each person, another for the dog, and yet another for the car. You would have had 4 separate videos to watch even though they would have all overlapped.
+In this scenario, Frigate 0.13 and earlier would show 4 events in the UI - one for each person, another for the dog, and yet another for the car. You would have had 4 separate videos to watch even though they would have all overlapped.
 
 In 0.14 and later, all of that is bundled into a single review item which starts and ends to capture all of that activity. Reviews for a single camera cannot overlap. Once you have watched that time period on that camera, it is marked as reviewed.
 

docs/docs/configuration/semantic_search.md

@@ -1,44 +0,0 @@
----
-id: semantic_search
-title: Using Semantic Search
----
-
-Semantic Search in Frigate allows you to find tracked objects within your review items using either the image itself, a user-defined text description, or an automatically generated one. This feature works by creating _embeddings_ — numerical vector representations — for both the images and text descriptions of your tracked objects. By comparing these embeddings, Frigate assesses their similarities to deliver relevant search results.
-
-Frigate has support for two models to create embeddings, both of which run locally: [OpenAI CLIP](https://openai.com/research/clip) and [all-MiniLM-L6-v2](https://huggingface.co/sentence-transformers/all-MiniLM-L6-v2). Embeddings are then saved to a local instance of [ChromaDB](https://trychroma.com).
-
-Semantic Search is accessed via the _Explore_ view in the Frigate UI.
-
-## Configuration
-
-Semantic search is disabled by default, and must be enabled in your config file before it can be used. Semantic Search is a global configuration setting.
-
-```yaml
-semantic_search:
-  enabled: True
-  reindex: False
-```
-
-:::tip
-
-The embeddings database can be re-indexed from the existing tracked objects in your database by adding `reindex: True` to your `semantic_search` configuration. Depending on the number of tracked objects you have, it can take a long while to complete and may max out your CPU while indexing. Make sure to set the config back to `False` before restarting Frigate again.
-
-If you are enabling the Search feature for the first time, be advised that Frigate does not automatically index older tracked objects. You will need to enable the `reindex` feature in order to do that.
-
-:::
-
-### OpenAI CLIP
-
-This model is able to embed both images and text into the same vector space, which allows `image -> image` and `text -> image` similarity searches. Frigate uses this model on tracked objects to encode the thumbnail image and store it in Chroma. When searching for tracked objects via text in the search box, Frigate will perform a `text -> image` similarity search against this embedding. When clicking "Find Similar" in the tracked object detail pane, Frigate will perform an `image -> image` similarity search to retrieve the closest matching thumbnails.
-
-### all-MiniLM-L6-v2
-
-This is a sentence embedding model that has been fine tuned on over 1 billion sentence pairs. This model is used to embed tracked object descriptions and perform searches against them. Descriptions can be created, viewed, and modified on the Search page when clicking on the gray tracked object chip at the top left of each review item. See [the Generative AI docs](/configuration/genai.md) for more information on how to automatically generate tracked object descriptions.
-
-## Usage
-
-1. Semantic search is used in conjunction with the other filters available on the Search page. Use a combination of traditional filtering and semantic search for the best results.
-2. The comparison between text and image embedding distances generally means that results matching `description` will appear first, even if a `thumbnail` embedding may be a better match. Play with the "Search Type" filter to help find what you are looking for.
-3. Make your search language and tone closely match your descriptions. If you are using thumbnail search, phrase your query as an image caption.
-4. Semantic search on thumbnails tends to return better results when matching large subjects that take up most of the frame. Small things like "cat" tend to not work well.
-5. Experiment! Find a tracked object you want to test and start typing keywords to see what works for you.

docs/docs/configuration/zones.md

@@ -64,7 +64,7 @@ cameras:
 
 ### Restricting zones to specific objects
 
-Sometimes you want to limit a zone to specific object types to have more granular control of when alerts, detections, and snapshots are saved. The following example will limit one zone to person objects and the other to cars.
+Sometimes you want to limit a zone to specific object types to have more granular control of when events/snapshots are saved. The following example will limit one zone to person objects and the other to cars.
 
 ```yaml
 cameras:
@@ -80,7 +80,7 @@ cameras:
           - car
 ```
 
-Only car objects can trigger the `front_yard_street` zone and only person can trigger the `entire_yard`. Objects will be tracked for any `person` that enter anywhere in the yard, and for cars only if they enter the street.
+Only car objects can trigger the `front_yard_street` zone and only person can trigger the `entire_yard`. You will get events for person objects that enter anywhere in the yard, and events for cars only if they enter the street.
 
 ### Zone Loitering
 

docs/docs/frigate/glossary.md

@@ -16,6 +16,10 @@ A box returned from the object detection model that outlines an object in the fr
 - A gray thin line indicates that object is detected as being stationary
 - A thick line indicates that object is the subject of autotracking (when enabled).
 
+## Event
+
+The time period starting when a tracked object entered the frame and ending when it left the frame, including any time that the object remained still. Events are saved when it is considered a [true positive](#threshold) and meets the requirements for a snapshot or recording to be saved.
+
 ## False Positive
 
 An incorrect detection of an object type. For example a dog being detected as a person, a chair being detected as a dog, etc. A person being detected in an area you want to ignore is not a false positive.
@@ -60,10 +64,6 @@ The threshold is the median score that an object must reach in order to be consi
 
 The top score for an object is the highest median score for an object.
 
-## Tracked Object ("event" in previous versions)
-
-The time period starting when a tracked object entered the frame and ending when it left the frame, including any time that the object remained still. Tracked objects are saved when it is considered a [true positive](#threshold) and meets the requirements for a snapshot or recording to be saved.
-
 ## Zone
 
 Zones are areas of interest, zones can be used for notifications and for limiting the areas where Frigate will create an [event](#event). [See the zone docs for more info](/configuration/zones)

docs/docs/frigate/hardware.md

@@ -87,10 +87,6 @@ Inference speeds will vary greatly depending on the GPU and the model used.
 | Quadro P400 2GB | 20 - 25 ms      |
 | Quadro P2000    | ~ 12 ms         |
 
-#### AMD GPUs
-
-With the [rocm](../configuration/object_detectors.md#amdrocm-gpu-detector) detector Frigate can take advantage of many AMD GPUs.
-
 ### Community Supported:
 
 #### Nvidia Jetson
@@ -111,12 +107,6 @@ Frigate supports hardware video processing on all Rockchip boards. However, hard
 
 The inference time of a rk3588 with all 3 cores enabled is typically 25-30 ms for yolo-nas s.
 
-#### Hailo-8l PCIe
-
-Frigate supports the Hailo-8l M.2 card on any hardware but currently it is only tested on the Raspberry Pi5 PCIe hat from the AI kit.
-
-The inference time for the Hailo-8L chip at time of writing is around 17-21 ms for the SSD MobileNet Version 1 model.
-
 ## What does Frigate use the CPU for and what does it use a detector for? (ELI5 Version)
 
 This is taken from a [user question on reddit](https://www.reddit.com/r/homeassistant/comments/q8mgau/comment/hgqbxh5/?utm_source=share&utm_medium=web2x&context=3). Modified slightly for clarity.

docs/docs/frigate/installation.md

@@ -73,23 +73,23 @@ Users of the Snapcraft build of Docker cannot use storage locations outside your
 
 Frigate utilizes shared memory to store frames during processing. The default `shm-size` provided by Docker is **64MB**.
 
-The default shm size of **128MB** is fine for setups with **2 cameras** detecting at **720p**. If Frigate is exiting with "Bus error" messages, it is likely because you have too many high resolution cameras and you need to specify a higher shm size, using [`--shm-size`](https://docs.docker.com/engine/reference/run/#runtime-constraints-on-resources) (or [`service.shm_size`](https://docs.docker.com/compose/compose-file/compose-file-v2/#shm_size) in docker-compose).
+The default shm size of **64MB** is fine for setups with **2 cameras** detecting at **720p**. If Frigate is exiting with "Bus error" messages, it is likely because you have too many high resolution cameras and you need to specify a higher shm size, using [`--shm-size`](https://docs.docker.com/engine/reference/run/#runtime-constraints-on-resources) (or [`service.shm_size`](https://docs.docker.com/compose/compose-file/compose-file-v2/#shm_size) in docker-compose).
 
-The Frigate container also stores logs in shm, which can take up to **40MB**, so make sure to take this into account in your math as well.
+The Frigate container also stores logs in shm, which can take up to **30MB**, so make sure to take this into account in your math as well.
 
-You can calculate the **minimum** shm size for each camera with the following formula using the resolution specified for detect:
+You can calculate the necessary shm size for each camera with the following formula using the resolution specified for detect:
 
 ```console
 # Replace <width> and <height>
-$ python -c 'print("{:.2f}MB".format((<width> * <height> * 1.5 * 10 + 270480) / 1048576))'
+$ python -c 'print("{:.2f}MB".format((<width> * <height> * 1.5 * 9 + 270480) / 1048576))'
 
 # Example for 1280x720
-$ python -c 'print("{:.2f}MB".format((1280 * 720 * 1.5 * 10 + 270480) / 1048576))'
-13.44MB
+$ python -c 'print("{:.2f}MB".format((1280 * 720 * 1.5 * 9 + 270480) / 1048576))'
+12.12MB
 
 # Example for eight cameras detecting at 1280x720, including logs
-$ python -c 'print("{:.2f}MB".format(((1280 * 720 * 1.5 * 10 + 270480) / 1048576) * 8 + 40))'
-136.99MB
+$ python -c 'print("{:.2f}MB".format(((1280 * 720 * 1.5 * 9 + 270480) / 1048576) * 8 + 30))'
+126.99MB
 ```
 
 The shm size cannot be set per container for Home Assistant add-ons. However, this is probably not required since by default Home Assistant Supervisor allocates `/dev/shm` with half the size of your total memory. If your machine has 8GB of memory, chances are that Frigate will have access to up to 4GB without any additional configuration.
@@ -100,38 +100,6 @@ By default, the Raspberry Pi limits the amount of memory available to the GPU. I
 
 Additionally, the USB Coral draws a considerable amount of power. If using any other USB devices such as an SSD, you will experience instability due to the Pi not providing enough power to USB devices. You will need to purchase an external USB hub with it's own power supply. Some have reported success with <a href="https://amzn.to/3a2mH0P" target="_blank" rel="nofollow noopener sponsored">this</a> (affiliate link).
 
-### Hailo-8L
-
-The Hailo-8L is an M.2 card typically connected to a carrier board for PCIe, which then connects to the Raspberry Pi 5 as part of the AI Kit. However, it can also be used on other boards equipped with an M.2 M key edge connector.
-
-#### Installation
-
-For Raspberry Pi 5 users with the AI Kit, installation is straightforward. Simply follow this [guide](https://www.raspberrypi.com/documentation/accessories/ai-kit.html#ai-kit-installation) to install the driver and software.
-
-For other installations, follow these steps for installation:
-
-1. Install the driver from the [Hailo GitHub repository](https://github.com/hailo-ai/hailort-drivers). A convenient script for Linux is available to clone the repository, build the driver, and install it.
-2. Copy or download [this script](https://github.com/blakeblackshear/frigate/blob/41c9b13d2fffce508b32dfc971fa529b49295fbd/docker/hailo8l/user_installation.sh).
-3. Ensure it has execution permissions with `sudo chmod +x install_hailo8l_driver.sh`
-4. Run the script with `./install_hailo8l_driver.sh`
-
-#### Setup
-
-To set up Frigate, follow the default installation instructions, but use a Docker image with the `-h8l` suffix, for example: `ghcr.io/blakeblackshear/frigate:stable-h8l`
-
-Next, grant Docker permissions to access your hardware by adding the following lines to your `docker-compose.yml` file:
-
-```yaml
-devices:
-  - /dev/hailo0
-```
-
-If you are using `docker run`, add this option to your command `--device /dev/hailo0`
-
-#### Configuration
-
-Finally, configure [hardware object detection](/configuration/object_detectors#hailo-8l) to complete the setup.
-
 ### Rockchip platform
 
 Make sure that you use a linux distribution that comes with the rockchip BSP kernel 5.10 or 6.1 and necessary drivers (especially rkvdec2 and rknpu). To check, enter the following commands:
@@ -254,7 +222,6 @@ The community supported docker image tags for the current stable version are:
   - `stable-rocm-gfx900` - AMD gfx900 driver only
   - `stable-rocm-gfx1030` - AMD gfx1030 driver only
   - `stable-rocm-gfx1100` - AMD gfx1100 driver only
-  - `stable-h8l` - Frigate build for the Hailo-8L M.2 PICe Raspberry Pi 5 hat
 
 ## Home Assistant Addon
 

docs/docs/guides/getting_started.md

@@ -238,7 +238,7 @@ Now that you know where you need to mask, use the "Mask & Zone creator" in the o
 
 :::warning
 
-Note that motion masks should not be used to mark out areas where you do not want objects to be detected or to reduce false positives. They do not alter the image sent to object detection, so you can still get tracked objects, alerts, and detections in areas with motion masks. These only prevent motion in these areas from initiating object detection.
+Note that motion masks should not be used to mark out areas where you do not want objects to be detected or to reduce false positives. They do not alter the image sent to object detection, so you can still get events and detections in areas with motion masks. These only prevent motion in these areas from initiating object detection.
 
 :::
 
@@ -294,15 +294,7 @@ cameras:
 
 If you don't have separate streams for detect and record, you would just add the record role to the list on the first input.
 
-:::note
-
-If you only define one stream in your `inputs` and do not assign a `detect` role to it, Frigate will automatically assign it the `detect` role. Frigate will always decode a stream to support motion detection, Birdseye, the API image endpoints, and other features, even if you have disabled object detection with `enabled: False` in your config's `detect` section.
-
-If you only plan to use Frigate for recording, it is still recommended to define a `detect` role for a low resolution stream to minimize resource usage from the required stream decoding.
-
-:::
-
-By default, Frigate will retain video of all tracked objects for 10 days. The full set of options for recording can be found [here](../configuration/reference.md).
+By default, Frigate will retain video of all events for 10 days. The full set of options for recording can be found [here](../configuration/reference.md).
 
 ### Step 7: Complete config
 
@@ -317,3 +309,4 @@ Now that you have a working install, you can use the following documentation for
 3. [Review](../configuration/review.md)
 4. [Masks](../configuration/masks.md)
 5. [Home Assistant Integration](../integrations/home-assistant.md) - Integrate with Home Assistant
+

docs/docs/guides/ha_notifications.md

@@ -7,11 +7,11 @@ The best way to get started with notifications for Frigate is to use the [Bluepr
 
 It is generally recommended to trigger notifications based on the `frigate/reviews` mqtt topic. This provides the event_id(s) needed to fetch [thumbnails/snapshots/clips](../integrations/home-assistant.md#notification-api) and other useful information to customize when and where you want to receive alerts. The data is published in the form of a change feed, which means you can reference the "previous state" of the object in the `before` section and the "current state" of the object in the `after` section. You can see an example [here](../integrations/mqtt.md#frigateevents).
 
-Here is a simple example of a notification automation of tracked objects which will update the existing notification for each change. This means the image you see in the notification will update as Frigate finds a "better" image.
+Here is a simple example of a notification automation of events which will update the existing notification for each change. This means the image you see in the notification will update as Frigate finds a "better" image.
 
 ```yaml
 automation:
-  - alias: Notify of tracked object
+  - alias: Notify of events
     trigger:
       platform: mqtt
       topic: frigate/events

docs/docs/integrations/api.md

@@ -189,15 +189,15 @@ Example parameters:
 
 ### `GET /api/<camera_name>/<label>/thumbnail.jpg`
 
-Returns the thumbnail from the latest tracked object for the given camera and label combo. Using `any` as the label will return the latest thumbnail regardless of type.
+Returns the thumbnail from the latest event for the given camera and label combo. Using `any` as the label will return the latest thumbnail regardless of type.
 
 ### `GET /api/<camera_name>/<label>/clip.mp4`
 
-Returns the clip from the latest tracked object for the given camera and label combo. Using `any` as the label will return the latest clip regardless of type.
+Returns the clip from the latest event for the given camera and label combo. Using `any` as the label will return the latest clip regardless of type.
 
 ### `GET /api/<camera_name>/<label>/snapshot.jpg`
 
-Returns the snapshot image from the latest tracked object for the given camera and label combo. Using `any` as the label will return the latest thumbnail regardless of type.
+Returns the snapshot image from the latest event for the given camera and label combo. Using `any` as the label will return the latest thumbnail regardless of type.
 
 ### `GET /api/<camera_name>/grid.jpg`
 
@@ -386,7 +386,7 @@ Specific preview frame from preview cache.
 Looping image made from preview video / frames during this time range.
 
 | param     | Type | Description                      |
-| -------- | ---- | -------------------------------- |
+| --------- | ---- | -------------------------------- |
 | `format`  | str  | Format of preview [`gif`, `mp4`] |
 
 ## Recordings

docs/docs/integrations/home-assistant.md

@@ -149,7 +149,7 @@ Home Assistant > Configuration > Integrations > Frigate > Options
 ## Entities Provided
 
 | Platform        | Description                                                                       |
-| --------------- | ------------------------------------------------------------------------------- |
+| --------------- | --------------------------------------------------------------------------------- |
 | `camera`        | Live camera stream (requires RTSP).                                               |
 | `image`         | Image of the latest detected object for each camera.                              |
 | `sensor`        | States to monitor Frigate performance, object counts for all zones and cameras.   |
@@ -160,7 +160,7 @@ Home Assistant > Configuration > Integrations > Frigate > Options
 
 The integration provides:
 
-- Browsing tracked object recordings with thumbnails
+- Browsing event recordings with thumbnails
 - Browsing snapshots
 - Browsing recordings by month, day, camera, time
 
@@ -183,19 +183,19 @@ For clips to be castable to media devices, audio is required and may need to be
 
 Many people do not want to expose Frigate to the web, so the integration creates some public API endpoints that can be used for notifications.
 
-To load a thumbnail for a tracked object:
+To load a thumbnail for an event:
 
 ```
 https://HA_URL/api/frigate/notifications/<event-id>/thumbnail.jpg
 ```
 
-To load a snapshot for a tracked object:
+To load a snapshot for an event:
 
 ```
 https://HA_URL/api/frigate/notifications/<event-id>/snapshot.jpg
 ```
 
-To load a video clip of a tracked object:
+To load a video clip of an event:
 
 ```
 https://HA_URL/api/frigate/notifications/<event-id>/clip.mp4

docs/docs/integrations/mqtt.md

@@ -19,7 +19,7 @@ Causes Frigate to exit. Docker should be configured to automatically restart the
 
 ### `frigate/events`
 
-Message published for each changed tracked object. The first message is published when the tracked object is no longer marked as a false_positive. When Frigate finds a better snapshot of the tracked object or when a zone change occurs, it will publish a message with the same id. When the tracked object ends, a final message is published with `end_time` set.
+Message published for each changed event. The first message is published when the tracked object is no longer marked as a false_positive. When Frigate finds a better snapshot of the tracked object or when a zone change occurs, it will publish a message with the same id. When the event ends, a final message is published with `end_time` set.
 
 ```json
 {
@@ -45,7 +45,6 @@ Message published for each changed tracked object. The first message is publishe
     "thumbnail": null,
     "has_snapshot": false,
     "has_clip": false,
-    "active": true, // convenience attribute, this is strictly opposite of "stationary"
     "stationary": false, // whether or not the object is considered stationary
     "motionless_count": 0, // number of frames the object has been motionless
     "position_changes": 2, // number of times the object has moved from a stationary position
@@ -75,7 +74,6 @@ Message published for each changed tracked object. The first message is publishe
     "thumbnail": null,
     "has_snapshot": false,
     "has_clip": false,
-    "active": true, // convenience attribute, this is strictly opposite of "stationary"
     "stationary": false, // whether or not the object is considered stationary
     "motionless_count": 0, // number of frames the object has been motionless
     "position_changes": 2, // number of times the object has changed position
@@ -109,13 +107,15 @@ Message published for each changed review item. The first message is published w
     "severity": "detection",
     "thumb_path": "/media/frigate/clips/review/thumb-front_cam-1718987129.308396-fqk5ka.webp",
     "data": {
-      "detections": [
-        // list of event IDs
+      "detections": [  // list of event IDs
         "1718987128.947436-g92ztx",
         "1718987148.879516-d7oq7r",
         "1718987126.934663-q5ywpt"
       ],
-      "objects": ["person", "car"],
+      "objects": [
+        "person",
+        "car"
+      ],
       "sub_labels": [],
       "zones": [],
       "audio": []
@@ -134,9 +134,14 @@ Message published for each changed review item. The first message is published w
         "1718987148.879516-d7oq7r",
         "1718987126.934663-q5ywpt"
       ],
-      "objects": ["person", "car"],
+      "objects": [
+        "person",
+        "car"
+      ],
       "sub_labels": ["Bob"],
-      "zones": ["front_yard"],
+      "zones": [
+        "front_yard"
+      ],
       "audio": []
     }
   }
@@ -147,14 +152,6 @@ Message published for each changed review item. The first message is published w
 
 Same data available at `/api/stats` published at a configurable interval.
 
-### `frigate/notifications/set`
-
-Topic to turn notifications on and off. Expected values are `ON` and `OFF`.
-
-### `frigate/notifications/state`
-
-Topic with current state of notifications. Published values are `ON` and `OFF`.
-
 ## Frigate Camera Topics
 
 ### `frigate/<camera_name>/<object_name>`
@@ -162,23 +159,11 @@ Topic with current state of notifications. Published values are `ON` and `OFF`.
 Publishes the count of objects for the camera for use as a sensor in Home Assistant.
 `all` can be used as the object_name for the count of all objects for the camera.
 
-### `frigate/<camera_name>/<object_name>/active`
-
-Publishes the count of active objects for the camera for use as a sensor in Home
-Assistant. `all` can be used as the object_name for the count of all active objects
-for the camera.
-
 ### `frigate/<zone_name>/<object_name>`
 
 Publishes the count of objects for the zone for use as a sensor in Home Assistant.
 `all` can be used as the object_name for the count of all objects for the zone.
 
-### `frigate/<zone_name>/<object_name>/active`
-
-Publishes the count of active objects for the zone for use as a sensor in Home
-Assistant. `all` can be used as the object_name for the count of all objects for the
-zone.
-
 ### `frigate/<camera_name>/<object_name>/snapshot`
 
 Publishes a jpeg encoded frame of the detected object type. When the object is no longer detected, the highest confidence image is published or the original image

docs/docs/integrations/plus.md

@@ -19,7 +19,7 @@ Once logged in, you can generate an API key for Frigate in Settings.
 
 ### Set your API key
 
-In Frigate, you can use an environment variable or a docker secret named `PLUS_API_KEY` to enable the `Frigate+` buttons on the Explore page. Home Assistant Addon users can set it under Settings > Addons > Frigate NVR > Configuration > Options (be sure to toggle the "Show unused optional configuration options" switch).
+In Frigate, you can use an environment variable or a docker secret named `PLUS_API_KEY` to enable the `SEND TO FRIGATE+` buttons on the events page. Home Assistant Addon users can set it under Settings > Addons > Frigate NVR > Configuration > Options (be sure to toggle the "Show unused optional configuration options" switch).
 
 :::warning
 
@@ -29,7 +29,7 @@ You cannot use the `environment_vars` section of your configuration file to set
 
 ## Submit examples
 
-Once your API key is configured, you can submit examples directly from the Explore page in Frigate using the `Frigate+` button.
+Once your API key is configured, you can submit examples directly from the events page in Frigate using the `SEND TO FRIGATE+` button.
 
 :::note
 

docs/docs/plus/index.md

@@ -33,7 +33,7 @@ Frigate+ models support a more relevant set of objects for security cameras. Cur
 
 ### Label attributes
 
-Frigate has special handling for some labels when using Frigate+ models. `face`, `license_plate`, `amazon`, `ups`, and `fedex` are considered attribute labels which are not tracked like regular objects and do not generate review items directly. In addition, the `threshold` filter will have no effect on these labels. You should adjust the `min_score` and other filter values as needed.
+Frigate has special handling for some labels when using Frigate+ models. `face`, `license_plate`, `amazon`, `ups`, and `fedex` are considered attribute labels which are not tracked like regular objects and do not generate events. In addition, the `threshold` filter will have no effect on these labels. You should adjust the `min_score` and other filter values as needed.
 
 In order to have Frigate start using these attribute labels, you will need to add them to the list of objects to track:
 

docs/docs/troubleshooting/faqs.md

@@ -17,7 +17,7 @@ ffmpeg:
     record: preset-record-generic-audio-aac
 ```
 
-### I can't view recordings in the Web UI.
+### I can't view events or recordings in the Web UI.
 
 Ensure your cameras send h264 encoded video, or [transcode them](/configuration/restream.md).
 

docs/package.json

@@ -14,15 +14,15 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "^3.5.2",
-    "@docusaurus/preset-classic": "^3.5.2",
-    "@docusaurus/theme-mermaid": "^3.5.2",
+    "@docusaurus/core": "^3.4.0",
+    "@docusaurus/preset-classic": "^3.4.0",
+    "@docusaurus/theme-mermaid": "^3.4.0",
     "@mdx-js/react": "^3.0.0",
     "clsx": "^2.0.0",
-    "prism-react-renderer": "^2.4.0",
+    "prism-react-renderer": "^2.1.0",
     "raw-loader": "^4.0.2",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "browserslist": {
     "production": [
@@ -39,7 +39,7 @@
   "devDependencies": {
     "@docusaurus/module-type-aliases": "^3.4.0",
     "@docusaurus/types": "^3.4.0",
-    "@types/react": "^18.3.7"
+    "@types/react": "^18.2.79"
   },
   "engines": {
     "node": ">=18.0"

docs/sidebars.js

@@ -29,10 +29,6 @@ module.exports = {
         "configuration/object_detectors",
         "configuration/audio_detectors",
       ],
-      "Semantic Search": [
-        "configuration/semantic_search",
-        "configuration/genai",
-      ],
       Cameras: [
         "configuration/cameras",
         "configuration/review",
@@ -54,7 +50,6 @@ module.exports = {
       ],
       "Extra Configuration": [
         "configuration/authentication",
-        "configuration/notifications",
         "configuration/hardware_acceleration",
         "configuration/ffmpeg_presets",
         "configuration/tls",

frigate/__main__.py

@@ -1,28 +1,17 @@
 import faulthandler
-import logging
 import threading
 
 from flask import cli
 
 from frigate.app import FrigateApp
 
-
-def main() -> None:
 faulthandler.enable()
 
-    # Clear all existing handlers.
-    logging.basicConfig(
-        level=logging.INFO,
-        handlers=[],
-        force=True,
-    )
-
 threading.current_thread().name = "frigate"
+
 cli.show_server_banner = lambda *x: None
 
-    # Run the main application.
-    FrigateApp().start()
-
-
 if __name__ == "__main__":
-    main()
+    frigate_app = FrigateApp()
+
+    frigate_app.start()

frigate/api/app.py

@@ -7,7 +7,6 @@ import os
 import traceback
 from datetime import datetime, timedelta
 from functools import reduce
-from typing import Optional
 
 import requests
 from flask import Blueprint, Flask, current_app, jsonify, make_response, request
@@ -20,12 +19,10 @@ from frigate.api.auth import AuthBp, get_jwt_secret, limiter
 from frigate.api.event import EventBp
 from frigate.api.export import ExportBp
 from frigate.api.media import MediaBp
-from frigate.api.notification import NotificationBp
 from frigate.api.preview import PreviewBp
 from frigate.api.review import ReviewBp
 from frigate.config import FrigateConfig
 from frigate.const import CONFIG_DIR
-from frigate.embeddings import EmbeddingsContext
 from frigate.events.external import ExternalEventProcessor
 from frigate.models import Event, Timeline
 from frigate.plus import PlusApi
@@ -50,13 +47,11 @@ bp.register_blueprint(MediaBp)
 bp.register_blueprint(PreviewBp)
 bp.register_blueprint(ReviewBp)
 bp.register_blueprint(AuthBp)
-bp.register_blueprint(NotificationBp)
 
 
 def create_app(
     frigate_config,
     database: SqliteQueueDatabase,
-    embeddings: Optional[EmbeddingsContext],
     detected_frames_processor,
     storage_maintainer: StorageMaintainer,
     onvif: OnvifController,
@@ -84,7 +79,6 @@ def create_app(
             database.close()
 
     app.frigate_config = frigate_config
-    app.embeddings = embeddings
     app.detected_frames_processor = detected_frames_processor
     app.storage_maintainer = storage_maintainer
     app.onvif = onvif
@@ -414,7 +408,7 @@ def ffprobe():
     output = []
 
     for path in paths:
-        ffprobe = ffprobe_stream(current_app.frigate_config.ffmpeg, path.strip())
+        ffprobe = ffprobe_stream(path.strip())
         output.append(
             {
                 "return_code": ffprobe.returncode,
@@ -456,24 +450,10 @@ def vainfo():
 
 @bp.route("/logs/<service>", methods=["GET"])
 def logs(service: str):
-    def download_logs(service_location: str):
-        try:
-            file = open(service_location, "r")
-            contents = file.read()
-            file.close()
-            return jsonify(contents)
-        except FileNotFoundError as e:
-            logger.error(e)
-            return make_response(
-                jsonify({"success": False, "message": "Could not find log file"}),
-                500,
-            )
-
     log_locations = {
         "frigate": "/dev/shm/logs/frigate/current",
         "go2rtc": "/dev/shm/logs/go2rtc/current",
         "nginx": "/dev/shm/logs/nginx/current",
-        "chroma": "/dev/shm/logs/chroma/current",
     }
     service_location = log_locations.get(service)
 
@@ -483,9 +463,6 @@ def logs(service: str):
             404,
         )
 
-    if request.args.get("download", type=bool, default=False):
-        return download_logs(service_location)
-
     start = request.args.get("start", type=int, default=0)
     end = request.args.get("end", type=int)
 

frigate/api/event.py

@@ -1,7 +1,5 @@
 """Event apis."""
 
-import base64
-import io
 import logging
 import os
 from datetime import datetime
@@ -10,7 +8,6 @@ from pathlib import Path
 from urllib.parse import unquote
 
 import cv2
-import numpy as np
 from flask import (
     Blueprint,
     current_app,
@@ -18,16 +15,13 @@ from flask import (
     make_response,
     request,
 )
-from peewee import JOIN, DoesNotExist, fn, operator
-from PIL import Image
+from peewee import DoesNotExist, fn, operator
 from playhouse.shortcuts import model_to_dict
 
 from frigate.const import (
     CLIPS_DIR,
 )
-from frigate.embeddings import EmbeddingsContext
-from frigate.embeddings.embeddings import get_metadata
-from frigate.models import Event, ReviewSegment, Timeline
+from frigate.models import Event, Timeline
 from frigate.object_processing import TrackedObject
 from frigate.util.builtin import get_tz_modifiers
 
@@ -251,295 +245,6 @@ def events():
     return jsonify(list(events))
 
 
-@EventBp.route("/events/explore")
-def events_explore():
-    limit = request.args.get("limit", 10, type=int)
-
-    subquery = Event.select(
-        Event.id,
-        Event.camera,
-        Event.label,
-        Event.zones,
-        Event.start_time,
-        Event.end_time,
-        Event.has_clip,
-        Event.has_snapshot,
-        Event.plus_id,
-        Event.retain_indefinitely,
-        Event.sub_label,
-        Event.top_score,
-        Event.false_positive,
-        Event.box,
-        Event.data,
-        fn.rank()
-        .over(partition_by=[Event.label], order_by=[Event.start_time.desc()])
-        .alias("rank"),
-        fn.COUNT(Event.id).over(partition_by=[Event.label]).alias("event_count"),
-    ).alias("subquery")
-
-    query = (
-        Event.select(
-            subquery.c.id,
-            subquery.c.camera,
-            subquery.c.label,
-            subquery.c.zones,
-            subquery.c.start_time,
-            subquery.c.end_time,
-            subquery.c.has_clip,
-            subquery.c.has_snapshot,
-            subquery.c.plus_id,
-            subquery.c.retain_indefinitely,
-            subquery.c.sub_label,
-            subquery.c.top_score,
-            subquery.c.false_positive,
-            subquery.c.box,
-            subquery.c.data,
-            subquery.c.event_count,
-        )
-        .from_(subquery)
-        .where(subquery.c.rank <= limit)
-        .order_by(subquery.c.event_count.desc(), subquery.c.start_time.desc())
-        .dicts()
-    )
-
-    events = list(query.iterator())
-
-    processed_events = [
-        {k: v for k, v in event.items() if k != "data"}
-        | {
-            "data": {
-                k: v
-                for k, v in event["data"].items()
-                if k in ["type", "score", "top_score", "description"]
-            }
-        }
-        for event in events
-    ]
-
-    return jsonify(processed_events)
-
-
-@EventBp.route("/event_ids")
-def event_ids():
-    idString = request.args.get("ids")
-    ids = idString.split(",")
-
-    if not ids:
-        return make_response(
-            jsonify({"success": False, "message": "Valid list of ids must be sent"}),
-            400,
-        )
-
-    try:
-        events = Event.select().where(Event.id << ids).dicts().iterator()
-        return jsonify(list(events))
-    except Exception:
-        return make_response(
-            jsonify({"success": False, "message": "Events not found"}), 400
-        )
-
-
-@EventBp.route("/events/search")
-def events_search():
-    query = request.args.get("query", type=str)
-    search_type = request.args.get("search_type", "thumbnail,description", type=str)
-    include_thumbnails = request.args.get("include_thumbnails", default=1, type=int)
-    limit = request.args.get("limit", 50, type=int)
-
-    # Filters
-    cameras = request.args.get("cameras", "all", type=str)
-    labels = request.args.get("labels", "all", type=str)
-    zones = request.args.get("zones", "all", type=str)
-    after = request.args.get("after", type=float)
-    before = request.args.get("before", type=float)
-
-    # for similarity search
-    event_id = request.args.get("event_id", type=str)
-
-    if not query and not event_id:
-        return make_response(
-            jsonify(
-                {
-                    "success": False,
-                    "message": "A search query must be supplied",
-                }
-            ),
-            400,
-        )
-
-    if not current_app.frigate_config.semantic_search.enabled:
-        return make_response(
-            jsonify(
-                {
-                    "success": False,
-                    "message": "Semantic search is not enabled",
-                }
-            ),
-            400,
-        )
-
-    context: EmbeddingsContext = current_app.embeddings
-
-    selected_columns = [
-        Event.id,
-        Event.camera,
-        Event.label,
-        Event.sub_label,
-        Event.zones,
-        Event.start_time,
-        Event.end_time,
-        Event.has_clip,
-        Event.has_snapshot,
-        Event.data,
-        Event.plus_id,
-        ReviewSegment.thumb_path,
-    ]
-
-    if include_thumbnails:
-        selected_columns.append(Event.thumbnail)
-
-    # Build the where clause for the embeddings query
-    embeddings_filters = []
-
-    if cameras != "all":
-        camera_list = cameras.split(",")
-        embeddings_filters.append({"camera": {"$in": camera_list}})
-
-    if labels != "all":
-        label_list = labels.split(",")
-        embeddings_filters.append({"label": {"$in": label_list}})
-
-    if zones != "all":
-        filtered_zones = zones.split(",")
-        zone_filters = [{f"zones_{zone}": {"$eq": True}} for zone in filtered_zones]
-        if len(zone_filters) > 1:
-            embeddings_filters.append({"$or": zone_filters})
-        else:
-            embeddings_filters.append(zone_filters[0])
-
-    if after:
-        embeddings_filters.append({"start_time": {"$gt": after}})
-
-    if before:
-        embeddings_filters.append({"start_time": {"$lt": before}})
-
-    where = None
-    if len(embeddings_filters) > 1:
-        where = {"$and": embeddings_filters}
-    elif len(embeddings_filters) == 1:
-        where = embeddings_filters[0]
-
-    thumb_ids = {}
-    desc_ids = {}
-
-    if search_type == "similarity":
-        # Grab the ids of events that match the thumbnail image embeddings
-        try:
-            search_event: Event = Event.get(Event.id == event_id)
-        except DoesNotExist:
-            return make_response(
-                jsonify(
-                    {
-                        "success": False,
-                        "message": "Event not found",
-                    }
-                ),
-                404,
-            )
-        thumbnail = base64.b64decode(search_event.thumbnail)
-        img = np.array(Image.open(io.BytesIO(thumbnail)).convert("RGB"))
-        thumb_result = context.embeddings.thumbnail.query(
-            query_images=[img],
-            n_results=limit,
-            where=where,
-        )
-        thumb_ids = dict(
-            zip(
-                thumb_result["ids"][0],
-                context.thumb_stats.normalize(thumb_result["distances"][0]),
-            )
-        )
-    else:
-        search_types = search_type.split(",")
-
-        if "thumbnail" in search_types:
-            thumb_result = context.embeddings.thumbnail.query(
-                query_texts=[query],
-                n_results=limit,
-                where=where,
-            )
-            # Do a rudimentary normalization of the difference in distances returned by CLIP and MiniLM.
-            thumb_ids = dict(
-                zip(
-                    thumb_result["ids"][0],
-                    context.thumb_stats.normalize(thumb_result["distances"][0]),
-                )
-            )
-
-        if "description" in search_types:
-            desc_result = context.embeddings.description.query(
-                query_texts=[query],
-                n_results=limit,
-                where=where,
-            )
-            desc_ids = dict(
-                zip(
-                    desc_result["ids"][0],
-                    context.desc_stats.normalize(desc_result["distances"][0]),
-                )
-            )
-
-    results = {}
-    for event_id in thumb_ids.keys() | desc_ids:
-        min_distance = min(
-            i
-            for i in (thumb_ids.get(event_id), desc_ids.get(event_id))
-            if i is not None
-        )
-        results[event_id] = {
-            "distance": min_distance,
-            "source": "thumbnail"
-            if min_distance == thumb_ids.get(event_id)
-            else "description",
-        }
-
-    if not results:
-        return jsonify([])
-
-    # Get the event data
-    events = (
-        Event.select(*selected_columns)
-        .join(
-            ReviewSegment,
-            JOIN.LEFT_OUTER,
-            on=(fn.json_extract(ReviewSegment.data, "$.detections").contains(Event.id)),
-        )
-        .where(Event.id << list(results.keys()))
-        .dicts()
-        .iterator()
-    )
-    events = list(events)
-
-    events = [
-        {k: v for k, v in event.items() if k != "data"}
-        | {
-            "data": {
-                k: v
-                for k, v in event["data"].items()
-                if k in ["type", "score", "top_score", "description"]
-            }
-        }
-        | {
-            "search_distance": results[event["id"]]["distance"],
-            "search_source": results[event["id"]]["source"],
-        }
-        for event in events
-    ]
-    events = sorted(events, key=lambda x: x["search_distance"])[:limit]
-
-    return jsonify(events)
-
-
 @EventBp.route("/events/summary")
 def events_summary():
     tz_name = request.args.get("timezone", default="utc", type=str)
@@ -899,52 +604,6 @@ def set_sub_label(id):
     )
 
 
-@EventBp.route("/events/<id>/description", methods=("POST",))
-def set_description(id):
-    try:
-        event: Event = Event.get(Event.id == id)
-    except DoesNotExist:
-        return make_response(
-            jsonify({"success": False, "message": "Event " + id + " not found"}), 404
-        )
-
-    json: dict[str, any] = request.get_json(silent=True) or {}
-    new_description = json.get("description")
-
-    if new_description is None or len(new_description) == 0:
-        return make_response(
-            jsonify(
-                {
-                    "success": False,
-                    "message": "description cannot be empty",
-                }
-            ),
-            400,
-        )
-
-    event.data["description"] = new_description
-    event.save()
-
-    # If semantic search is enabled, update the index
-    if current_app.frigate_config.semantic_search.enabled:
-        context: EmbeddingsContext = current_app.embeddings
-        context.embeddings.description.upsert(
-            documents=[new_description],
-            metadatas=[get_metadata(event)],
-            ids=[id],
-        )
-
-    return make_response(
-        jsonify(
-            {
-                "success": True,
-                "message": "Event " + id + " description set to " + new_description,
-            }
-        ),
-        200,
-    )
-
-
 @EventBp.route("/events/<id>", methods=("DELETE",))
 def delete_event(id):
     try:
@@ -966,11 +625,6 @@ def delete_event(id):
 
     event.delete_instance()
     Timeline.delete().where(Timeline.source_id == id).execute()
-    # If semantic search is enabled, update the index
-    if current_app.frigate_config.semantic_search.enabled:
-        context: EmbeddingsContext = current_app.embeddings
-        context.embeddings.thumbnail.delete(ids=[id])
-        context.embeddings.description.delete(ids=[id])
     return make_response(
         jsonify({"success": True, "message": "Event " + id + " deleted"}), 200
     )

frigate/api/export.py

@@ -55,8 +55,6 @@ def export_recording(camera_name: str, start_time, end_time):
             401,
         )
 
-    existing_image = json.get("image_path")
-
     recordings_count = (
         Recordings.select()
         .where(
@@ -80,7 +78,6 @@ def export_recording(camera_name: str, start_time, end_time):
         current_app.frigate_config,
         camera_name,
         friendly_name,
-        existing_image,
         int(start_time),
         int(end_time),
         (
@@ -149,9 +146,9 @@ def export_delete(id: str):
         try:
             if process.name() != "ffmpeg":
                 continue
-            file_list = process.open_files()
-            if file_list:
-                for nt in file_list:
+            flist = process.open_files()
+            if flist:
+                for nt in flist:
                     if nt.path.startswith(EXPORT_DIR):
                         files_in_use.append(nt.path.split("/")[-1])
         except psutil.Error:

frigate/api/media.py

@@ -17,7 +17,6 @@ from peewee import DoesNotExist, fn
 from tzlocal import get_localzone_name
 from werkzeug.utils import secure_filename
 
-from frigate.config import FrigateConfig
 from frigate.const import (
     CACHE_DIR,
     CLIPS_DIR,
@@ -180,20 +179,14 @@ def latest_frame(camera_name):
         )
 
 
-@MediaBp.route("/<camera_name>/recordings/<frame_time>/snapshot.<format>")
-def get_snapshot_from_recording(camera_name: str, frame_time: str, format: str):
+@MediaBp.route("/<camera_name>/recordings/<frame_time>/snapshot.png")
+def get_snapshot_from_recording(camera_name: str, frame_time: str):
     if camera_name not in current_app.frigate_config.cameras:
         return make_response(
             jsonify({"success": False, "message": "Camera not found"}),
             404,
         )
 
-    if format not in ["png", "jpg"]:
-        return make_response(
-            jsonify({"success": False, "message": "Invalid format"}),
-            400,
-        )
-
     frame_time = float(frame_time)
     recording_query = (
         Recordings.select(
@@ -214,14 +207,7 @@ def get_snapshot_from_recording(camera_name: str, frame_time: str, format: str):
     try:
         recording: Recordings = recording_query.get()
         time_in_segment = frame_time - recording.start_time
-
-        height = request.args.get("height", type=int)
-        codec = "png" if format == "png" else "mjpeg"
-        config: FrigateConfig = current_app.frigate_config
-
-        image_data = get_image_from_recording(
-            config.ffmpeg, recording.path, time_in_segment, codec, height
-        )
+        image_data = get_image_from_recording(recording.path, time_in_segment)
 
         if not image_data:
             return make_response(
@@ -235,7 +221,7 @@ def get_snapshot_from_recording(camera_name: str, frame_time: str, format: str):
             )
 
         response = make_response(image_data)
-        response.headers["Content-Type"] = f"image/{format}"
+        response.headers["Content-Type"] = "image/png"
         return response
     except DoesNotExist:
         return make_response(
@@ -275,12 +261,9 @@ def submit_recording_snapshot_to_plus(camera_name: str, frame_time: str):
     )
 
     try:
-        config: FrigateConfig = current_app.frigate_config
         recording: Recordings = recording_query.get()
         time_in_segment = frame_time - recording.start_time
-        image_data = get_image_from_recording(
-            config.ffmpeg, recording.path, time_in_segment, "png"
-        )
+        image_data = get_image_from_recording(recording.path, time_in_segment)
 
         if not image_data:
             return make_response(
@@ -479,11 +462,9 @@ def recording_clip(camera_name, start_ts, end_ts):
     file_name = secure_filename(file_name)
     path = os.path.join(CLIPS_DIR, f"cache/{file_name}")
 
-    config: FrigateConfig = current_app.frigate_config
-
     if not os.path.exists(path):
         ffmpeg_cmd = [
-            config.ffmpeg.ffmpeg_path,
+            "ffmpeg",
             "-hide_banner",
             "-y",
             "-protocol_whitelist",
@@ -604,8 +585,7 @@ def vod_ts(camera_name, start_ts, end_ts):
     )
 
 
-@MediaBp.route("/vod/<year_month>/<int:day>/<int:hour>/<camera_name>")
-@MediaBp.route("/vod/<year_month>/<float:day>/<float:hour>/<camera_name>")
+@MediaBp.route("/vod/<year_month>/<day>/<hour>/<camera_name>")
 def vod_hour_no_timezone(year_month, day, hour, camera_name):
     return vod_hour(
         year_month, day, hour, camera_name, get_localzone_name().replace("/", ",")
@@ -1148,9 +1128,8 @@ def preview_gif(camera_name: str, start_ts, end_ts, max_cache_age=2592000):
         diff = start_ts - preview.start_time
         minutes = int(diff / 60)
         seconds = int(diff % 60)
-        config: FrigateConfig = current_app.frigate_config
         ffmpeg_cmd = [
-            config.ffmpeg.ffmpeg_path,
+            "ffmpeg",
             "-hide_banner",
             "-loglevel",
             "warning",
@@ -1214,10 +1193,9 @@ def preview_gif(camera_name: str, start_ts, end_ts, max_cache_age=2592000):
 
         last_file = selected_previews[-2]
         selected_previews.append(last_file)
-        config: FrigateConfig = current_app.frigate_config
 
         ffmpeg_cmd = [
-            config.ffmpeg.ffmpeg_path,
+            "ffmpeg",
             "-hide_banner",
             "-loglevel",
             "warning",
@@ -1310,9 +1288,8 @@ def preview_mp4(camera_name: str, start_ts, end_ts, max_cache_age=604800):
         diff = start_ts - preview.start_time
         minutes = int(diff / 60)
         seconds = int(diff % 60)
-        config: FrigateConfig = current_app.frigate_config
         ffmpeg_cmd = [
-            config.ffmpeg.ffmpeg_path,
+            "ffmpeg",
             "-hide_banner",
             "-loglevel",
             "warning",
@@ -1374,10 +1351,9 @@ def preview_mp4(camera_name: str, start_ts, end_ts, max_cache_age=604800):
 
         last_file = selected_previews[-2]
         selected_previews.append(last_file)
-        config: FrigateConfig = current_app.frigate_config
 
         ffmpeg_cmd = [
-            config.ffmpeg.ffmpeg_path,
+            "ffmpeg",
             "-hide_banner",
             "-loglevel",
             "warning",

frigate/api/notification.py

@@ -1,65 +0,0 @@
-"""Notification apis."""
-
-import logging
-import os
-
-from cryptography.hazmat.primitives import serialization
-from flask import (
-    Blueprint,
-    current_app,
-    jsonify,
-    make_response,
-    request,
-)
-from peewee import DoesNotExist
-from py_vapid import Vapid01, utils
-
-from frigate.const import CONFIG_DIR
-from frigate.models import User
-
-logger = logging.getLogger(__name__)
-
-NotificationBp = Blueprint("notifications", __name__)
-
-
-@NotificationBp.route("/notifications/pubkey", methods=["GET"])
-def get_vapid_pub_key():
-    if not current_app.frigate_config.notifications.enabled:
-        return make_response(
-            jsonify({"success": False, "message": "Notifications are not enabled."}),
-            400,
-        )
-
-    key = Vapid01.from_file(os.path.join(CONFIG_DIR, "notifications.pem"))
-    raw_pub = key.public_key.public_bytes(
-        serialization.Encoding.X962, serialization.PublicFormat.UncompressedPoint
-    )
-    return jsonify(utils.b64urlencode(raw_pub)), 200
-
-
-@NotificationBp.route("/notifications/register", methods=["POST"])
-def register_notifications():
-    if current_app.frigate_config.auth.enabled:
-        username = request.headers.get("remote-user", type=str) or "admin"
-    else:
-        username = "admin"
-
-    json: dict[str, any] = request.get_json(silent=True) or {}
-    sub = json.get("sub")
-
-    if not sub:
-        return jsonify(
-            {"success": False, "message": "Subscription must be provided."}
-        ), 400
-
-    try:
-        User.update(notification_tokens=User.notification_tokens.append(sub)).where(
-            User.username == username
-        ).execute()
-        return make_response(
-            jsonify({"success": True, "message": "Successfully saved token."}), 200
-        )
-    except DoesNotExist:
-        return make_response(
-            jsonify({"success": False, "message": "Could not find user."}), 404
-        )

frigate/api/preview.py

@@ -75,10 +75,7 @@ def preview_ts(camera_name, start_ts, end_ts):
     return make_response(jsonify(clips), 200)
 
 
-@PreviewBp.route("/preview/<year_month>/<int:day>/<int:hour>/<camera_name>/<tz_name>")
-@PreviewBp.route(
-    "/preview/<year_month>/<float:day>/<float:hour>/<camera_name>/<tz_name>"
-)
+@PreviewBp.route("/preview/<year_month>/<day>/<hour>/<camera_name>/<tz_name>")
 def preview_hour(year_month, day, hour, camera_name, tz_name):
     parts = year_month.split("-")
     start_date = (

frigate/api/review.py

@@ -94,18 +94,6 @@ def review():
     return jsonify([r for r in review])
 
 
-@ReviewBp.route("/review/event/<id>")
-def get_review_from_event(id: str):
-    try:
-        return model_to_dict(
-            ReviewSegment.get(
-                ReviewSegment.data["detections"].cast("text") % f'*"{id}"*'
-            )
-        )
-    except DoesNotExist:
-        return "Review item not found", 404
-
-
 @ReviewBp.route("/review/<id>")
 def get_review(id: str):
     try:

frigate/app.py

@@ -22,12 +22,11 @@ from pydantic import ValidationError
 from frigate.api.app import create_app
 from frigate.api.auth import hash_password
 from frigate.comms.config_updater import ConfigPublisher
+from frigate.comms.detections_updater import DetectionProxy
 from frigate.comms.dispatcher import Communicator, Dispatcher
 from frigate.comms.inter_process import InterProcessCommunicator
 from frigate.comms.mqtt import MqttClient
-from frigate.comms.webpush import WebPushClient
 from frigate.comms.ws import WebSocketClient
-from frigate.comms.zmq_proxy import ZmqProxy
 from frigate.config import FrigateConfig
 from frigate.const import (
     CACHE_DIR,
@@ -38,12 +37,11 @@ from frigate.const import (
     MODEL_CACHE_DIR,
     RECORD_DIR,
 )
-from frigate.embeddings import EmbeddingsContext, manage_embeddings
 from frigate.events.audio import listen_to_audio
 from frigate.events.cleanup import EventCleanup
 from frigate.events.external import ExternalEventProcessor
 from frigate.events.maintainer import EventProcessor
-from frigate.log import log_thread
+from frigate.log import log_process, root_configurer
 from frigate.models import (
     Event,
     Export,
@@ -113,6 +111,15 @@ class FrigateApp:
             else:
                 logger.debug(f"Skipping directory: {d}")
 
+    def init_logger(self) -> None:
+        self.log_process = mp.Process(
+            target=log_process, args=(self.log_queue,), name="log_process"
+        )
+        self.log_process.daemon = True
+        self.log_process.start()
+        self.processes["logger"] = self.log_process.pid or 0
+        root_configurer(self.log_queue)
+
     def init_config(self) -> None:
         config_file = os.environ.get("CONFIG_FILE", "/config/config.yml")
 
@@ -309,25 +316,7 @@ class FrigateApp:
         self.review_segment_process = review_segment_process
         review_segment_process.start()
         self.processes["review_segment"] = review_segment_process.pid or 0
-        logger.info(f"Review process started: {review_segment_process.pid}")
-
-    def init_embeddings_manager(self) -> None:
-        if not self.config.semantic_search.enabled:
-            self.embeddings = None
-            return
-
-        # Create a client for other processes to use
-        self.embeddings = EmbeddingsContext()
-        embedding_process = mp.Process(
-            target=manage_embeddings,
-            name="embeddings_manager",
-            args=(self.config,),
-        )
-        embedding_process.daemon = True
-        self.embedding_process = embedding_process
-        embedding_process.start()
-        self.processes["embeddings"] = embedding_process.pid or 0
-        logger.info(f"Embedding process started: {embedding_process.pid}")
+        logger.info(f"Recording process started: {review_segment_process.pid}")
 
     def bind_database(self) -> None:
         """Bind db to the main process."""
@@ -365,7 +354,7 @@ class FrigateApp:
             except PermissionError:
                 logger.error("Unable to write to /config to save export state")
 
-            migrate_exports(self.config.ffmpeg, self.config.cameras.keys())
+            migrate_exports(self.config.cameras.keys())
 
     def init_external_event_processor(self) -> None:
         self.external_event_processor = ExternalEventProcessor(self.config)
@@ -373,13 +362,12 @@ class FrigateApp:
     def init_inter_process_communicator(self) -> None:
         self.inter_process_communicator = InterProcessCommunicator()
         self.inter_config_updater = ConfigPublisher()
-        self.inter_zmq_proxy = ZmqProxy()
+        self.inter_detection_proxy = DetectionProxy()
 
     def init_web_server(self) -> None:
         self.flask_app = create_app(
             self.config,
             self.db,
-            self.embeddings,
             self.detected_frames_processor,
             self.storage_maintainer,
             self.onvif_controller,
@@ -397,9 +385,6 @@ class FrigateApp:
         if self.config.mqtt.enabled:
             comms.append(MqttClient(self.config))
 
-        if self.config.notifications.enabled_in_config:
-            comms.append(WebPushClient(self.config))
-
         comms.append(WebSocketClient(self.config))
         comms.append(self.inter_process_communicator)
 
@@ -528,7 +513,7 @@ class FrigateApp:
             capture_process = mp.Process(
                 target=capture_camera,
                 name=f"camera_capture:{name}",
-                args=(name, config, self.shm_frame_count, self.camera_metrics[name]),
+                args=(name, config, self.camera_metrics[name]),
             )
             capture_process.daemon = True
             self.camera_metrics[name]["capture_process"] = capture_process
@@ -592,34 +577,19 @@ class FrigateApp:
         self.frigate_watchdog.start()
 
     def check_shm(self) -> None:
-        total_shm = round(shutil.disk_usage("/dev/shm").total / pow(2, 20), 1)
+        available_shm = round(shutil.disk_usage("/dev/shm").total / pow(2, 20), 1)
+        min_req_shm = 30
 
-        # required for log files + nginx cache
-        min_req_shm = 40 + 10
-
-        if self.config.birdseye.restream:
-            min_req_shm += 8
-
-        available_shm = total_shm - min_req_shm
-        cam_total_frame_size = 0
-
-        for camera in self.config.cameras.values():
-            if camera.enabled:
-                cam_total_frame_size += round(
-                    (camera.detect.width * camera.detect.height * 1.5 + 270480)
+        for _, camera in self.config.cameras.items():
+            min_req_shm += round(
+                (camera.detect.width * camera.detect.height * 1.5 * 9 + 270480)
                 / 1048576,
                 1,
             )
 
-        self.shm_frame_count = min(50, int(available_shm / (cam_total_frame_size)))
-
-        logger.debug(
-            f"Calculated total camera size {available_shm} / {cam_total_frame_size} :: {self.shm_frame_count} frames for each camera in SHM"
-        )
-
-        if self.shm_frame_count < 10:
+        if available_shm < min_req_shm:
             logger.warning(
-                f"The current SHM size of {total_shm}MB is too small, recommend increasing it to at least {round(min_req_shm + cam_total_frame_size)}MB."
+                f"The current SHM size of {available_shm}MB is too small, recommend increasing it to at least {min_req_shm}MB."
             )
 
     def init_auth(self) -> None:
@@ -658,7 +628,6 @@ class FrigateApp:
                 logger.info("********************************************************")
                 logger.info("********************************************************")
 
-    @log_thread()
     def start(self) -> None:
         parser = argparse.ArgumentParser(
             prog="Frigate",
@@ -667,6 +636,7 @@ class FrigateApp:
         parser.add_argument("--validate-config", action="store_true")
         args = parser.parse_args()
 
+        self.init_logger()
         logger.info(f"Starting Frigate ({VERSION})")
 
         try:
@@ -693,11 +663,13 @@ class FrigateApp:
                 print("*************************************************************")
                 print("***    End Config Validation Errors                       ***")
                 print("*************************************************************")
+                self.log_process.terminate()
                 sys.exit(1)
             if args.validate_config:
                 print("*************************************************************")
                 print("*** Your config file is valid.                            ***")
                 print("*************************************************************")
+                self.log_process.terminate()
                 sys.exit(0)
             self.set_environment_vars()
             self.set_log_levels()
@@ -706,7 +678,6 @@ class FrigateApp:
             self.init_onvif()
             self.init_recording_manager()
             self.init_review_segment_manager()
-            self.init_embeddings_manager()
             self.init_go2rtc()
             self.bind_database()
             self.check_db_data_migrations()
@@ -714,6 +685,7 @@ class FrigateApp:
             self.init_dispatcher()
         except Exception as e:
             print(e)
+            self.log_process.terminate()
             sys.exit(1)
         self.start_detectors()
         self.start_video_output_processor()
@@ -721,7 +693,6 @@ class FrigateApp:
         self.init_historical_regions()
         self.start_detected_frames_processor()
         self.start_camera_processors()
-        self.check_shm()
         self.start_camera_capture_processes()
         self.start_audio_processors()
         self.start_storage_maintainer()
@@ -733,6 +704,7 @@ class FrigateApp:
         self.start_event_cleanup()
         self.start_record_cleanup()
         self.start_watchdog()
+        self.check_shm()
         self.init_auth()
 
         # Flask only listens for SIGINT, so we need to catch SIGTERM and send SIGINT
@@ -822,18 +794,17 @@ class FrigateApp:
         self.frigate_watchdog.join()
         self.db.stop()
 
-        # Save embeddings stats to disk
-        if self.embeddings:
-            self.embeddings.save_stats()
-
         # Stop Communicators
         self.inter_process_communicator.stop()
         self.inter_config_updater.stop()
-        self.inter_zmq_proxy.stop()
+        self.inter_detection_proxy.stop()
 
         while len(self.detection_shms) > 0:
             shm = self.detection_shms.pop()
             shm.close()
             shm.unlink()
 
+        self.log_process.terminate()
+        self.log_process.join()
+
         os._exit(os.EX_OK)

frigate/comms/detections_updater.py

@@ -1,9 +1,14 @@
 """Facilitates communication between processes."""
 
+import threading
 from enum import Enum
 from typing import Optional
 
-from .zmq_proxy import Publisher, Subscriber
+import zmq
+
+SOCKET_CONTROL = "inproc://control.detections_updater"
+SOCKET_PUB = "ipc:///tmp/cache/detect_pub"
+SOCKET_SUB = "ipc:///tmp/cache/detect_sub"
 
 
 class DetectionTypeEnum(str, Enum):
@@ -13,31 +18,85 @@ class DetectionTypeEnum(str, Enum):
     audio = "audio"
 
 
-class DetectionPublisher(Publisher):
+class DetectionProxyRunner(threading.Thread):
+    def __init__(self, context: zmq.Context[zmq.Socket]) -> None:
+        threading.Thread.__init__(self)
+        self.name = "detection_proxy"
+        self.context = context
+
+    def run(self) -> None:
+        """Run the proxy."""
+        control = self.context.socket(zmq.REP)
+        control.connect(SOCKET_CONTROL)
+        incoming = self.context.socket(zmq.XSUB)
+        incoming.bind(SOCKET_PUB)
+        outgoing = self.context.socket(zmq.XPUB)
+        outgoing.bind(SOCKET_SUB)
+
+        zmq.proxy_steerable(
+            incoming, outgoing, None, control
+        )  # blocking, will unblock terminate message is received
+        incoming.close()
+        outgoing.close()
+
+
+class DetectionProxy:
+    """Proxies video and audio detections."""
+
+    def __init__(self) -> None:
+        self.context = zmq.Context()
+        self.control = self.context.socket(zmq.REQ)
+        self.control.bind(SOCKET_CONTROL)
+        self.runner = DetectionProxyRunner(self.context)
+        self.runner.start()
+
+    def stop(self) -> None:
+        self.control.send("TERMINATE".encode())  # tell the proxy to stop
+        self.runner.join()
+        self.context.destroy()
+
+
+class DetectionPublisher:
     """Simplifies receiving video and audio detections."""
 
-    topic_base = "detection/"
-
     def __init__(self, topic: DetectionTypeEnum) -> None:
-        topic = topic.value
-        super().__init__(topic)
+        self.topic = topic
+        self.context = zmq.Context()
+        self.socket = self.context.socket(zmq.PUB)
+        self.socket.connect(SOCKET_PUB)
+
+    def send_data(self, payload: any) -> None:
+        """Publish detection."""
+        self.socket.send_string(self.topic.value, flags=zmq.SNDMORE)
+        self.socket.send_json(payload)
+
+    def stop(self) -> None:
+        self.socket.close()
+        self.context.destroy()
 
 
-class DetectionSubscriber(Subscriber):
+class DetectionSubscriber:
     """Simplifies receiving video and audio detections."""
 
-    topic_base = "detection/"
-
     def __init__(self, topic: DetectionTypeEnum) -> None:
-        topic = topic.value
-        super().__init__(topic)
+        self.context = zmq.Context()
+        self.socket = self.context.socket(zmq.SUB)
+        self.socket.setsockopt_string(zmq.SUBSCRIBE, topic.value)
+        self.socket.connect(SOCKET_SUB)
 
-    def check_for_update(
-        self, timeout: float = None
-    ) -> Optional[tuple[DetectionTypeEnum, any]]:
-        return super().check_for_update(timeout)
+    def get_data(self, timeout: float = None) -> Optional[tuple[str, any]]:
+        """Returns detections or None if no update."""
+        try:
+            has_update, _, _ = zmq.select([self.socket], [], [], timeout)
+
+            if has_update:
+                topic = DetectionTypeEnum[self.socket.recv_string(flags=zmq.NOBLOCK)]
+                return (topic, self.socket.recv_json())
+        except zmq.ZMQError:
+            pass
 
-    def _return_object(self, topic: str, payload: any) -> any:
-        if payload is None:
         return (None, None)
-        return (DetectionTypeEnum[topic[len(self.topic_base) :]], payload)
+
+    def stop(self) -> None:
+        self.socket.close()
+        self.context.destroy()

frigate/comms/dispatcher.py

@@ -14,10 +14,9 @@ from frigate.const import (
     INSERT_PREVIEW,
     REQUEST_REGION_GRID,
     UPDATE_CAMERA_ACTIVITY,
-    UPDATE_EVENT_DESCRIPTION,
     UPSERT_REVIEW_SEGMENT,
 )
-from frigate.models import Event, Previews, Recordings, ReviewSegment
+from frigate.models import Previews, Recordings, ReviewSegment
 from frigate.ptz.onvif import OnvifCommandEnum, OnvifController
 from frigate.types import PTZMetricsTypes
 from frigate.util.object import get_camera_regions_grid
@@ -75,9 +74,6 @@ class Dispatcher:
             "birdseye": self._on_birdseye_command,
             "birdseye_mode": self._on_birdseye_mode_command,
         }
-        self._global_settings_handlers: dict[str, Callable] = {
-            "notifications": self._on_notification_command,
-        }
 
         for comm in self.comms:
             comm.subscribe(self._receive)
@@ -89,13 +85,9 @@ class Dispatcher:
         if topic.endswith("set"):
             try:
                 # example /cam_name/detect/set payload=ON|OFF
-                if topic.count("/") == 2:
                 camera_name = topic.split("/")[-3]
                 command = topic.split("/")[-2]
                 self._camera_settings_handlers[command](camera_name, payload)
-                elif topic.count("/") == 1:
-                    command = topic.split("/")[-2]
-                    self._global_settings_handlers[command](payload)
             except IndexError:
                 logger.error(f"Received invalid set command: {topic}")
                 return
@@ -136,10 +128,6 @@ class Dispatcher:
             ).execute()
         elif topic == UPDATE_CAMERA_ACTIVITY:
             self.camera_activity = payload
-        elif topic == UPDATE_EVENT_DESCRIPTION:
-            event: Event = Event.get(Event.id == payload["id"])
-            event.data["description"] = payload["description"]
-            event.save()
         elif topic == "onConnect":
             camera_status = self.camera_activity.copy()
 
@@ -289,18 +277,6 @@ class Dispatcher:
         self.config_updater.publish(f"config/motion/{camera_name}", motion_settings)
         self.publish(f"{camera_name}/motion_threshold/state", payload, retain=True)
 
-    def _on_notification_command(self, payload: str) -> None:
-        """Callback for notification topic."""
-        if payload != "ON" and payload != "OFF":
-            f"Received unsupported value for notification: {payload}"
-            return
-
-        notification_settings = self.config.notifications
-        logger.info(f"Setting notifications: {payload}")
-        notification_settings.enabled = payload == "ON"  # type: ignore[union-attr]
-        self.config_updater.publish("config/notifications", notification_settings)
-        self.publish("notifications/state", payload, retain=True)
-
     def _on_audio_command(self, camera_name: str, payload: str) -> None:
         """Callback for audio topic."""
         audio_settings = self.config.cameras[camera_name].audio

frigate/comms/events_updater.py

@@ -1,51 +1,100 @@
 """Facilitates communication between processes."""
 
+import zmq
+
 from frigate.events.types import EventStateEnum, EventTypeEnum
 
-from .zmq_proxy import Publisher, Subscriber
+SOCKET_PUSH_PULL = "ipc:///tmp/cache/events"
+SOCKET_PUSH_PULL_END = "ipc:///tmp/cache/events_ended"
 
 
-class EventUpdatePublisher(Publisher):
+class EventUpdatePublisher:
     """Publishes events (objects, audio, manual)."""
 
-    topic_base = "event/"
-
     def __init__(self) -> None:
-        super().__init__("update")
+        self.context = zmq.Context()
+        self.socket = self.context.socket(zmq.PUSH)
+        self.socket.connect(SOCKET_PUSH_PULL)
 
     def publish(
         self, payload: tuple[EventTypeEnum, EventStateEnum, str, dict[str, any]]
     ) -> None:
-        super().publish(payload)
+        """There is no communication back to the processes."""
+        self.socket.send_json(payload)
+
+    def stop(self) -> None:
+        self.socket.close()
+        self.context.destroy()
 
 
-class EventUpdateSubscriber(Subscriber):
+class EventUpdateSubscriber:
     """Receives event updates."""
 
-    topic_base = "event/"
-
     def __init__(self) -> None:
-        super().__init__("update")
+        self.context = zmq.Context()
+        self.socket = self.context.socket(zmq.PULL)
+        self.socket.bind(SOCKET_PUSH_PULL)
+
+    def check_for_update(
+        self, timeout=1
+    ) -> tuple[EventTypeEnum, EventStateEnum, str, dict[str, any]]:
+        """Returns events or None if no update."""
+        try:
+            has_update, _, _ = zmq.select([self.socket], [], [], timeout)
+
+            if has_update:
+                return self.socket.recv_json()
+        except zmq.ZMQError:
+            pass
+
+        return None
+
+    def stop(self) -> None:
+        self.socket.close()
+        self.context.destroy()
 
 
-class EventEndPublisher(Publisher):
+class EventEndPublisher:
     """Publishes events that have ended."""
 
-    topic_base = "event/"
-
     def __init__(self) -> None:
-        super().__init__("finalized")
+        self.context = zmq.Context()
+        self.socket = self.context.socket(zmq.PUSH)
+        self.socket.connect(SOCKET_PUSH_PULL_END)
 
     def publish(
         self, payload: tuple[EventTypeEnum, EventStateEnum, str, dict[str, any]]
     ) -> None:
-        super().publish(payload)
+        """There is no communication back to the processes."""
+        self.socket.send_json(payload)
+
+    def stop(self) -> None:
+        self.socket.close()
+        self.context.destroy()
 
 
-class EventEndSubscriber(Subscriber):
+class EventEndSubscriber:
     """Receives events that have ended."""
 
-    topic_base = "event/"
-
     def __init__(self) -> None:
-        super().__init__("finalized")
+        self.context = zmq.Context()
+        self.socket = self.context.socket(zmq.PULL)
+        self.socket.bind(SOCKET_PUSH_PULL_END)
+
+    def check_for_update(
+        self, timeout=1
+    ) -> tuple[EventTypeEnum, EventStateEnum, str, dict[str, any]]:
+        """Returns events ended or None if no update."""
+        try:
+            has_update, _, _ = zmq.select([self.socket], [], [], timeout)
+
+            if has_update:
+                return self.socket.recv_json()
+        except zmq.ZMQError:
+            pass
+
+        return None
+
+    def stop(self) -> None:
+        self.socket.close()
+        self.context.destroy()

frigate/comms/mqtt.py

@@ -105,13 +105,6 @@ class MqttClient(Communicator):  # type: ignore[misc]
                 retain=True,
             )
 
-        if self.config.notifications.enabled_in_config:
-            self.publish(
-                "notifications/state",
-                "ON" if self.config.notifications.enabled else "OFF",
-                retain=True,
-            )
-
         self.publish("available", "online", retain=True)
 
     def on_mqtt_command(
@@ -216,12 +209,6 @@ class MqttClient(Communicator):  # type: ignore[misc]
                     self.on_mqtt_command,
                 )
 
-        if self.config.notifications.enabled_in_config:
-            self.client.message_callback_add(
-                f"{self.mqtt_config.topic_prefix}/notifications/set",
-                self.on_mqtt_command,
-            )
-
         self.client.message_callback_add(
             f"{self.mqtt_config.topic_prefix}/restart", self.on_mqtt_command
         )

frigate/comms/webpush.py

@@ -1,203 +0,0 @@
-"""Handle sending notifications for Frigate via Firebase."""
-
-import datetime
-import json
-import logging
-import os
-from typing import Any, Callable
-
-from py_vapid import Vapid01
-from pywebpush import WebPusher
-
-from frigate.comms.config_updater import ConfigSubscriber
-from frigate.comms.dispatcher import Communicator
-from frigate.config import FrigateConfig
-from frigate.const import CONFIG_DIR
-from frigate.models import User
-
-logger = logging.getLogger(__name__)
-
-
-class WebPushClient(Communicator):  # type: ignore[misc]
-    """Frigate wrapper for webpush client."""
-
-    def __init__(self, config: FrigateConfig) -> None:
-        self.config = config
-        self.claim_headers: dict[str, dict[str, str]] = {}
-        self.refresh: int = 0
-        self.web_pushers: dict[str, list[WebPusher]] = {}
-        self.expired_subs: dict[str, list[str]] = {}
-
-        if not self.config.notifications.email:
-            logger.warning("Email must be provided for push notifications to be sent.")
-
-        # Pull keys from PEM or generate if they do not exist
-        self.vapid = Vapid01.from_file(os.path.join(CONFIG_DIR, "notifications.pem"))
-
-        users: list[User] = (
-            User.select(User.username, User.notification_tokens).dicts().iterator()
-        )
-        for user in users:
-            self.web_pushers[user["username"]] = []
-            for sub in user["notification_tokens"]:
-                self.web_pushers[user["username"]].append(WebPusher(sub))
-
-        # notification config updater
-        self.config_subscriber = ConfigSubscriber("config/notifications")
-
-    def subscribe(self, receiver: Callable) -> None:
-        """Wrapper for allowing dispatcher to subscribe."""
-        pass
-
-    def check_registrations(self) -> None:
-        # check for valid claim or create new one
-        now = datetime.datetime.now().timestamp()
-        if len(self.claim_headers) == 0 or self.refresh < now:
-            self.refresh = int(
-                (datetime.datetime.now() + datetime.timedelta(hours=1)).timestamp()
-            )
-            endpoints: set[str] = set()
-
-            # get a unique set of push endpoints
-            for pushers in self.web_pushers.values():
-                for push in pushers:
-                    endpoint: str = push.subscription_info["endpoint"]
-                    endpoints.add(endpoint[0 : endpoint.index("/", 10)])
-
-            # create new claim
-            for endpoint in endpoints:
-                claim = {
-                    "sub": f"mailto:{self.config.notifications.email}",
-                    "aud": endpoint,
-                    "exp": self.refresh,
-                }
-                self.claim_headers[endpoint] = self.vapid.sign(claim)
-
-    def cleanup_registrations(self) -> None:
-        # delete any expired subs
-        if len(self.expired_subs) > 0:
-            for user, expired in self.expired_subs.items():
-                user_subs = []
-
-                # get all subscriptions, removing ones that are expired
-                stored_user: User = User.get_by_id(user)
-                for token in stored_user.notification_tokens:
-                    if token["endpoint"] in expired:
-                        continue
-
-                    user_subs.append(token)
-
-                # overwrite the database and reset web pushers
-                User.update(notification_tokens=user_subs).where(
-                    User.username == user
-                ).execute()
-
-                self.web_pushers[user] = []
-
-                for sub in user_subs:
-                    self.web_pushers[user].append(WebPusher(sub))
-
-                logger.info(
-                    f"Cleaned up {len(expired)} notification subscriptions for {user}"
-                )
-
-        self.expired_subs = {}
-
-    def publish(self, topic: str, payload: Any, retain: bool = False) -> None:
-        """Wrapper for publishing when client is in valid state."""
-        # check for updated notification config
-        _, updated_notification_config = self.config_subscriber.check_for_update()
-
-        if updated_notification_config:
-            self.config.notifications = updated_notification_config
-
-        if not self.config.notifications.enabled:
-            return
-
-        if topic == "reviews":
-            self.send_alert(json.loads(payload))
-
-    def send_alert(self, payload: dict[str, any]) -> None:
-        if not self.config.notifications.email:
-            return
-
-        self.check_registrations()
-
-        # Only notify for alerts
-        if payload["after"]["severity"] != "alert":
-            return
-
-        state = payload["type"]
-
-        # Don't notify if message is an update and important fields don't have an update
-        if (
-            state == "update"
-            and len(payload["before"]["data"]["objects"])
-            == len(payload["after"]["data"]["objects"])
-            and len(payload["before"]["data"]["zones"])
-            == len(payload["after"]["data"]["zones"])
-        ):
-            return
-
-        reviewId = payload["after"]["id"]
-        sorted_objects: set[str] = set()
-
-        for obj in payload["after"]["data"]["objects"]:
-            if "-verified" not in obj:
-                sorted_objects.add(obj)
-
-        sorted_objects.update(payload["after"]["data"]["sub_labels"])
-
-        camera: str = payload["after"]["camera"]
-        title = f"{', '.join(sorted_objects).replace('_', ' ').title()}{' was' if state == 'end' else ''} detected in {', '.join(payload['after']['data']['zones']).replace('_', ' ').title()}"
-        message = f"Detected on {camera.replace('_', ' ').title()}"
-        image = f'{payload["after"]["thumb_path"].replace("/media/frigate", "")}'
-
-        # if event is ongoing open to live view otherwise open to recordings view
-        direct_url = f"/review?id={reviewId}" if state == "end" else f"/#{camera}"
-
-        for user, pushers in self.web_pushers.items():
-            for pusher in pushers:
-                endpoint = pusher.subscription_info["endpoint"]
-
-                # set headers for notification behavior
-                headers = self.claim_headers[
-                    endpoint[0 : endpoint.index("/", 10)]
-                ].copy()
-                headers["urgency"] = "high"
-                ttl = 3600 if state == "end" else 0
-
-                # send message
-                resp = pusher.send(
-                    headers=headers,
-                    ttl=ttl,
-                    data=json.dumps(
-                        {
-                            "title": title,
-                            "message": message,
-                            "direct_url": direct_url,
-                            "image": image,
-                            "id": reviewId,
-                            "type": "alert",
-                        }
-                    ),
-                )
-
-                if resp.status_code == 201:
-                    pass
-                elif resp.status_code == 404 or resp.status_code == 410:
-                    # subscription is not found or has been unsubscribed
-                    if not self.expired_subs.get(user):
-                        self.expired_subs[user] = []
-
-                    self.expired_subs[user].append(pusher.subscription_info["endpoint"])
-                    # the subscription no longer exists and should be removed
-                else:
-                    logger.warning(
-                        f"Failed to send notification to {user} :: {resp.headers}"
-                    )
-
-        self.cleanup_registrations()
-
-    def stop(self) -> None:
-        pass

frigate/comms/zmq_proxy.py

@@ -1,99 +0,0 @@
-"""Facilitates communication over zmq proxy."""
-
-import json
-import threading
-from typing import Optional
-
-import zmq
-
-SOCKET_PUB = "ipc:///tmp/cache/proxy_pub"
-SOCKET_SUB = "ipc:///tmp/cache/proxy_sub"
-
-
-class ZmqProxyRunner(threading.Thread):
-    def __init__(self, context: zmq.Context[zmq.Socket]) -> None:
-        threading.Thread.__init__(self)
-        self.name = "detection_proxy"
-        self.context = context
-
-    def run(self) -> None:
-        """Run the proxy."""
-        incoming = self.context.socket(zmq.XSUB)
-        incoming.bind(SOCKET_PUB)
-        outgoing = self.context.socket(zmq.XPUB)
-        outgoing.bind(SOCKET_SUB)
-
-        # Blocking: This will unblock (via exception) when we destroy the context
-        # The incoming and outgoing sockets will be closed automatically
-        # when the context is destroyed as well.
-        try:
-            zmq.proxy(incoming, outgoing)
-        except zmq.ZMQError:
-            pass
-
-
-class ZmqProxy:
-    """Proxies video and audio detections."""
-
-    def __init__(self) -> None:
-        self.context = zmq.Context()
-        self.runner = ZmqProxyRunner(self.context)
-        self.runner.start()
-
-    def stop(self) -> None:
-        # destroying the context will tell the proxy to stop
-        self.context.destroy()
-        self.runner.join()
-
-
-class Publisher:
-    """Publishes messages."""
-
-    topic_base: str = ""
-
-    def __init__(self, topic: str = "") -> None:
-        self.topic = f"{self.topic_base}{topic}"
-        self.context = zmq.Context()
-        self.socket = self.context.socket(zmq.PUB)
-        self.socket.connect(SOCKET_PUB)
-
-    def publish(self, payload: any, sub_topic: str = "") -> None:
-        """Publish message."""
-        self.socket.send_string(f"{self.topic}{sub_topic} {json.dumps(payload)}")
-
-    def stop(self) -> None:
-        self.socket.close()
-        self.context.destroy()
-
-
-class Subscriber:
-    """Receives messages."""
-
-    topic_base: str = ""
-
-    def __init__(self, topic: str = "") -> None:
-        self.topic = f"{self.topic_base}{topic}"
-        self.context = zmq.Context()
-        self.socket = self.context.socket(zmq.SUB)
-        self.socket.setsockopt_string(zmq.SUBSCRIBE, self.topic)
-        self.socket.connect(SOCKET_SUB)
-
-    def check_for_update(self, timeout: float = 1) -> Optional[tuple[str, any]]:
-        """Returns message or None if no update."""
-        try:
-            has_update, _, _ = zmq.select([self.socket], [], [], timeout)
-
-            if has_update:
-                parts = self.socket.recv_string(flags=zmq.NOBLOCK).split(maxsplit=1)
-                return self._return_object(parts[0], json.loads(parts[1]))
-        except zmq.ZMQError:
-            pass
-
-        return self._return_object("", None)
-
-    def stop(self) -> None:
-        self.socket.close()
-        self.context.destroy()
-
-    def _return_object(self, topic: str, payload: any) -> any:
-        return payload

frigate/config.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import json
 import logging
 import os
-import shutil
 from enum import Enum
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple, Union
@@ -26,9 +25,7 @@ from frigate.const import (
     CACHE_DIR,
     CACHE_SEGMENT_FORMAT,
     DEFAULT_DB_PATH,
-    DEFAULT_FFMPEG_VERSION,
     FREQUENCY_STATS_POINTS,
-    INCLUDED_FFMPEG_VERSIONS,
     MAX_PRE_CAPTURE,
     REGEX_CAMERA_NAME,
     YAML_EXT,
@@ -172,14 +169,6 @@ class AuthConfig(FrigateBaseModel):
     hash_iterations: int = Field(default=600000, title="Password hash iterations")
 
 
-class NotificationConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable notifications")
-    email: Optional[str] = Field(default=None, title="Email required for push.")
-    enabled_in_config: Optional[bool] = Field(
-        default=None, title="Keep track of original state of notifications."
-    )
-
-
 class StatsConfig(FrigateBaseModel):
     amd_gpu_stats: bool = Field(default=True, title="Enable AMD GPU stats.")
     intel_gpu_stats: bool = Field(default=True, title="Enable Intel GPU stats.")
@@ -302,14 +291,12 @@ class RetainModeEnum(str, Enum):
     active_objects = "active_objects"
 
 
-class RecordRetainConfig(FrigateBaseModel):
-    days: float = Field(default=0, title="Default retention period.")
-    mode: RetainModeEnum = Field(default=RetainModeEnum.all, title="Retain mode.")
-
-
-class ReviewRetainConfig(FrigateBaseModel):
-    days: float = Field(default=10, title="Default retention period.")
+class RetainConfig(FrigateBaseModel):
+    default: float = Field(default=10, title="Default retention period.")
     mode: RetainModeEnum = Field(default=RetainModeEnum.motion, title="Retain mode.")
+    objects: Dict[str, float] = Field(
+        default_factory=dict, title="Object retention period."
+    )
 
 
 class EventsConfig(FrigateBaseModel):
@@ -317,9 +304,18 @@ class EventsConfig(FrigateBaseModel):
         default=5, title="Seconds to retain before event starts.", le=MAX_PRE_CAPTURE
     )
     post_capture: int = Field(default=5, title="Seconds to retain after event ends.")
-    retain: ReviewRetainConfig = Field(
-        default_factory=ReviewRetainConfig, title="Event retention settings."
+    objects: Optional[List[str]] = Field(
+        None,
+        title="List of objects to be detected in order to save the event.",
     )
+    retain: RetainConfig = Field(
+        default_factory=RetainConfig, title="Event retention settings."
+    )
+
+
+class RecordRetainConfig(FrigateBaseModel):
+    days: float = Field(default=0, title="Default retention period.")
+    mode: RetainModeEnum = Field(default=RetainModeEnum.all, title="Retain mode.")
 
 
 class RecordExportConfig(FrigateBaseModel):
@@ -354,11 +350,8 @@ class RecordConfig(FrigateBaseModel):
     retain: RecordRetainConfig = Field(
         default_factory=RecordRetainConfig, title="Record retention settings."
     )
-    detections: EventsConfig = Field(
-        default_factory=EventsConfig, title="Detection specific retention settings."
-    )
-    alerts: EventsConfig = Field(
-        default_factory=EventsConfig, title="Alert specific retention settings."
+    events: EventsConfig = Field(
+        default_factory=EventsConfig, title="Event specific settings."
     )
     export: RecordExportConfig = Field(
         default_factory=RecordExportConfig, title="Recording Export Config"
@@ -737,44 +730,6 @@ class ReviewConfig(FrigateBaseModel):
     )
 
 
-class SemanticSearchConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable semantic search.")
-    reindex: Optional[bool] = Field(
-        default=False, title="Reindex all detections on startup."
-    )
-
-
-class GenAIProviderEnum(str, Enum):
-    openai = "openai"
-    gemini = "gemini"
-    ollama = "ollama"
-
-
-class GenAIConfig(FrigateBaseModel):
-    enabled: bool = Field(default=False, title="Enable GenAI.")
-    provider: GenAIProviderEnum = Field(
-        default=GenAIProviderEnum.openai, title="GenAI provider."
-    )
-    base_url: Optional[str] = Field(None, title="Provider base url.")
-    api_key: Optional[str] = Field(None, title="Provider API key.")
-    model: str = Field(default="gpt-4o", title="GenAI model.")
-    prompt: str = Field(
-        default="Describe the {label} in the sequence of images with as much detail as possible. Do not describe the background.",
-        title="Default caption prompt.",
-    )
-    object_prompts: Dict[str, str] = Field(default={}, title="Object specific prompts.")
-
-
-# uses BaseModel because some global attributes are not available at the camera level
-class GenAICameraConfig(BaseModel):
-    enabled: bool = Field(default=False, title="Enable GenAI for camera.")
-    prompt: str = Field(
-        default="Describe the {label} in the sequence of images with as much detail as possible. Do not describe the background.",
-        title="Default caption prompt.",
-    )
-    object_prompts: Dict[str, str] = Field(default={}, title="Object specific prompts.")
-
-
 class AudioConfig(FrigateBaseModel):
     enabled: bool = Field(default=False, title="Enable audio events.")
     max_not_heard: int = Field(
@@ -875,7 +830,6 @@ class FfmpegOutputArgsConfig(FrigateBaseModel):
 
 
 class FfmpegConfig(FrigateBaseModel):
-    path: str = Field(default="default", title="FFmpeg path")
     global_args: Union[str, List[str]] = Field(
         default=FFMPEG_GLOBAL_ARGS_DEFAULT, title="Global FFmpeg arguments."
     )
@@ -894,30 +848,6 @@ class FfmpegConfig(FrigateBaseModel):
         title="Time in seconds to wait before FFmpeg retries connecting to the camera.",
     )
 
-    @property
-    def ffmpeg_path(self) -> str:
-        if self.path == "default":
-            if shutil.which("ffmpeg") is None:
-                return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg"
-            else:
-                return "ffmpeg"
-        elif self.path in INCLUDED_FFMPEG_VERSIONS:
-            return f"/usr/lib/ffmpeg/{self.path}/bin/ffmpeg"
-        else:
-            return f"{self.path}/bin/ffmpeg"
-
-    @property
-    def ffprobe_path(self) -> str:
-        if self.path == "default":
-            if shutil.which("ffprobe") is None:
-                return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffprobe"
-            else:
-                return "ffprobe"
-        elif self.path in INCLUDED_FFMPEG_VERSIONS:
-            return f"/usr/lib/ffmpeg/{self.path}/bin/ffprobe"
-        else:
-            return f"{self.path}/bin/ffprobe"
-
 
 class CameraRoleEnum(str, Enum):
     audio = "audio"
@@ -957,14 +887,6 @@ class CameraFfmpegConfig(FfmpegConfig):
         return v
 
 
-class RetainConfig(FrigateBaseModel):
-    default: float = Field(default=10, title="Default retention period.")
-    mode: RetainModeEnum = Field(default=RetainModeEnum.motion, title="Retain mode.")
-    objects: Dict[str, float] = Field(
-        default_factory=dict, title="Object retention period."
-    )
-
-
 class SnapshotsConfig(FrigateBaseModel):
     enabled: bool = Field(default=False, title="Snapshots enabled.")
     clean_copy: bool = Field(
@@ -1089,9 +1011,6 @@ class CameraConfig(FrigateBaseModel):
     review: ReviewConfig = Field(
         default_factory=ReviewConfig, title="Review configuration."
     )
-    genai: GenAICameraConfig = Field(
-        default_factory=GenAICameraConfig, title="Generative AI configuration."
-    )
     audio: AudioConfig = Field(
         default_factory=AudioConfig, title="Audio events configuration."
     )
@@ -1192,7 +1111,7 @@ class CameraConfig(FrigateBaseModel):
                 + ffmpeg_output_args
             )
 
-        # if there aren't any outputs enabled for this input
+        # if there arent any outputs enabled for this input
         if len(ffmpeg_output_args) == 0:
             return None
 
@@ -1228,9 +1147,9 @@ class CameraConfig(FrigateBaseModel):
         )
 
         cmd = (
-            [self.ffmpeg.ffmpeg_path]
+            ["ffmpeg"]
             + global_args
-            + (hwaccel_args if "detect" in ffmpeg_input.roles else [])
+            + hwaccel_args
             + input_args
             + ["-i", escape_special_characters(ffmpeg_input.path)]
             + ffmpeg_output_args
@@ -1319,19 +1238,10 @@ def verify_recording_retention(camera_config: CameraConfig) -> None:
     if (
         camera_config.record.retain.days != 0
         and rank_map[camera_config.record.retain.mode]
-        > rank_map[camera_config.record.alerts.retain.mode]
+        > rank_map[camera_config.record.events.retain.mode]
     ):
         logger.warning(
-            f"{camera_config.name}: Recording retention is configured for {camera_config.record.retain.mode} and alert retention is configured for {camera_config.record.alerts.retain.mode}. The more restrictive retention policy will be applied."
-        )
-
-    if (
-        camera_config.record.retain.days != 0
-        and rank_map[camera_config.record.retain.mode]
-        > rank_map[camera_config.record.detections.retain.mode]
-    ):
-        logger.warning(
-            f"{camera_config.name}: Recording retention is configured for {camera_config.record.retain.mode} and detection retention is configured for {camera_config.record.detections.retain.mode}. The more restrictive retention policy will be applied."
+            f"{camera_config.name}: Recording retention is configured for {camera_config.record.retain.mode} and event retention is configured for {camera_config.record.events.retain.mode}. The more restrictive retention policy will be applied."
         )
 
 
@@ -1416,9 +1326,6 @@ class FrigateConfig(FrigateBaseModel):
         default_factory=dict, title="Frigate environment variables."
     )
     ui: UIConfig = Field(default_factory=UIConfig, title="UI configuration.")
-    notifications: NotificationConfig = Field(
-        default_factory=NotificationConfig, title="Notification Config"
-    )
     telemetry: TelemetryConfig = Field(
         default_factory=TelemetryConfig, title="Telemetry configuration."
     )
@@ -1456,12 +1363,6 @@ class FrigateConfig(FrigateBaseModel):
     review: ReviewConfig = Field(
         default_factory=ReviewConfig, title="Review configuration."
     )
-    semantic_search: SemanticSearchConfig = Field(
-        default_factory=SemanticSearchConfig, title="Semantic search configuration."
-    )
-    genai: GenAIConfig = Field(
-        default_factory=GenAIConfig, title="Generative AI configuration."
-    )
     audio: AudioConfig = Field(
         default_factory=AudioConfig, title="Global Audio events configuration."
     )
@@ -1479,7 +1380,7 @@ class FrigateConfig(FrigateBaseModel):
         default_factory=TimestampStyleConfig,
         title="Global timestamp style configuration.",
     )
-    version: Optional[str] = Field(default=None, title="Current config version.")
+    version: Optional[float] = Field(default=None, title="Current config version.")
 
     def runtime_config(self, plus_api: PlusApi = None) -> FrigateConfig:
         """Merge camera config with globals."""
@@ -1496,13 +1397,6 @@ class FrigateConfig(FrigateBaseModel):
             config.mqtt.user = config.mqtt.user.format(**FRIGATE_ENV_VARS)
             config.mqtt.password = config.mqtt.password.format(**FRIGATE_ENV_VARS)
 
-        # set notifications state
-        config.notifications.enabled_in_config = config.notifications.enabled
-
-        # GenAI substitution
-        if config.genai.api_key:
-            config.genai.api_key = config.genai.api_key.format(**FRIGATE_ENV_VARS)
-
         # set default min_score for object attributes
         for attribute in ALL_ATTRIBUTE_LABELS:
             if not config.objects.filters.get(attribute):
@@ -1524,7 +1418,6 @@ class FrigateConfig(FrigateBaseModel):
                 "live": ...,
                 "objects": ...,
                 "review": ...,
-                "genai": ...,
                 "motion": ...,
                 "detect": ...,
                 "ffmpeg": ...,
@@ -1554,9 +1447,7 @@ class FrigateConfig(FrigateBaseModel):
                 if need_detect_dimensions or need_record_fourcc:
                     stream_info = {"width": 0, "height": 0, "fourcc": None}
                     try:
-                        stream_info = stream_info_retriever.get_stream_info(
-                            config.ffmpeg, input.path
-                        )
+                        stream_info = stream_info_retriever.get_stream_info(input.path)
                     except Exception:
                         logger.warn(
                             f"Error detecting stream parameters automatically for {input.path} Applying default values."

frigate/const.py

@@ -12,7 +12,7 @@ FRIGATE_LOCALHOST = "http://127.0.0.1:5000"
 PLUS_ENV_VAR = "PLUS_API_KEY"
 PLUS_API_HOST = "https://api.frigate.video"
 
-# Attribute & Object constants
+# Attribute & Object Consts
 
 ATTRIBUTE_LABEL_MAP = {
     "person": ["face", "amazon"],
@@ -31,7 +31,7 @@ LABEL_NMS_MAP = {
 }
 LABEL_NMS_DEFAULT = 0.4
 
-# Audio constants
+# Audio Consts
 
 AUDIO_DURATION = 0.975
 AUDIO_FORMAT = "s16le"
@@ -39,19 +39,16 @@ AUDIO_MAX_BIT_RANGE = 32768.0
 AUDIO_SAMPLE_RATE = 16000
 AUDIO_MIN_CONFIDENCE = 0.5
 
-# DB constants
+# DB Consts
 
 MAX_WAL_SIZE = 10  # MB
 
-# Ffmpeg constants
+# Ffmpeg Presets
 
-DEFAULT_FFMPEG_VERSION = "7.0"
-INCLUDED_FFMPEG_VERSIONS = ["7.0", "5.0"]
 FFMPEG_HWACCEL_NVIDIA = "preset-nvidia"
 FFMPEG_HWACCEL_VAAPI = "preset-vaapi"
-FFMPEG_HWACCEL_VULKAN = "preset-vulkan"
 
-# Regex constants
+# Regex Consts
 
 REGEX_CAMERA_NAME = r"^[a-zA-Z0-9_-]+$"
 REGEX_RTSP_CAMERA_USER_PASS = r":\/\/[a-zA-Z0-9_-]+:[\S]+@"
@@ -84,7 +81,6 @@ REQUEST_REGION_GRID = "request_region_grid"
 UPSERT_REVIEW_SEGMENT = "upsert_review_segment"
 CLEAR_ONGOING_REVIEW_SEGMENTS = "clear_ongoing_review_segments"
 UPDATE_CAMERA_ACTIVITY = "update_camera_activity"
-UPDATE_EVENT_DESCRIPTION = "update_event_description"
 
 # Stats Values
 

frigate/detectors/plugins/hailo8l.py

@@ -1,285 +0,0 @@
-import logging
-import os
-import urllib.request
-
-import numpy as np
-
-try:
-    from hailo_platform import (
-        HEF,
-        ConfigureParams,
-        FormatType,
-        HailoRTException,
-        HailoStreamInterface,
-        InferVStreams,
-        InputVStreamParams,
-        OutputVStreamParams,
-        VDevice,
-    )
-except ModuleNotFoundError:
-    pass
-
-from pydantic import BaseModel, Field
-from typing_extensions import Literal
-
-from frigate.detectors.detection_api import DetectionApi
-from frigate.detectors.detector_config import BaseDetectorConfig
-
-# Set up logging
-logger = logging.getLogger(__name__)
-
-# Define the detector key for Hailo
-DETECTOR_KEY = "hailo8l"
-
-
-# Configuration class for model settings
-class ModelConfig(BaseModel):
-    path: str = Field(default=None, title="Model Path")  # Path to the HEF file
-
-
-# Configuration class for Hailo detector
-class HailoDetectorConfig(BaseDetectorConfig):
-    type: Literal[DETECTOR_KEY]  # Type of the detector
-    device: str = Field(default="PCIe", title="Device Type")  # Device type (e.g., PCIe)
-
-
-# Hailo detector class implementation
-class HailoDetector(DetectionApi):
-    type_key = DETECTOR_KEY  # Set the type key to the Hailo detector key
-
-    def __init__(self, detector_config: HailoDetectorConfig):
-        # Initialize device type and model path from the configuration
-        self.h8l_device_type = detector_config.device
-        self.h8l_model_path = detector_config.model.path
-        self.h8l_model_height = detector_config.model.height
-        self.h8l_model_width = detector_config.model.width
-        self.h8l_model_type = detector_config.model.model_type
-        self.h8l_tensor_format = detector_config.model.input_tensor
-        self.h8l_pixel_format = detector_config.model.input_pixel_format
-        self.model_url = "https://hailo-model-zoo.s3.eu-west-2.amazonaws.com/ModelZoo/Compiled/v2.11.0/hailo8l/ssd_mobilenet_v1.hef"
-        self.cache_dir = "/config/model_cache/h8l_cache"
-        self.expected_model_filename = "ssd_mobilenet_v1.hef"
-        output_type = "FLOAT32"
-
-        logger.info(f"Initializing Hailo device as {self.h8l_device_type}")
-        self.check_and_prepare_model()
-        try:
-            # Validate device type
-            if self.h8l_device_type not in ["PCIe", "M.2"]:
-                raise ValueError(f"Unsupported device type: {self.h8l_device_type}")
-
-            # Initialize the Hailo device
-            self.target = VDevice()
-            # Load the HEF (Hailo's binary format for neural networks)
-            self.hef = HEF(self.h8l_model_path)
-            # Create configuration parameters from the HEF
-            self.configure_params = ConfigureParams.create_from_hef(
-                hef=self.hef, interface=HailoStreamInterface.PCIe
-            )
-            # Configure the device with the HEF
-            self.network_groups = self.target.configure(self.hef, self.configure_params)
-            self.network_group = self.network_groups[0]
-            self.network_group_params = self.network_group.create_params()
-
-            # Create input and output virtual stream parameters
-            self.input_vstream_params = InputVStreamParams.make(
-                self.network_group,
-                format_type=self.hef.get_input_vstream_infos()[0].format.type,
-            )
-            self.output_vstream_params = OutputVStreamParams.make(
-                self.network_group, format_type=getattr(FormatType, output_type)
-            )
-
-            # Get input and output stream information from the HEF
-            self.input_vstream_info = self.hef.get_input_vstream_infos()
-            self.output_vstream_info = self.hef.get_output_vstream_infos()
-
-            logger.info("Hailo device initialized successfully")
-            logger.debug(f"[__init__] Model Path: {self.h8l_model_path}")
-            logger.debug(f"[__init__] Input Tensor Format: {self.h8l_tensor_format}")
-            logger.debug(f"[__init__] Input Pixel Format: {self.h8l_pixel_format}")
-            logger.debug(f"[__init__] Input VStream Info: {self.input_vstream_info[0]}")
-            logger.debug(
-                f"[__init__] Output VStream Info: {self.output_vstream_info[0]}"
-            )
-        except HailoRTException as e:
-            logger.error(f"HailoRTException during initialization: {e}")
-            raise
-        except Exception as e:
-            logger.error(f"Failed to initialize Hailo device: {e}")
-            raise
-
-    def check_and_prepare_model(self):
-        # Ensure cache directory exists
-        if not os.path.exists(self.cache_dir):
-            os.makedirs(self.cache_dir)
-
-        # Check for the expected model file
-        model_file_path = os.path.join(self.cache_dir, self.expected_model_filename)
-        if not os.path.isfile(model_file_path):
-            logger.info(
-                f"A model file was not found at {model_file_path}, Downloading one from {self.model_url}."
-            )
-            urllib.request.urlretrieve(self.model_url, model_file_path)
-            logger.info(f"A model file was downloaded to {model_file_path}.")
-        else:
-            logger.info(
-                f"A model file already exists at {model_file_path} not downloading one."
-            )
-
-    def detect_raw(self, tensor_input):
-        logger.debug("[detect_raw] Entering function")
-        logger.debug(
-            f"[detect_raw] The `tensor_input` = {tensor_input} tensor_input shape = {tensor_input.shape}"
-        )
-
-        if tensor_input is None:
-            raise ValueError(
-                "[detect_raw] The 'tensor_input' argument must be provided"
-            )
-
-        # Ensure tensor_input is a numpy array
-        if isinstance(tensor_input, list):
-            tensor_input = np.array(tensor_input)
-            logger.debug(
-                f"[detect_raw] Converted tensor_input to numpy array: shape {tensor_input.shape}"
-            )
-
-        input_data = tensor_input
-        logger.debug(
-            f"[detect_raw] Input data for inference shape: {tensor_input.shape}, dtype: {tensor_input.dtype}"
-        )
-
-        try:
-            with InferVStreams(
-                self.network_group,
-                self.input_vstream_params,
-                self.output_vstream_params,
-            ) as infer_pipeline:
-                input_dict = {}
-                if isinstance(input_data, dict):
-                    input_dict = input_data
-                    logger.debug("[detect_raw] it a dictionary.")
-                elif isinstance(input_data, (list, tuple)):
-                    for idx, layer_info in enumerate(self.input_vstream_info):
-                        input_dict[layer_info.name] = input_data[idx]
-                        logger.debug("[detect_raw] converted from list/tuple.")
-                else:
-                    if len(input_data.shape) == 3:
-                        input_data = np.expand_dims(input_data, axis=0)
-                        logger.debug("[detect_raw] converted from an array.")
-                    input_dict[self.input_vstream_info[0].name] = input_data
-
-                logger.debug(
-                    f"[detect_raw] Input dictionary for inference keys: {input_dict.keys()}"
-                )
-
-                with self.network_group.activate(self.network_group_params):
-                    raw_output = infer_pipeline.infer(input_dict)
-                    logger.debug(f"[detect_raw] Raw inference output: {raw_output}")
-
-                    if self.output_vstream_info[0].name not in raw_output:
-                        logger.error(
-                            f"[detect_raw] Missing output stream {self.output_vstream_info[0].name} in inference results"
-                        )
-                        return np.zeros((20, 6), np.float32)
-
-                    raw_output = raw_output[self.output_vstream_info[0].name][0]
-                    logger.debug(
-                        f"[detect_raw] Raw output for stream {self.output_vstream_info[0].name}: {raw_output}"
-                    )
-
-            # Process the raw output
-            detections = self.process_detections(raw_output)
-            if len(detections) == 0:
-                logger.debug(
-                    "[detect_raw] No detections found after processing. Setting default values."
-                )
-                return np.zeros((20, 6), np.float32)
-            else:
-                formatted_detections = detections
-                if (
-                    formatted_detections.shape[1] != 6
-                ):  # Ensure the formatted detections have 6 columns
-                    logger.error(
-                        f"[detect_raw] Unexpected shape for formatted detections: {formatted_detections.shape}. Expected (20, 6)."
-                    )
-                    return np.zeros((20, 6), np.float32)
-                return formatted_detections
-        except HailoRTException as e:
-            logger.error(f"[detect_raw] HailoRTException during inference: {e}")
-            return np.zeros((20, 6), np.float32)
-        except Exception as e:
-            logger.error(f"[detect_raw] Exception during inference: {e}")
-            return np.zeros((20, 6), np.float32)
-        finally:
-            logger.debug("[detect_raw] Exiting function")
-
-    def process_detections(self, raw_detections, threshold=0.5):
-        boxes, scores, classes = [], [], []
-        num_detections = 0
-
-        logger.debug(f"[process_detections] Raw detections: {raw_detections}")
-
-        for i, detection_set in enumerate(raw_detections):
-            if not isinstance(detection_set, np.ndarray) or detection_set.size == 0:
-                logger.debug(
-                    f"[process_detections] Detection set {i} is empty or not an array, skipping."
-                )
-                continue
-
-            logger.debug(
-                f"[process_detections] Detection set {i} shape: {detection_set.shape}"
-            )
-
-            for detection in detection_set:
-                if detection.shape[0] == 0:
-                    logger.debug(
-                        f"[process_detections] Detection in set {i} is empty, skipping."
-                    )
-                    continue
-
-                ymin, xmin, ymax, xmax = detection[:4]
-                score = np.clip(detection[4], 0, 1)  # Use np.clip for clarity
-
-                if score < threshold:
-                    logger.debug(
-                        f"[process_detections] Detection in set {i} has a score {score} below threshold {threshold}. Skipping."
-                    )
-                    continue
-
-                logger.debug(
-                    f"[process_detections] Adding detection with coordinates: ({xmin}, {ymin}), ({xmax}, {ymax}) and score: {score}"
-                )
-                boxes.append([ymin, xmin, ymax, xmax])
-                scores.append(score)
-                classes.append(i)
-                num_detections += 1
-
-        logger.debug(
-            f"[process_detections] Boxes: {boxes}, Scores: {scores}, Classes: {classes}, Num detections: {num_detections}"
-        )
-
-        if num_detections == 0:
-            logger.debug("[process_detections] No valid detections found.")
-            return np.zeros((20, 6), np.float32)
-
-        combined = np.hstack(
-            (
-                np.array(classes)[:, np.newaxis],
-                np.array(scores)[:, np.newaxis],
-                np.array(boxes),
-            )
-        )
-
-        if combined.shape[0] < 20:
-            padding = np.zeros(
-                (20 - combined.shape[0], combined.shape[1]), dtype=combined.dtype
-            )
-            combined = np.vstack((combined, padding))
-
-        logger.debug(
-            f"[process_detections] Combined detections (padded to 20 if necessary): {np.array_str(combined, precision=4, suppress_small=True)}"
-        )
-
-        return combined[:20, :6]

frigate/detectors/plugins/onnx.py

@@ -1,15 +1,11 @@
 import logging
-import os
 
 import numpy as np
-from pydantic import Field
 from typing_extensions import Literal
 
 from frigate.detectors.detection_api import DetectionApi
-from frigate.detectors.detector_config import (
-    BaseDetectorConfig,
-    ModelTypeEnum,
-)
+from frigate.detectors.detector_config import BaseDetectorConfig
+from frigate.detectors.util import preprocess
 
 logger = logging.getLogger(__name__)
 
@@ -18,7 +14,6 @@ DETECTOR_KEY = "onnx"
 
 class ONNXDetectorConfig(BaseDetectorConfig):
     type: Literal[DETECTOR_KEY]
-    device: str = Field(default="AUTO", title="Device Type")
 
 
 class ONNXDetector(DetectionApi):
@@ -26,7 +21,7 @@ class ONNXDetector(DetectionApi):
 
     def __init__(self, detector_config: ONNXDetectorConfig):
         try:
-            import onnxruntime as ort
+            import onnxruntime
 
             logger.info("ONNX: loaded onnxruntime module")
         except ModuleNotFoundError:
@@ -37,79 +32,16 @@ class ONNXDetector(DetectionApi):
 
         path = detector_config.model.path
         logger.info(f"ONNX: loading {detector_config.model.path}")
-
-        providers = (
-            ["CPUExecutionProvider"]
-            if detector_config.device == "CPU"
-            else ort.get_available_providers()
-        )
-        options = []
-
-        for provider in providers:
-            if provider == "TensorrtExecutionProvider":
-                os.makedirs(
-                    "/config/model_cache/tensorrt/ort/trt-engines", exist_ok=True
-                )
-                options.append(
-                    {
-                        "trt_timing_cache_enable": True,
-                        "trt_timing_cache_path": "/config/model_cache/tensorrt/ort",
-                        "trt_engine_cache_enable": True,
-                        "trt_dump_ep_context_model": True,
-                        "trt_engine_cache_path": "/config/model_cache/tensorrt/ort/trt-engines",
-                        "trt_ep_context_file_path": "/config/model_cache/tensorrt/ort",
-                    }
-                )
-            elif provider == "OpenVINOExecutionProvider":
-                os.makedirs("/config/model_cache/openvino/ort", exist_ok=True)
-                options.append(
-                    {
-                        "cache_dir": "/config/model_cache/openvino/ort",
-                        "device_type": detector_config.device,
-                    }
-                )
-            else:
-                options.append({})
-
-        self.model = ort.InferenceSession(
-            path, providers=providers, provider_options=options
-        )
-
-        self.h = detector_config.model.height
-        self.w = detector_config.model.width
-        self.onnx_model_type = detector_config.model.model_type
-        self.onnx_model_px = detector_config.model.input_pixel_format
-        self.onnx_model_shape = detector_config.model.input_tensor
-        path = detector_config.model.path
-
+        self.model = onnxruntime.InferenceSession(path)
         logger.info(f"ONNX: {path} loaded")
 
     def detect_raw(self, tensor_input):
         model_input_name = self.model.get_inputs()[0].name
-        tensor_output = self.model.run(None, {model_input_name: tensor_input})
+        model_input_shape = self.model.get_inputs()[0].shape
+        tensor_input = preprocess(tensor_input, model_input_shape, np.float32)
+        # ruff: noqa: F841
+        tensor_output = self.model.run(None, {model_input_name: tensor_input})[0]
 
-        if self.onnx_model_type == ModelTypeEnum.yolonas:
-            predictions = tensor_output[0]
-
-            detections = np.zeros((20, 6), np.float32)
-
-            for i, prediction in enumerate(predictions):
-                if i == 20:
-                    break
-                (_, x_min, y_min, x_max, y_max, confidence, class_id) = prediction
-                # when running in GPU mode, empty predictions in the output have class_id of -1
-                if class_id < 0:
-                    break
-                detections[i] = [
-                    class_id,
-                    confidence,
-                    y_min / self.h,
-                    x_min / self.w,
-                    y_max / self.h,
-                    x_max / self.w,
-                ]
-            return detections
-        else:
         raise Exception(
-                f"{self.onnx_model_type} is currently not supported for rocm. See the docs for more info on supported models."
+            "No models are currently supported via onnx. See the docs for more info."
         )