update supported labels (#19159)

* Set ulimit with python instead of in s6 startup

* move to services and add env var

* add comment

Makefile

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

docs/docs/frigate/hardware.md

@@ -13,7 +13,7 @@ WiFi cameras are not recommended as [their streams are less reliable and cause c
 
 Many users have reported various issues with 4K-plus Reolink cameras, it is best to stick with 5MP and lower for Reolink cameras. If you are using Reolink, I suggest the [Reolink specific configuration](../configuration/camera_specific.md#reolink-cameras).
 
-Here are some of the camera's I recommend:
+Here are some of the cameras I recommend:
 
 - <a href="https://amzn.to/4fwoNWA" target="_blank" rel="nofollow noopener sponsored">Loryta(Dahua) IPC-T549M-ALED-S3</a> (affiliate link)
 - <a href="https://amzn.to/3YXpcMw" target="_blank" rel="nofollow noopener sponsored">Loryta(Dahua) IPC-T54IR-AS</a> (affiliate link)

docs/docs/plus/index.md

@@ -53,9 +53,9 @@ Some users may find that Frigate+ models result in more false positives initiall
 Frigate+ models support a more relevant set of objects for security cameras. The labels for annotation in Frigate+ are configurable by editing the camera in the Cameras section of Frigate+. Currently, the following objects are supported:
 
 - **People**: `person`, `face`
-- **Vehicles**: `car`, `motorcycle`, `bicycle`, `boat`, `license_plate`
-- **Delivery Logos**: `amazon`, `usps`, `ups`, `fedex`, `dhl`, `an_post`, `purolator`, `postnl`, `nzpost`, `postnord`, `gls`, `dpd`
-- **Animals**: `dog`, `cat`, `deer`, `horse`, `bird`, `raccoon`, `fox`, `bear`, `cow`, `squirrel`, `goat`, `rabbit`
+- **Vehicles**: `car`, `motorcycle`, `bicycle`, `boat`, `school_bus`, `license_plate`
+- **Delivery Logos**: `amazon`, `usps`, `ups`, `fedex`, `dhl`, `an_post`, `purolator`, `postnl`, `nzpost`, `postnord`, `gls`, `dpd`, `canada_post`, `royal_mail`
+- **Animals**: `dog`, `cat`, `deer`, `horse`, `bird`, `raccoon`, `fox`, `bear`, `cow`, `squirrel`, `goat`, `rabbit`, `skunk`, `kangaroo`
 - **Other**: `package`, `waste_bin`, `bbq_grill`, `robot_lawnmower`, `umbrella`
 
 Other object types available in the default Frigate model are not available. Additional object types will be added in future releases.
@@ -66,7 +66,7 @@ Candidate labels are also available for annotation. These labels don't have enou
 
 Where possible, these labels are mapped to existing labels during training. For example, any `baby` labels are mapped to `person` until support for new labels is added.
 
-The candidate labels are: `baby`, `royal mail`, `canada post`, `bpost`, `skunk`, `badger`, `possum`, `rodent`, `kangaroo`, `chicken`, `groundhog`, `boar`, `hedgehog`, `school bus`, `tractor`, `golf cart`, `garbage truck`, `bus`, `sports ball`
+The candidate labels are: `baby`, `bpost`, `badger`, `possum`, `rodent`, `chicken`, `groundhog`, `boar`, `hedgehog`, `tractor`, `golf cart`, `garbage truck`, `bus`, `sports ball`
 
 Candidate labels are not available for automatic suggestions.
 

docs/docs/troubleshooting/edgetpu.md

@@ -40,6 +40,17 @@ Some users have reported that this older device runs an older kernel causing iss
 6. Open the control panel - info scree. The coral TPU will now be recognised as a USB Device - google inc
 7. Start the frigate container. Everything should work now!
 
+### QNAP NAS
+
+QNAP NAS devices, such as the TS-253A, may use connected Coral TPU devices if [QuMagie](https://www.qnap.com/en/software/qumagie) is installed along with its QNAP AI Core extension. If any of the features—`facial recognition`, `object recognition`, or `similar photo recognition`—are enabled, Container Station applications such as `Frigate` or `CodeProject.AI Server` will be unable to initialize the TPU device in use.
+To allow the Coral TPU device to be discovered, the you must either:
+
+1. [Disable the AI recognition features in QuMagie](https://docs.qnap.com/application/qumagie/2.x/en-us/configuring-qnap-ai-core-settings-FB13CE03.html),
+2. Remove the QNAP AI Core extension or
+3. Manually start the QNAP AI Core extension after Frigate has fully started (not recommended).
+
+It is also recommended to restart the NAS once the changes have been made.
+
 ## USB Coral Detection Appears to be Stuck
 
 The USB Coral can become stuck and need to be restarted, this can happen for a number of reasons depending on hardware and software setup. Some common reasons are:

frigate/app.py

@@ -71,6 +71,7 @@ from frigate.timeline import TimelineProcessor
 from frigate.util.builtin import empty_and_close_queue
 from frigate.util.image import SharedMemoryFrameManager, UntrackedSharedMemory
 from frigate.util.object import get_camera_regions_grid
+from frigate.util.services import set_file_limit
 from frigate.version import VERSION
 from frigate.video import capture_camera, track_camera
 from frigate.watchdog import FrigateWatchdog
@@ -587,6 +588,9 @@ class FrigateApp:
         # Ensure global state.
         self.ensure_dirs()
 
+        # Set soft file limits.
+        set_file_limit()
+
         # Start frigate services.
         self.init_camera_metrics()
         self.init_queues()

frigate/util/services.py

@@ -5,6 +5,7 @@ import json
 import logging
 import os
 import re
+import resource
 import signal
 import subprocess as sp
 import traceback
@@ -632,3 +633,19 @@ async def get_video_properties(
         result["fourcc"] = fourcc
 
     return result
+
+
+def set_file_limit() -> None:
+    # Newer versions of containerd 2.X+ impose a very low soft file limit of 1024
+    # This applies to OSs like HA OS (see https://github.com/home-assistant/operating-system/issues/4110)
+    # Attempt to increase this limit
+    soft_limit = int(os.getenv("SOFT_FILE_LIMIT", "65536") or "65536")
+
+    current_soft, current_hard = resource.getrlimit(resource.RLIMIT_NOFILE)
+    logger.info(f"Current file limits - Soft: {current_soft}, Hard: {current_hard}")
+
+    new_soft = min(soft_limit, current_hard)
+    resource.setrlimit(resource.RLIMIT_NOFILE, (new_soft, current_hard))
+    logger.info(
+        f"File limit set. New soft limit: {new_soft}, Hard limit remains: {current_hard}"
+    )