Update pydantic requirement from ==2.8.* to ==2.10.* in /docker/main

Updates the requirements on [pydantic](https://github.com/pydantic/pydantic) to permit the latest version.
- [Release notes](https://github.com/pydantic/pydantic/releases)
- [Changelog](https://github.com/pydantic/pydantic/blob/main/HISTORY.md)
- [Commits](https://github.com/pydantic/pydantic/compare/v2.8.0b1...v2.10.0)

---
updated-dependencies:
- dependency-name: pydantic
  dependency-type: direct:production
...

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

docker/hailo8l/install_hailort.sh

@@ -10,8 +10,10 @@ elif [[ "${TARGETARCH}" == "arm64" ]]; then
     arch="aarch64"
 fi
 
+mkdir -p /rootfs
+
 wget -qO- "https://github.com/frigate-nvr/hailort/releases/download/v${hailo_version}/hailort-${TARGETARCH}.tar.gz" |
-    tar -C / -xzf -
+    tar -C /rootfs/ -xzf -
 
 mkdir -p /hailo-wheels
 

docker/main/requirements-wheels.txt

@@ -19,7 +19,7 @@ pandas == 2.2.*
 peewee == 3.17.*
 peewee_migrate == 1.13.*
 psutil == 6.1.*
-pydantic == 2.8.*
+pydantic == 2.10.*
 git+https://github.com/fbcotter/py3nvml#egg=py3nvml
 pytz == 2024.*
 pyzmq == 26.2.*

docs/docs/configuration/hardware_acceleration.md

@@ -231,11 +231,28 @@ docker run -d \
 
 ### Setup Decoder
 
-Using `preset-nvidia` ffmpeg will automatically select the necessary profile for the incoming video, and will log an error if the profile is not supported by your GPU.
+The decoder you need to pass in the `hwaccel_args` will depend on the input video.
+
+A list of supported codecs (you can use `ffmpeg -decoders | grep cuvid` in the container to get the ones your card supports)
+
+```
+ V..... h263_cuvid           Nvidia CUVID H263 decoder (codec h263)
+ V..... h264_cuvid           Nvidia CUVID H264 decoder (codec h264)
+ V..... hevc_cuvid           Nvidia CUVID HEVC decoder (codec hevc)
+ V..... mjpeg_cuvid          Nvidia CUVID MJPEG decoder (codec mjpeg)
+ V..... mpeg1_cuvid          Nvidia CUVID MPEG1VIDEO decoder (codec mpeg1video)
+ V..... mpeg2_cuvid          Nvidia CUVID MPEG2VIDEO decoder (codec mpeg2video)
+ V..... mpeg4_cuvid          Nvidia CUVID MPEG4 decoder (codec mpeg4)
+ V..... vc1_cuvid            Nvidia CUVID VC1 decoder (codec vc1)
+ V..... vp8_cuvid            Nvidia CUVID VP8 decoder (codec vp8)
+ V..... vp9_cuvid            Nvidia CUVID VP9 decoder (codec vp9)
+```
+
+For example, for H264 video, you'll select `preset-nvidia-h264`.
 
 ```yaml
 ffmpeg:
-  hwaccel_args: preset-nvidia
+  hwaccel_args: preset-nvidia-h264
 ```
 
 If everything is working correctly, you should see a significant improvement in performance.

docs/docs/configuration/restream.md

@@ -132,28 +132,6 @@ cameras:
             - detect
 ```
 
-## Handling Complex Passwords
-
-go2rtc expects URL-encoded passwords in the config, [urlencoder.org](https://urlencoder.org) can be used for this purpose. 
-
-For example:
-
-```yaml
-go2rtc:
-  streams:
-    my_camera: rtsp://username:$@foo%@192.168.1.100
-```
-
-becomes
-
-```yaml
-go2rtc:
-  streams:
-    my_camera: rtsp://username:$%40foo%25@192.168.1.100
-```
-
-See [this comment(https://github.com/AlexxIT/go2rtc/issues/1217#issuecomment-2242296489) for more information.
-
 ## Advanced Restream Configurations
 
 The [exec](https://github.com/AlexxIT/go2rtc/tree/v1.9.2#source-exec) source in go2rtc can be used for custom ffmpeg commands. An example is below:

docs/docs/frigate/installation.md

@@ -193,7 +193,6 @@ services:
     container_name: frigate
     privileged: true # this may not be necessary for all setups
     restart: unless-stopped
-    stop_grace_period: 30s # allow enough time to shut down the various services
     image: ghcr.io/blakeblackshear/frigate:stable
     shm_size: "512mb" # update for your cameras based on calculation above
     devices:
@@ -225,7 +224,6 @@ If you can't use docker compose, you can run the container with something simila
 docker run -d \
   --name frigate \
   --restart=unless-stopped \
-  --stop-timeout 30 \
   --mount type=tmpfs,target=/tmp/cache,tmpfs-size=1000000000 \
   --device /dev/bus/usb:/dev/bus/usb \
   --device /dev/dri/renderD128 \

docs/docs/guides/getting_started.md

@@ -115,7 +115,6 @@ services:
   frigate:
     container_name: frigate
     restart: unless-stopped
-    stop_grace_period: 30s
     image: ghcr.io/blakeblackshear/frigate:stable
     volumes:
       - ./config:/config

frigate/api/app.py

@@ -17,8 +17,8 @@ from fastapi.responses import JSONResponse, PlainTextResponse
 from markupsafe import escape
 from peewee import operator
 
-from frigate.api.defs.query.app_query_parameters import AppTimelineHourlyQueryParameters
-from frigate.api.defs.request.app_body import AppConfigSetBody
+from frigate.api.defs.app_body import AppConfigSetBody
+from frigate.api.defs.app_query_parameters import AppTimelineHourlyQueryParameters
 from frigate.api.defs.tags import Tags
 from frigate.config import FrigateConfig
 from frigate.const import CONFIG_DIR

frigate/api/auth.py

@@ -18,7 +18,7 @@ from joserfc import jwt
 from peewee import DoesNotExist
 from slowapi import Limiter
 
-from frigate.api.defs.request.app_body import (
+from frigate.api.defs.app_body import (
     AppPostLoginBody,
     AppPostUsersBody,
     AppPutPasswordBody,
@@ -85,12 +85,7 @@ def get_remote_addr(request: Request):
             return str(ip)
 
     # if there wasn't anything in the route, just return the default
-    remote_addr = None
-
-    if hasattr(request, "remote_addr"):
-        remote_addr = request.remote_addr
-
-    return remote_addr or "127.0.0.1"
+    return request.remote_addr or "127.0.0.1"
 
 
 def get_jwt_secret() -> str:
@@ -329,7 +324,7 @@ def login(request: Request, body: AppPostLoginBody):
     try:
         db_user: User = User.get_by_id(user)
     except DoesNotExist:
-        return JSONResponse(content={"message": "Login failed"}, status_code=401)
+        return JSONResponse(content={"message": "Login failed"}, status_code=400)
 
     password_hash = db_user.password_hash
     if verify_password(password, password_hash):
@@ -340,7 +335,7 @@ def login(request: Request, body: AppPostLoginBody):
             response, JWT_COOKIE_NAME, encoded_jwt, expiration, JWT_COOKIE_SECURE
         )
         return response
-    return JSONResponse(content={"message": "Login failed"}, status_code=401)
+    return JSONResponse(content={"message": "Login failed"}, status_code=400)
 
 
 @router.get("/users")

frigate/api/defs/events_body.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Union
+from typing import Optional, Union
 
 from pydantic import BaseModel, Field
 
@@ -17,18 +17,14 @@ class EventsDescriptionBody(BaseModel):
 class EventsCreateBody(BaseModel):
     source_type: Optional[str] = "api"
     sub_label: Optional[str] = None
-    score: Optional[float] = 0
+    score: Optional[int] = 0
     duration: Optional[int] = 30
     include_recording: Optional[bool] = True
     draw: Optional[dict] = {}
 
 
 class EventsEndBody(BaseModel):
-    end_time: Optional[float] = None
-
-
-class EventsDeleteBody(BaseModel):
-    event_ids: List[str] = Field(title="The event IDs to delete")
+    end_time: Optional[int] = None
 
 
 class SubmitPlusBody(BaseModel):

frigate/api/defs/response/event_response.py

@@ -1,42 +0,0 @@
-from typing import Any, Optional
-
-from pydantic import BaseModel, ConfigDict
-
-
-class EventResponse(BaseModel):
-    id: str
-    label: str
-    sub_label: Optional[str]
-    camera: str
-    start_time: float
-    end_time: Optional[float]
-    false_positive: Optional[bool]
-    zones: list[str]
-    thumbnail: str
-    has_clip: bool
-    has_snapshot: bool
-    retain_indefinitely: bool
-    plus_id: Optional[str]
-    model_hash: Optional[str]
-    detector_type: Optional[str]
-    model_type: Optional[str]
-    data: dict[str, Any]
-
-    model_config = ConfigDict(protected_namespaces=())
-
-
-class EventCreateResponse(BaseModel):
-    success: bool
-    message: str
-    event_id: str
-
-
-class EventMultiDeleteResponse(BaseModel):
-    success: bool
-    deleted_events: list[str]
-    not_found_events: list[str]
-
-
-class EventUploadPlusResponse(BaseModel):
-    success: bool
-    plus_id: str

frigate/api/defs/review_query_parameters.py

@@ -3,7 +3,7 @@ from typing import Union
 from pydantic import BaseModel
 from pydantic.json_schema import SkipJsonSchema
 
-from frigate.review.types import SeverityEnum
+from frigate.review.maintainer import SeverityEnum
 
 
 class ReviewQueryParams(BaseModel):

frigate/api/defs/review_responses.py

@@ -3,7 +3,7 @@ from typing import Dict
 
 from pydantic import BaseModel, Json
 
-from frigate.review.types import SeverityEnum
+from frigate.review.maintainer import SeverityEnum
 
 
 class ReviewSegmentResponse(BaseModel):

frigate/api/event.py

@@ -14,36 +14,29 @@ from fastapi.responses import JSONResponse
 from peewee import JOIN, DoesNotExist, fn, operator
 from playhouse.shortcuts import model_to_dict
 
-from frigate.api.defs.query.events_query_parameters import (
-    DEFAULT_TIME_RANGE,
-    EventsQueryParams,
-    EventsSearchQueryParams,
-    EventsSummaryQueryParams,
-)
-from frigate.api.defs.query.regenerate_query_parameters import (
-    RegenerateQueryParameters,
-)
-from frigate.api.defs.request.events_body import (
+from frigate.api.defs.events_body import (
     EventsCreateBody,
-    EventsDeleteBody,
     EventsDescriptionBody,
     EventsEndBody,
     EventsSubLabelBody,
     SubmitPlusBody,
 )
-from frigate.api.defs.response.event_response import (
-    EventCreateResponse,
-    EventMultiDeleteResponse,
-    EventResponse,
-    EventUploadPlusResponse,
+from frigate.api.defs.events_query_parameters import (
+    DEFAULT_TIME_RANGE,
+    EventsQueryParams,
+    EventsSearchQueryParams,
+    EventsSummaryQueryParams,
+)
+from frigate.api.defs.regenerate_query_parameters import (
+    RegenerateQueryParameters,
 )
-from frigate.api.defs.response.generic_response import GenericResponse
 from frigate.api.defs.tags import Tags
-from frigate.const import CLIPS_DIR
+from frigate.const import (
+    CLIPS_DIR,
+)
 from frigate.embeddings import EmbeddingsContext
-from frigate.events.external import ExternalEventProcessor
 from frigate.models import Event, ReviewSegment, Timeline
-from frigate.object_processing import TrackedObject, TrackedObjectProcessor
+from frigate.object_processing import TrackedObject
 from frigate.util.builtin import get_tz_modifiers
 
 logger = logging.getLogger(__name__)
@@ -51,7 +44,7 @@ logger = logging.getLogger(__name__)
 router = APIRouter(tags=[Tags.events])
 
 
-@router.get("/events", response_model=list[EventResponse])
+@router.get("/events")
 def events(params: EventsQueryParams = Depends()):
     camera = params.camera
     cameras = params.cameras
@@ -253,8 +246,6 @@ def events(params: EventsQueryParams = Depends()):
             order_by = Event.start_time.asc()
         elif sort == "date_desc":
             order_by = Event.start_time.desc()
-        else:
-            order_by = Event.start_time.desc()
     else:
         order_by = Event.start_time.desc()
 
@@ -270,7 +261,7 @@ def events(params: EventsQueryParams = Depends()):
     return JSONResponse(content=list(events))
 
 
-@router.get("/events/explore", response_model=list[EventResponse])
+@router.get("/events/explore")
 def events_explore(limit: int = 10):
     # get distinct labels for all events
     distinct_labels = Event.select(Event.label).distinct().order_by(Event.label)
@@ -315,8 +306,7 @@ def events_explore(limit: int = 10):
                 "data": {
                     k: v
                     for k, v in event.data.items()
-                    if k
-                    in ["type", "score", "top_score", "description", "sub_label_score"]
+                    if k in ["type", "score", "top_score", "description"]
                 },
                 "event_count": label_counts[event.label],
             }
@@ -332,7 +322,7 @@ def events_explore(limit: int = 10):
     return JSONResponse(content=processed_events)
 
 
-@router.get("/event_ids", response_model=list[EventResponse])
+@router.get("/event_ids")
 def event_ids(ids: str):
     ids = ids.split(",")
 
@@ -590,17 +580,19 @@ def events_search(request: Request, params: EventsSearchQueryParams = Depends())
 
         processed_events.append(processed_event)
 
-    if (sort is None or sort == "relevance") and search_results:
+    # Sort by search distance if search_results are available, otherwise by start_time as default
+    if search_results:
         processed_events.sort(key=lambda x: x.get("search_distance", float("inf")))
-    elif min_score is not None and max_score is not None and sort == "score_asc":
-        processed_events.sort(key=lambda x: x["score"])
-    elif min_score is not None and max_score is not None and sort == "score_desc":
-        processed_events.sort(key=lambda x: x["score"], reverse=True)
-    elif sort == "date_asc":
-        processed_events.sort(key=lambda x: x["start_time"])
     else:
-        # "date_desc" default
-        processed_events.sort(key=lambda x: x["start_time"], reverse=True)
+        if sort == "score_asc":
+            processed_events.sort(key=lambda x: x["score"])
+        elif sort == "score_desc":
+            processed_events.sort(key=lambda x: x["score"], reverse=True)
+        elif sort == "date_asc":
+            processed_events.sort(key=lambda x: x["start_time"])
+        else:
+            # "date_desc" default
+            processed_events.sort(key=lambda x: x["start_time"], reverse=True)
 
     # Limit the number of events returned
     processed_events = processed_events[:limit]
@@ -653,7 +645,7 @@ def events_summary(params: EventsSummaryQueryParams = Depends()):
     return JSONResponse(content=[e for e in groups.dicts()])
 
 
-@router.get("/events/{event_id}", response_model=EventResponse)
+@router.get("/events/{event_id}")
 def event(event_id: str):
     try:
         return model_to_dict(Event.get(Event.id == event_id))
@@ -661,7 +653,7 @@ def event(event_id: str):
         return JSONResponse(content="Event not found", status_code=404)
 
 
-@router.post("/events/{event_id}/retain", response_model=GenericResponse)
+@router.post("/events/{event_id}/retain")
 def set_retain(event_id: str):
     try:
         event = Event.get(Event.id == event_id)
@@ -680,7 +672,7 @@ def set_retain(event_id: str):
     )
 
 
-@router.post("/events/{event_id}/plus", response_model=EventUploadPlusResponse)
+@router.post("/events/{event_id}/plus")
 def send_to_plus(request: Request, event_id: str, body: SubmitPlusBody = None):
     if not request.app.frigate_config.plus_api.is_active():
         message = "PLUS_API_KEY environment variable is not set"
@@ -792,7 +784,7 @@ def send_to_plus(request: Request, event_id: str, body: SubmitPlusBody = None):
     )
 
 
-@router.put("/events/{event_id}/false_positive", response_model=EventUploadPlusResponse)
+@router.put("/events/{event_id}/false_positive")
 def false_positive(request: Request, event_id: str):
     if not request.app.frigate_config.plus_api.is_active():
         message = "PLUS_API_KEY environment variable is not set"
@@ -881,7 +873,7 @@ def false_positive(request: Request, event_id: str):
     )
 
 
-@router.delete("/events/{event_id}/retain", response_model=GenericResponse)
+@router.delete("/events/{event_id}/retain")
 def delete_retain(event_id: str):
     try:
         event = Event.get(Event.id == event_id)
@@ -900,7 +892,7 @@ def delete_retain(event_id: str):
     )
 
 
-@router.post("/events/{event_id}/sub_label", response_model=GenericResponse)
+@router.post("/events/{event_id}/sub_label")
 def set_sub_label(
     request: Request,
     event_id: str,
@@ -952,7 +944,7 @@ def set_sub_label(
     )
 
 
-@router.post("/events/{event_id}/description", response_model=GenericResponse)
+@router.post("/events/{event_id}/description")
 def set_description(
     request: Request,
     event_id: str,
@@ -999,7 +991,7 @@ def set_description(
     )
 
 
-@router.put("/events/{event_id}/description/regenerate", response_model=GenericResponse)
+@router.put("/events/{event_id}/description/regenerate")
 def regenerate_description(
     request: Request, event_id: str, params: RegenerateQueryParameters = Depends()
 ):
@@ -1043,67 +1035,37 @@ def regenerate_description(
     )
 
 
-def delete_single_event(event_id: str, request: Request) -> dict:
+@router.delete("/events/{event_id}")
+def delete_event(request: Request, event_id: str):
     try:
         event = Event.get(Event.id == event_id)
     except DoesNotExist:
-        return {"success": False, "message": f"Event {event_id} not found"}
+        return JSONResponse(
+            content=({"success": False, "message": "Event " + event_id + " not found"}),
+            status_code=404,
+        )
 
     media_name = f"{event.camera}-{event.id}"
     if event.has_snapshot:
-        snapshot_paths = [
-            Path(f"{os.path.join(CLIPS_DIR, media_name)}.jpg"),
-            Path(f"{os.path.join(CLIPS_DIR, media_name)}-clean.png"),
-        ]
-        for media in snapshot_paths:
-            media.unlink(missing_ok=True)
+        media = Path(f"{os.path.join(CLIPS_DIR, media_name)}.jpg")
+        media.unlink(missing_ok=True)
+        media = Path(f"{os.path.join(CLIPS_DIR, media_name)}-clean.png")
+        media.unlink(missing_ok=True)
 
     event.delete_instance()
     Timeline.delete().where(Timeline.source_id == event_id).execute()
-
     # If semantic search is enabled, update the index
     if request.app.frigate_config.semantic_search.enabled:
         context: EmbeddingsContext = request.app.embeddings
         context.db.delete_embeddings_thumbnail(event_ids=[event_id])
         context.db.delete_embeddings_description(event_ids=[event_id])
-
-    return {"success": True, "message": f"Event {event_id} deleted"}
+    return JSONResponse(
+        content=({"success": True, "message": "Event " + event_id + " deleted"}),
+        status_code=200,
+    )
 
 
-@router.delete("/events/{event_id}", response_model=GenericResponse)
-def delete_event(request: Request, event_id: str):
-    result = delete_single_event(event_id, request)
-    status_code = 200 if result["success"] else 404
-    return JSONResponse(content=result, status_code=status_code)
-
-
-@router.delete("/events/", response_model=EventMultiDeleteResponse)
-def delete_events(request: Request, body: EventsDeleteBody):
-    if not body.event_ids:
-        return JSONResponse(
-            content=({"success": False, "message": "No event IDs provided."}),
-            status_code=404,
-        )
-
-    deleted_events = []
-    not_found_events = []
-
-    for event_id in body.event_ids:
-        result = delete_single_event(event_id, request)
-        if result["success"]:
-            deleted_events.append(event_id)
-        else:
-            not_found_events.append(event_id)
-
-    response = {
-        "success": True,
-        "deleted_events": deleted_events,
-        "not_found_events": not_found_events,
-    }
-    return JSONResponse(content=response, status_code=200)
-
-
-@router.post("/events/{camera_name}/{label}/create", response_model=EventCreateResponse)
+@router.post("/events/{camera_name}/{label}/create")
 def create_event(
     request: Request,
     camera_name: str,
@@ -1125,11 +1087,9 @@ def create_event(
         )
 
     try:
-        frame_processor: TrackedObjectProcessor = request.app.detected_frames_processor
-        external_processor: ExternalEventProcessor = request.app.external_processor
+        frame = request.app.detected_frames_processor.get_current_frame(camera_name)
 
-        frame = frame_processor.get_current_frame(camera_name)
-        event_id = external_processor.create_manual_event(
+        event_id = request.app.external_processor.create_manual_event(
             camera_name,
             label,
             body.source_type,
@@ -1159,7 +1119,7 @@ def create_event(
     )
 
 
-@router.put("/events/{event_id}/end", response_model=GenericResponse)
+@router.put("/events/{event_id}/end")
 def end_event(request: Request, event_id: str, body: EventsEndBody):
     try:
         end_time = body.end_time or datetime.datetime.now().timestamp()

frigate/api/export.py

@@ -9,7 +9,6 @@ import psutil
 from fastapi import APIRouter, Request
 from fastapi.responses import JSONResponse
 from peewee import DoesNotExist
-from playhouse.shortcuts import model_to_dict
 
 from frigate.api.defs.request.export_recordings_body import ExportRecordingsBody
 from frigate.api.defs.tags import Tags
@@ -208,14 +207,3 @@ def export_delete(event_id: str):
         ),
         status_code=200,
     )
-
-
-@router.get("/exports/{export_id}")
-def get_export(export_id: str):
-    try:
-        return JSONResponse(content=model_to_dict(Export.get(Export.id == export_id)))
-    except DoesNotExist:
-        return JSONResponse(
-            content={"success": False, "message": "Export not found"},
-            status_code=404,
-        )

frigate/api/fastapi_app.py

@@ -87,11 +87,7 @@ def create_fastapi_app(
         logger.info("FastAPI started")
 
     # Rate limiter (used for login endpoint)
-    if frigate_config.auth.failed_login_rate_limit is None:
-        limiter.enabled = False
-    else:
-        auth.rateLimiter.set_limit(frigate_config.auth.failed_login_rate_limit)
-
+    auth.rateLimiter.set_limit(frigate_config.auth.failed_login_rate_limit or "")
     app.state.limiter = limiter
     app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
     app.add_middleware(SlowAPIMiddleware)

frigate/api/media.py

@@ -20,7 +20,7 @@ from pathvalidate import sanitize_filename
 from peewee import DoesNotExist, fn
 from tzlocal import get_localzone_name
 
-from frigate.api.defs.query.media_query_parameters import (
+from frigate.api.defs.media_query_parameters import (
     Extension,
     MediaEventsSnapshotQueryParams,
     MediaLatestFrameQueryParams,
@@ -36,7 +36,6 @@ from frigate.const import (
     RECORD_DIR,
 )
 from frigate.models import Event, Previews, Recordings, Regions, ReviewSegment
-from frigate.object_processing import TrackedObjectProcessor
 from frigate.util.builtin import get_tz_modifiers
 from frigate.util.image import get_image_from_recording
 
@@ -80,11 +79,7 @@ def mjpeg_feed(
 
 
 def imagestream(
-    detected_frames_processor: TrackedObjectProcessor,
-    camera_name: str,
-    fps: int,
-    height: int,
-    draw_options: dict[str, any],
+    detected_frames_processor, camera_name: str, fps: int, height: int, draw_options
 ):
     while True:
         # max out at specified FPS
@@ -123,7 +118,6 @@ def latest_frame(
     extension: Extension,
     params: MediaLatestFrameQueryParams = Depends(),
 ):
-    frame_processor: TrackedObjectProcessor = request.app.detected_frames_processor
     draw_options = {
         "bounding_boxes": params.bbox,
         "timestamp": params.timestamp,
@@ -135,14 +129,17 @@ def latest_frame(
     quality = params.quality
 
     if camera_name in request.app.frigate_config.cameras:
-        frame = frame_processor.get_current_frame(camera_name, draw_options)
+        frame = request.app.detected_frames_processor.get_current_frame(
+            camera_name, draw_options
+        )
         retry_interval = float(
             request.app.frigate_config.cameras.get(camera_name).ffmpeg.retry_interval
             or 10
         )
 
         if frame is None or datetime.now().timestamp() > (
-            frame_processor.get_current_frame_time(camera_name) + retry_interval
+            request.app.detected_frames_processor.get_current_frame_time(camera_name)
+            + retry_interval
         ):
             if request.app.camera_error_image is None:
                 error_image = glob.glob("/opt/frigate/frigate/images/camera-error.jpg")
@@ -183,7 +180,7 @@ def latest_frame(
         )
     elif camera_name == "birdseye" and request.app.frigate_config.birdseye.restream:
         frame = cv2.cvtColor(
-            frame_processor.get_current_frame(camera_name),
+            request.app.detected_frames_processor.get_current_frame(camera_name),
             cv2.COLOR_YUV2BGR_I420,
         )
 
@@ -816,15 +813,15 @@ def grid_snapshot(
 ):
     if camera_name in request.app.frigate_config.cameras:
         detect = request.app.frigate_config.cameras[camera_name].detect
-        frame_processor: TrackedObjectProcessor = request.app.detected_frames_processor
-        frame = frame_processor.get_current_frame(camera_name, {})
+        frame = request.app.detected_frames_processor.get_current_frame(camera_name, {})
         retry_interval = float(
             request.app.frigate_config.cameras.get(camera_name).ffmpeg.retry_interval
             or 10
         )
 
         if frame is None or datetime.now().timestamp() > (
-            frame_processor.get_current_frame_time(camera_name) + retry_interval
+            request.app.detected_frames_processor.get_current_frame_time(camera_name)
+            + retry_interval
         ):
             return JSONResponse(
                 content={"success": False, "message": "Unable to get valid frame"},

frigate/api/review.py

@@ -12,21 +12,20 @@ from fastapi.responses import JSONResponse
 from peewee import Case, DoesNotExist, fn, operator
 from playhouse.shortcuts import model_to_dict
 
-from frigate.api.defs.query.review_query_parameters import (
+from frigate.api.defs.generic_response import GenericResponse
+from frigate.api.defs.review_body import ReviewModifyMultipleBody
+from frigate.api.defs.review_query_parameters import (
     ReviewActivityMotionQueryParams,
     ReviewQueryParams,
     ReviewSummaryQueryParams,
 )
-from frigate.api.defs.request.review_body import ReviewModifyMultipleBody
-from frigate.api.defs.response.generic_response import GenericResponse
-from frigate.api.defs.response.review_response import (
+from frigate.api.defs.review_responses import (
     ReviewActivityMotionResponse,
     ReviewSegmentResponse,
     ReviewSummaryResponse,
 )
 from frigate.api.defs.tags import Tags
 from frigate.models import Recordings, ReviewSegment
-from frigate.review.types import SeverityEnum
 from frigate.util.builtin import get_tz_modifiers
 
 logger = logging.getLogger(__name__)
@@ -162,7 +161,7 @@ def review_summary(params: ReviewSummaryQueryParams = Depends()):
                     None,
                     [
                         (
-                            (ReviewSegment.severity == SeverityEnum.alert),
+                            (ReviewSegment.severity == "alert"),
                             ReviewSegment.has_been_reviewed,
                         )
                     ],
@@ -174,7 +173,7 @@ def review_summary(params: ReviewSummaryQueryParams = Depends()):
                     None,
                     [
                         (
-                            (ReviewSegment.severity == SeverityEnum.detection),
+                            (ReviewSegment.severity == "detection"),
                             ReviewSegment.has_been_reviewed,
                         )
                     ],
@@ -186,7 +185,7 @@ def review_summary(params: ReviewSummaryQueryParams = Depends()):
                     None,
                     [
                         (
-                            (ReviewSegment.severity == SeverityEnum.alert),
+                            (ReviewSegment.severity == "alert"),
                             1,
                         )
                     ],
@@ -198,7 +197,7 @@ def review_summary(params: ReviewSummaryQueryParams = Depends()):
                     None,
                     [
                         (
-                            (ReviewSegment.severity == SeverityEnum.detection),
+                            (ReviewSegment.severity == "detection"),
                             1,
                         )
                     ],
@@ -231,7 +230,6 @@ def review_summary(params: ReviewSummaryQueryParams = Depends()):
         label_clause = reduce(operator.or_, label_clauses)
         clauses.append((label_clause))
 
-    day_in_seconds = 60 * 60 * 24
     last_month = (
         ReviewSegment.select(
             fn.strftime(
@@ -248,7 +246,7 @@ def review_summary(params: ReviewSummaryQueryParams = Depends()):
                     None,
                     [
                         (
-                            (ReviewSegment.severity == SeverityEnum.alert),
+                            (ReviewSegment.severity == "alert"),
                             ReviewSegment.has_been_reviewed,
                         )
                     ],
@@ -260,7 +258,7 @@ def review_summary(params: ReviewSummaryQueryParams = Depends()):
                     None,
                     [
                         (
-                            (ReviewSegment.severity == SeverityEnum.detection),
+                            (ReviewSegment.severity == "detection"),
                             ReviewSegment.has_been_reviewed,
                         )
                     ],
@@ -272,7 +270,7 @@ def review_summary(params: ReviewSummaryQueryParams = Depends()):
                     None,
                     [
                         (
-                            (ReviewSegment.severity == SeverityEnum.alert),
+                            (ReviewSegment.severity == "alert"),
                             1,
                         )
                     ],
@@ -284,7 +282,7 @@ def review_summary(params: ReviewSummaryQueryParams = Depends()):
                     None,
                     [
                         (
-                            (ReviewSegment.severity == SeverityEnum.detection),
+                            (ReviewSegment.severity == "detection"),
                             1,
                         )
                     ],
@@ -294,7 +292,7 @@ def review_summary(params: ReviewSummaryQueryParams = Depends()):
         )
         .where(reduce(operator.and_, clauses))
         .group_by(
-            (ReviewSegment.start_time + seconds_offset).cast("int") / day_in_seconds,
+            (ReviewSegment.start_time + seconds_offset).cast("int") / (3600 * 24),
         )
         .order_by(ReviewSegment.start_time.desc())
     )
@@ -364,7 +362,7 @@ def delete_reviews(body: ReviewModifyMultipleBody):
     ReviewSegment.delete().where(ReviewSegment.id << list_of_ids).execute()
 
     return JSONResponse(
-        content=({"success": True, "message": "Deleted review items."}), status_code=200
+        content=({"success": True, "message": "Delete reviews"}), status_code=200
     )
 
 

frigate/app.py

@@ -36,7 +36,6 @@ from frigate.const import (
     EXPORT_DIR,
     MODEL_CACHE_DIR,
     RECORD_DIR,
-    SHM_FRAMES_VAR,
 )
 from frigate.db.sqlitevecq import SqliteVecQueueDatabase
 from frigate.embeddings import EmbeddingsContext, manage_embeddings
@@ -437,7 +436,7 @@ class FrigateApp:
             # pre-create shms
             for i in range(shm_frame_count):
                 frame_size = config.frame_shape_yuv[0] * config.frame_shape_yuv[1]
-                self.frame_manager.create(f"{config.name}_{i}", frame_size)
+                self.frame_manager.create(f"{config.name}{i}", frame_size)
 
             capture_process = util.Process(
                 target=capture_camera,
@@ -524,10 +523,7 @@ class FrigateApp:
         if cam_total_frame_size == 0.0:
             return 0
 
-        shm_frame_count = min(
-            int(os.environ.get(SHM_FRAMES_VAR, "50")),
-            int(available_shm / (cam_total_frame_size)),
-        )
+        shm_frame_count = min(200, int(available_shm / (cam_total_frame_size)))
 
         logger.debug(
             f"Calculated total camera size {available_shm} / {cam_total_frame_size} :: {shm_frame_count} frames for each camera in SHM"

frigate/config/config.py

@@ -230,16 +230,12 @@ def verify_recording_segments_setup_with_reasonable_time(
     try:
         seg_arg_index = record_args.index("-segment_time")
     except ValueError:
-        raise ValueError(
-            f"Camera {camera_config.name} has no segment_time in \
-                         recording output args, segment args are required for record."
-        )
+        raise ValueError(f"Camera {camera_config.name} has no segment_time in \
+                         recording output args, segment args are required for record.")
 
     if int(record_args[seg_arg_index + 1]) > 60:
-        raise ValueError(
-            f"Camera {camera_config.name} has invalid segment_time output arg, \
-                         segment_time must be 60 or less."
-        )
+        raise ValueError(f"Camera {camera_config.name} has invalid segment_time output arg, \
+                         segment_time must be 60 or less.")
 
 
 def verify_zone_objects_are_tracked(camera_config: CameraConfig) -> None:

frigate/const.py

@@ -13,8 +13,6 @@ FRIGATE_LOCALHOST = "http://127.0.0.1:5000"
 PLUS_ENV_VAR = "PLUS_API_KEY"
 PLUS_API_HOST = "https://api.frigate.video"
 
-SHM_FRAMES_VAR = "SHM_MAX_FRAMES"
-
 # Attribute & Object constants
 
 DEFAULT_ATTRIBUTE_LABEL_MAP = {

frigate/events/audio.py

@@ -216,10 +216,6 @@ class AudioEventMaintainer(threading.Thread):
                     "label": label,
                     "last_detection": datetime.datetime.now().timestamp(),
                 }
-            else:
-                self.logger.warning(
-                    f"Failed to create audio event with status code {resp.status_code}"
-                )
 
     def expire_detections(self) -> None:
         now = datetime.datetime.now().timestamp()

frigate/events/cleanup.py

@@ -4,6 +4,7 @@ import datetime
 import logging
 import os
 import threading
+from enum import Enum
 from multiprocessing.synchronize import Event as MpEvent
 from pathlib import Path
 
@@ -15,6 +16,11 @@ from frigate.models import Event, Timeline
 logger = logging.getLogger(__name__)
 
 
+class EventCleanupType(str, Enum):
+    clips = "clips"
+    snapshots = "snapshots"
+
+
 CHUNK_SIZE = 50
 
 
@@ -61,11 +67,19 @@ class EventCleanup(threading.Thread):
 
         return self.camera_labels[camera]["labels"]
 
-    def expire_snapshots(self) -> list[str]:
+    def expire(self, media_type: EventCleanupType) -> list[str]:
         ## Expire events from unlisted cameras based on the global config
-        retain_config = self.config.snapshots.retain
-        file_extension = "jpg"
-        update_params = {"has_snapshot": False}
+        if media_type == EventCleanupType.clips:
+            expire_days = max(
+                self.config.record.alerts.retain.days,
+                self.config.record.detections.retain.days,
+            )
+            file_extension = None  # mp4 clips are no longer stored in /clips
+            update_params = {"has_clip": False}
+        else:
+            retain_config = self.config.snapshots.retain
+            file_extension = "jpg"
+            update_params = {"has_snapshot": False}
 
         distinct_labels = self.get_removed_camera_labels()
 
@@ -73,7 +87,10 @@ class EventCleanup(threading.Thread):
         # loop over object types in db
         for event in distinct_labels:
             # get expiration time for this label
-            expire_days = retain_config.objects.get(event.label, retain_config.default)
+            if media_type == EventCleanupType.snapshots:
+                expire_days = retain_config.objects.get(
+                    event.label, retain_config.default
+                )
 
             expire_after = (
                 datetime.datetime.now() - datetime.timedelta(days=expire_days)
@@ -93,7 +110,7 @@ class EventCleanup(threading.Thread):
                 .namedtuples()
                 .iterator()
             )
-            logger.debug(f"{len(list(expired_events))} events can be expired")
+            logger.debug(f"{len(expired_events)} events can be expired")
             # delete the media from disk
             for expired in expired_events:
                 media_name = f"{expired.camera}-{expired.id}"
@@ -145,7 +162,13 @@ class EventCleanup(threading.Thread):
 
         ## Expire events from cameras based on the camera config
         for name, camera in self.config.cameras.items():
-            retain_config = camera.snapshots.retain
+            if media_type == EventCleanupType.clips:
+                expire_days = max(
+                    camera.record.alerts.retain.days,
+                    camera.record.detections.retain.days,
+                )
+            else:
+                retain_config = camera.snapshots.retain
 
             # get distinct objects in database for this camera
             distinct_labels = self.get_camera_labels(name)
@@ -153,9 +176,10 @@ class EventCleanup(threading.Thread):
             # loop over object types in db
             for event in distinct_labels:
                 # get expiration time for this label
-                expire_days = retain_config.objects.get(
-                    event.label, retain_config.default
-                )
+                if media_type == EventCleanupType.snapshots:
+                    expire_days = retain_config.objects.get(
+                        event.label, retain_config.default
+                    )
 
                 expire_after = (
                     datetime.datetime.now() - datetime.timedelta(days=expire_days)
@@ -182,143 +206,19 @@ class EventCleanup(threading.Thread):
                 for event in expired_events:
                     events_to_update.append(event.id)
 
-                    try:
-                        media_name = f"{event.camera}-{event.id}"
-                        media_path = Path(
-                            f"{os.path.join(CLIPS_DIR, media_name)}.{file_extension}"
-                        )
-                        media_path.unlink(missing_ok=True)
-                        media_path = Path(
-                            f"{os.path.join(CLIPS_DIR, media_name)}-clean.png"
-                        )
-                        media_path.unlink(missing_ok=True)
-                    except OSError as e:
-                        logger.warning(f"Unable to delete event images: {e}")
-
-        # update the clips attribute for the db entry
-        for i in range(0, len(events_to_update), CHUNK_SIZE):
-            batch = events_to_update[i : i + CHUNK_SIZE]
-            logger.debug(f"Updating {update_params} for {len(batch)} events")
-            Event.update(update_params).where(Event.id << batch).execute()
-
-        return events_to_update
-
-    def expire_clips(self) -> list[str]:
-        ## Expire events from unlisted cameras based on the global config
-        expire_days = max(
-            self.config.record.alerts.retain.days,
-            self.config.record.detections.retain.days,
-        )
-        file_extension = None  # mp4 clips are no longer stored in /clips
-        update_params = {"has_clip": False}
-
-        # get expiration time for this label
-
-        expire_after = (
-            datetime.datetime.now() - datetime.timedelta(days=expire_days)
-        ).timestamp()
-        # grab all events after specific time
-        expired_events: list[Event] = (
-            Event.select(
-                Event.id,
-                Event.camera,
-            )
-            .where(
-                Event.camera.not_in(self.camera_keys),
-                Event.start_time < expire_after,
-                Event.retain_indefinitely == False,
-            )
-            .namedtuples()
-            .iterator()
-        )
-        logger.debug(f"{len(list(expired_events))} events can be expired")
-        # delete the media from disk
-        for expired in expired_events:
-            media_name = f"{expired.camera}-{expired.id}"
-            media_path = Path(f"{os.path.join(CLIPS_DIR, media_name)}.{file_extension}")
-
-            try:
-                media_path.unlink(missing_ok=True)
-                if file_extension == "jpg":
-                    media_path = Path(
-                        f"{os.path.join(CLIPS_DIR, media_name)}-clean.png"
-                    )
-                    media_path.unlink(missing_ok=True)
-            except OSError as e:
-                logger.warning(f"Unable to delete event images: {e}")
-
-        # update the clips attribute for the db entry
-        query = Event.select(Event.id).where(
-            Event.camera.not_in(self.camera_keys),
-            Event.start_time < expire_after,
-            Event.retain_indefinitely == False,
-        )
-
-        events_to_update = []
-
-        for batch in query.iterator():
-            events_to_update.extend([event.id for event in batch])
-            if len(events_to_update) >= CHUNK_SIZE:
-                logger.debug(
-                    f"Updating {update_params} for {len(events_to_update)} events"
-                )
-                Event.update(update_params).where(
-                    Event.id << events_to_update
-                ).execute()
-                events_to_update = []
-
-        # Update any remaining events
-        if events_to_update:
-            logger.debug(
-                f"Updating clips/snapshots attribute for {len(events_to_update)} events"
-            )
-            Event.update(update_params).where(Event.id << events_to_update).execute()
-
-        events_to_update = []
-        now = datetime.datetime.now()
-
-        ## Expire events from cameras based on the camera config
-        for name, camera in self.config.cameras.items():
-            expire_days = max(
-                camera.record.alerts.retain.days,
-                camera.record.detections.retain.days,
-            )
-            alert_expire_date = (
-                now - datetime.timedelta(days=camera.record.alerts.retain.days)
-            ).timestamp()
-            detection_expire_date = (
-                now - datetime.timedelta(days=camera.record.detections.retain.days)
-            ).timestamp()
-            # grab all events after specific time
-            expired_events = (
-                Event.select(
-                    Event.id,
-                    Event.camera,
-                )
-                .where(
-                    Event.camera == name,
-                    Event.retain_indefinitely == False,
-                    (
-                        (
-                            (Event.data["max_severity"] != "detection")
-                            | (Event.data["max_severity"].is_null())
-                        )
-                        & (Event.end_time < alert_expire_date)
-                    )
-                    | (
-                        (Event.data["max_severity"] == "detection")
-                        & (Event.end_time < detection_expire_date)
-                    ),
-                )
-                .namedtuples()
-                .iterator()
-            )
-
-            # delete the grabbed clips from disk
-            # only snapshots are stored in /clips
-            # so no need to delete mp4 files
-            for event in expired_events:
-                events_to_update.append(event.id)
+                    if media_type == EventCleanupType.snapshots:
+                        try:
+                            media_name = f"{event.camera}-{event.id}"
+                            media_path = Path(
+                                f"{os.path.join(CLIPS_DIR, media_name)}.{file_extension}"
+                            )
+                            media_path.unlink(missing_ok=True)
+                            media_path = Path(
+                                f"{os.path.join(CLIPS_DIR, media_name)}-clean.png"
+                            )
+                            media_path.unlink(missing_ok=True)
+                        except OSError as e:
+                            logger.warning(f"Unable to delete event images: {e}")
 
         # update the clips attribute for the db entry
         for i in range(0, len(events_to_update), CHUNK_SIZE):
@@ -330,9 +230,8 @@ class EventCleanup(threading.Thread):
 
     def run(self) -> None:
         # only expire events every 5 minutes
-        while not self.stop_event.wait(1):
-            events_with_expired_clips = self.expire_clips()
-            return
+        while not self.stop_event.wait(300):
+            events_with_expired_clips = self.expire(EventCleanupType.clips)
 
             # delete timeline entries for events that have expired recordings
             # delete up to 100,000 at a time
@@ -343,7 +242,7 @@ class EventCleanup(threading.Thread):
                     Timeline.source_id << deleted_events_list[i : i + max_deletes]
                 ).execute()
 
-            self.expire_snapshots()
+            self.expire(EventCleanupType.snapshots)
 
             # drop events from db where has_clip and has_snapshot are false
             events = (

frigate/events/external.py

@@ -10,7 +10,6 @@ from enum import Enum
 from typing import Optional
 
 import cv2
-from numpy import ndarray
 
 from frigate.comms.detections_updater import DetectionPublisher, DetectionTypeEnum
 from frigate.comms.events_updater import EventUpdatePublisher
@@ -46,7 +45,7 @@ class ExternalEventProcessor:
         duration: Optional[int],
         include_recording: bool,
         draw: dict[str, any],
-        snapshot_frame: Optional[ndarray],
+        snapshot_frame: any,
     ) -> str:
         now = datetime.datetime.now().timestamp()
         camera_config = self.config.cameras.get(camera)
@@ -108,7 +107,6 @@ class ExternalEventProcessor:
                 EventTypeEnum.api,
                 EventStateEnum.end,
                 None,
-                "",
                 {"id": event_id, "end_time": end_time},
             )
         )
@@ -133,11 +131,8 @@ class ExternalEventProcessor:
         label: str,
         event_id: str,
         draw: dict[str, any],
-        img_frame: Optional[ndarray],
-    ) -> Optional[str]:
-        if img_frame is None:
-            return None
-
+        img_frame: any,
+    ) -> str:
         # write clean snapshot if enabled
         if camera_config.snapshots.clean_copy:
             ret, png = cv2.imencode(".png", img_frame)

frigate/events/maintainer.py

@@ -210,7 +210,6 @@ class EventProcessor(threading.Thread):
                     "top_score": event_data["top_score"],
                     "attributes": attributes,
                     "type": "object",
-                    "max_severity": event_data.get("max_severity"),
                 },
             }
 

frigate/object_processing.py

@@ -6,7 +6,7 @@ import queue
 import threading
 from collections import Counter, defaultdict
 from multiprocessing.synchronize import Event as MpEvent
-from typing import Callable, Optional
+from typing import Callable
 
 import cv2
 import numpy as np
@@ -702,7 +702,30 @@ class TrackedObjectProcessor(threading.Thread):
             return False
 
         # If the object is not considered an alert or detection
-        if obj.max_severity is None:
+        review_config = self.config.cameras[camera].review
+        if not (
+            (
+                obj.obj_data["label"] in review_config.alerts.labels
+                and (
+                    not review_config.alerts.required_zones
+                    or set(obj.entered_zones) & set(review_config.alerts.required_zones)
+                )
+            )
+            or (
+                (
+                    not review_config.detections.labels
+                    or obj.obj_data["label"] in review_config.detections.labels
+                )
+                and (
+                    not review_config.detections.required_zones
+                    or set(obj.entered_zones)
+                    & set(review_config.detections.required_zones)
+                )
+            )
+        ):
+            logger.debug(
+                f"Not creating clip for {obj.obj_data['id']} because it did not qualify as an alert or detection"
+            )
             return False
 
         return True
@@ -761,18 +784,13 @@ class TrackedObjectProcessor(threading.Thread):
         else:
             return {}
 
-    def get_current_frame(
-        self, camera: str, draw_options: dict[str, any] = {}
-    ) -> Optional[np.ndarray]:
+    def get_current_frame(self, camera, draw_options={}):
         if camera == "birdseye":
             return self.frame_manager.get(
                 "birdseye",
                 (self.config.birdseye.height * 3 // 2, self.config.birdseye.width),
             )
 
-        if camera not in self.camera_states:
-            return None
-
         return self.camera_states[camera].get_current_frame(draw_options)
 
     def get_current_frame_time(self, camera) -> int:

frigate/review/maintainer.py

@@ -7,6 +7,7 @@ import random
 import string
 import sys
 import threading
+from enum import Enum
 from multiprocessing.synchronize import Event as MpEvent
 from pathlib import Path
 from typing import Optional
@@ -26,7 +27,6 @@ from frigate.const import (
 from frigate.events.external import ManualEventState
 from frigate.models import ReviewSegment
 from frigate.object_processing import TrackedObject
-from frigate.review.types import SeverityEnum
 from frigate.util.image import SharedMemoryFrameManager, calculate_16_9_crop
 
 logger = logging.getLogger(__name__)
@@ -39,6 +39,11 @@ THRESHOLD_ALERT_ACTIVITY = 120
 THRESHOLD_DETECTION_ACTIVITY = 30
 
 
+class SeverityEnum(str, Enum):
+    alert = "alert"
+    detection = "detection"
+
+
 class PendingReviewSegment:
     def __init__(
         self,
@@ -475,9 +480,7 @@ class ReviewSegmentMaintainer(threading.Thread):
 
             if not self.config.cameras[camera].record.enabled:
                 if current_segment:
-                    self.update_existing_segment(
-                        current_segment, frame_name, frame_time, []
-                    )
+                    self.update_existing_segment(current_segment, frame_time, [])
 
                 continue
 

frigate/review/types.py

@@ -1,6 +0,0 @@
-from enum import Enum
-
-
-class SeverityEnum(str, Enum):
-    alert = "alert"
-    detection = "detection"

frigate/test/http_api/base_http_test.py

@@ -9,8 +9,8 @@ from playhouse.sqliteq import SqliteQueueDatabase
 
 from frigate.api.fastapi_app import create_fastapi_app
 from frigate.config import FrigateConfig
-from frigate.models import Event, Recordings, ReviewSegment
-from frigate.review.types import SeverityEnum
+from frigate.models import Event, ReviewSegment
+from frigate.review.maintainer import SeverityEnum
 from frigate.test.const import TEST_DB, TEST_DB_CLEANUPS
 
 
@@ -146,35 +146,17 @@ class BaseTestHttp(unittest.TestCase):
     def insert_mock_review_segment(
         self,
         id: str,
-        start_time: float = datetime.datetime.now().timestamp(),
-        end_time: float = datetime.datetime.now().timestamp() + 20,
-        severity: SeverityEnum = SeverityEnum.alert,
-        has_been_reviewed: bool = False,
+        start_time: datetime.datetime = datetime.datetime.now().timestamp(),
+        end_time: datetime.datetime = datetime.datetime.now().timestamp() + 20,
     ) -> Event:
-        """Inserts a review segment model with a given id."""
+        """Inserts a basic event model with a given id."""
         return ReviewSegment.insert(
             id=id,
             camera="front_door",
             start_time=start_time,
             end_time=end_time,
-            has_been_reviewed=has_been_reviewed,
-            severity=severity,
+            has_been_reviewed=False,
+            severity=SeverityEnum.alert,
             thumb_path=False,
             data={},
         ).execute()
-
-    def insert_mock_recording(
-        self,
-        id: str,
-        start_time: float = datetime.datetime.now().timestamp(),
-        end_time: float = datetime.datetime.now().timestamp() + 20,
-    ) -> Event:
-        """Inserts a recording model with a given id."""
-        return Recordings.insert(
-            id=id,
-            path=id,
-            camera="front_door",
-            start_time=start_time,
-            end_time=end_time,
-            duration=end_time - start_time,
-        ).execute()

frigate/test/http_api/test_http_review.py

@@ -1,89 +1,76 @@
-from datetime import datetime, timedelta
+import datetime
 
 from fastapi.testclient import TestClient
 
-from frigate.models import Event, Recordings, ReviewSegment
-from frigate.review.types import SeverityEnum
+from frigate.models import Event, ReviewSegment
 from frigate.test.http_api.base_http_test import BaseTestHttp
 
 
 class TestHttpReview(BaseTestHttp):
     def setUp(self):
-        super().setUp([Event, Recordings, ReviewSegment])
-        self.app = super().create_app()
-
-    def _get_reviews(self, ids: list[str]):
-        return list(
-            ReviewSegment.select(ReviewSegment.id)
-            .where(ReviewSegment.id.in_(ids))
-            .execute()
-        )
-
-    def _get_recordings(self, ids: list[str]):
-        return list(
-            Recordings.select(Recordings.id).where(Recordings.id.in_(ids)).execute()
-        )
-
-    ####################################################################################################################
-    ###################################  GET /review Endpoint   ########################################################
-    ####################################################################################################################
+        super().setUp([Event, ReviewSegment])
 
     # Does not return any data point since the end time (before parameter) is not passed and the review segment end_time is 2 seconds from now
     def test_get_review_no_filters_no_matches(self):
-        now = datetime.now().timestamp()
+        app = super().create_app()
+        now = datetime.datetime.now().timestamp()
 
-        with TestClient(self.app) as client:
+        with TestClient(app) as client:
             super().insert_mock_review_segment("123456.random", now, now + 2)
-            response = client.get("/review")
-            assert response.status_code == 200
-            response_json = response.json()
-            assert len(response_json) == 0
+            reviews_response = client.get("/review")
+            assert reviews_response.status_code == 200
+            reviews_in_response = reviews_response.json()
+            assert len(reviews_in_response) == 0
 
     def test_get_review_no_filters(self):
-        now = datetime.now().timestamp()
+        app = super().create_app()
+        now = datetime.datetime.now().timestamp()
 
-        with TestClient(self.app) as client:
+        with TestClient(app) as client:
             super().insert_mock_review_segment("123456.random", now - 2, now - 1)
-            response = client.get("/review")
-            assert response.status_code == 200
-            response_json = response.json()
-            assert len(response_json) == 1
+            reviews_response = client.get("/review")
+            assert reviews_response.status_code == 200
+            reviews_in_response = reviews_response.json()
+            assert len(reviews_in_response) == 1
 
     def test_get_review_with_time_filter_no_matches(self):
-        now = datetime.now().timestamp()
+        app = super().create_app()
+        now = datetime.datetime.now().timestamp()
 
-        with TestClient(self.app) as client:
+        with TestClient(app) as client:
             id = "123456.random"
             super().insert_mock_review_segment(id, now, now + 2)
             params = {
                 "after": now,
                 "before": now + 3,
             }
-            response = client.get("/review", params=params)
-            assert response.status_code == 200
-            response_json = response.json()
-            assert len(response_json) == 0
+            reviews_response = client.get("/review", params=params)
+            assert reviews_response.status_code == 200
+            reviews_in_response = reviews_response.json()
+            assert len(reviews_in_response) == 0
 
     def test_get_review_with_time_filter(self):
-        now = datetime.now().timestamp()
+        app = super().create_app()
+        now = datetime.datetime.now().timestamp()
 
-        with TestClient(self.app) as client:
+        with TestClient(app) as client:
             id = "123456.random"
             super().insert_mock_review_segment(id, now, now + 2)
             params = {
                 "after": now - 1,
                 "before": now + 3,
             }
-            response = client.get("/review", params=params)
-            assert response.status_code == 200
-            response_json = response.json()
-            assert len(response_json) == 1
-            assert response_json[0]["id"] == id
+            reviews_response = client.get("/review", params=params)
+            assert reviews_response.status_code == 200
+            reviews_in_response = reviews_response.json()
+            assert len(reviews_in_response) == 1
+            assert reviews_in_response[0]["id"] == id
 
     def test_get_review_with_limit_filter(self):
-        now = datetime.now().timestamp()
+        app = super().create_app()
+        now = datetime.datetime.now().timestamp()
 
-        with TestClient(self.app) as client:
+        with TestClient(app) as client:
             id = "123456.random"
             id2 = "654321.random"
             super().insert_mock_review_segment(id, now, now + 2)
@@ -93,49 +80,17 @@ class TestHttpReview(BaseTestHttp):
                 "after": now,
                 "before": now + 3,
             }
-            response = client.get("/review", params=params)
-            assert response.status_code == 200
-            response_json = response.json()
-            assert len(response_json) == 1
-            assert response_json[0]["id"] == id2
-
-    def test_get_review_with_severity_filters_no_matches(self):
-        now = datetime.now().timestamp()
-
-        with TestClient(self.app) as client:
-            id = "123456.random"
-            super().insert_mock_review_segment(id, now, now + 2, SeverityEnum.detection)
-            params = {
-                "severity": "detection",
-                "after": now - 1,
-                "before": now + 3,
-            }
-            response = client.get("/review", params=params)
-            assert response.status_code == 200
-            response_json = response.json()
-            assert len(response_json) == 1
-            assert response_json[0]["id"] == id
-
-    def test_get_review_with_severity_filters(self):
-        now = datetime.now().timestamp()
-
-        with TestClient(self.app) as client:
-            id = "123456.random"
-            super().insert_mock_review_segment(id, now, now + 2, SeverityEnum.detection)
-            params = {
-                "severity": "alert",
-                "after": now - 1,
-                "before": now + 3,
-            }
-            response = client.get("/review", params=params)
-            assert response.status_code == 200
-            response_json = response.json()
-            assert len(response_json) == 0
+            reviews_response = client.get("/review", params=params)
+            assert reviews_response.status_code == 200
+            reviews_in_response = reviews_response.json()
+            assert len(reviews_in_response) == 1
+            assert reviews_in_response[0]["id"] == id2
 
     def test_get_review_with_all_filters(self):
-        now = datetime.now().timestamp()
+        app = super().create_app()
+        now = datetime.datetime.now().timestamp()
 
-        with TestClient(self.app) as client:
+        with TestClient(app) as client:
             id = "123456.random"
             super().insert_mock_review_segment(id, now, now + 2)
             params = {
@@ -148,424 +103,8 @@ class TestHttpReview(BaseTestHttp):
                 "after": now - 1,
                 "before": now + 3,
             }
-            response = client.get("/review", params=params)
-            assert response.status_code == 200
-            response_json = response.json()
-            assert len(response_json) == 1
-            assert response_json[0]["id"] == id
-
-    ####################################################################################################################
-    ###################################  GET /review/summary Endpoint   #################################################
-    ####################################################################################################################
-    def test_get_review_summary_all_filters(self):
-        with TestClient(self.app) as client:
-            super().insert_mock_review_segment("123456.random")
-            params = {
-                "cameras": "front_door",
-                "labels": "all",
-                "zones": "all",
-                "timezone": "utc",
-            }
-            response = client.get("/review/summary", params=params)
-            assert response.status_code == 200
-            response_json = response.json()
-            # e.g. '2024-11-24'
-            today_formatted = datetime.today().strftime("%Y-%m-%d")
-            expected_response = {
-                "last24Hours": {
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-                today_formatted: {
-                    "day": today_formatted,
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-            }
-            self.assertEqual(response_json, expected_response)
-
-    def test_get_review_summary_no_filters(self):
-        with TestClient(self.app) as client:
-            super().insert_mock_review_segment("123456.random")
-            response = client.get("/review/summary")
-            assert response.status_code == 200
-            response_json = response.json()
-            # e.g. '2024-11-24'
-            today_formatted = datetime.today().strftime("%Y-%m-%d")
-            expected_response = {
-                "last24Hours": {
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-                today_formatted: {
-                    "day": today_formatted,
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-            }
-            self.assertEqual(response_json, expected_response)
-
-    def test_get_review_summary_multiple_days(self):
-        now = datetime.now()
-        five_days_ago = datetime.today() - timedelta(days=5)
-
-        with TestClient(self.app) as client:
-            super().insert_mock_review_segment(
-                "123456.random", now.timestamp() - 2, now.timestamp() - 1
-            )
-            super().insert_mock_review_segment(
-                "654321.random",
-                five_days_ago.timestamp(),
-                five_days_ago.timestamp() + 1,
-            )
-            response = client.get("/review/summary")
-            assert response.status_code == 200
-            response_json = response.json()
-            # e.g. '2024-11-24'
-            today_formatted = now.strftime("%Y-%m-%d")
-            # e.g. '2024-11-19'
-            five_days_ago_formatted = five_days_ago.strftime("%Y-%m-%d")
-            expected_response = {
-                "last24Hours": {
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-                today_formatted: {
-                    "day": today_formatted,
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-                five_days_ago_formatted: {
-                    "day": five_days_ago_formatted,
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-            }
-            self.assertEqual(response_json, expected_response)
-
-    def test_get_review_summary_multiple_days_edge_cases(self):
-        now = datetime.now()
-        five_days_ago = datetime.today() - timedelta(days=5)
-        twenty_days_ago = datetime.today() - timedelta(days=20)
-        one_month_ago = datetime.today() - timedelta(days=30)
-        one_month_ago_ts = one_month_ago.timestamp()
-
-        with TestClient(self.app) as client:
-            super().insert_mock_review_segment("123456.random", now.timestamp())
-            super().insert_mock_review_segment(
-                "123457.random", five_days_ago.timestamp()
-            )
-            super().insert_mock_review_segment(
-                "123458.random",
-                twenty_days_ago.timestamp(),
-                None,
-                SeverityEnum.detection,
-            )
-            # One month ago plus 5 seconds fits within the condition (review.start_time > month_ago). Assuming that the endpoint does not take more than 5 seconds to be invoked
-            super().insert_mock_review_segment(
-                "123459.random",
-                one_month_ago_ts + 5,
-                None,
-                SeverityEnum.detection,
-            )
-            # This won't appear in the output since it's not within last month start_time clause (review.start_time > month_ago)
-            super().insert_mock_review_segment("123450.random", one_month_ago_ts)
-            response = client.get("/review/summary")
-            assert response.status_code == 200
-            response_json = response.json()
-            # e.g. '2024-11-24'
-            today_formatted = now.strftime("%Y-%m-%d")
-            # e.g. '2024-11-19'
-            five_days_ago_formatted = five_days_ago.strftime("%Y-%m-%d")
-            # e.g. '2024-11-04'
-            twenty_days_ago_formatted = twenty_days_ago.strftime("%Y-%m-%d")
-            # e.g. '2024-10-24'
-            one_month_ago_formatted = one_month_ago.strftime("%Y-%m-%d")
-            expected_response = {
-                "last24Hours": {
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-                today_formatted: {
-                    "day": today_formatted,
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-                five_days_ago_formatted: {
-                    "day": five_days_ago_formatted,
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-                twenty_days_ago_formatted: {
-                    "day": twenty_days_ago_formatted,
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 0,
-                    "total_detection": 1,
-                },
-                one_month_ago_formatted: {
-                    "day": one_month_ago_formatted,
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 0,
-                    "total_detection": 1,
-                },
-            }
-            self.assertEqual(response_json, expected_response)
-
-    def test_get_review_summary_multiple_in_same_day(self):
-        now = datetime.now()
-        five_days_ago = datetime.today() - timedelta(days=5)
-
-        with TestClient(self.app) as client:
-            super().insert_mock_review_segment("123456.random", now.timestamp())
-            five_days_ago_ts = five_days_ago.timestamp()
-            for i in range(20):
-                super().insert_mock_review_segment(
-                    f"123456_{i}.random_alert",
-                    five_days_ago_ts,
-                    five_days_ago_ts,
-                    SeverityEnum.alert,
-                )
-            for i in range(15):
-                super().insert_mock_review_segment(
-                    f"123456_{i}.random_detection",
-                    five_days_ago_ts,
-                    five_days_ago_ts,
-                    SeverityEnum.detection,
-                )
-            response = client.get("/review/summary")
-            assert response.status_code == 200
-            response_json = response.json()
-            # e.g. '2024-11-24'
-            today_formatted = now.strftime("%Y-%m-%d")
-            # e.g. '2024-11-19'
-            five_days_ago_formatted = five_days_ago.strftime("%Y-%m-%d")
-            expected_response = {
-                "last24Hours": {
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-                today_formatted: {
-                    "day": today_formatted,
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 1,
-                    "total_detection": 0,
-                },
-                five_days_ago_formatted: {
-                    "day": five_days_ago_formatted,
-                    "reviewed_alert": 0,
-                    "reviewed_detection": 0,
-                    "total_alert": 20,
-                    "total_detection": 15,
-                },
-            }
-            self.assertEqual(response_json, expected_response)
-
-    def test_get_review_summary_multiple_in_same_day_with_reviewed(self):
-        five_days_ago = datetime.today() - timedelta(days=5)
-
-        with TestClient(self.app) as client:
-            five_days_ago_ts = five_days_ago.timestamp()
-            for i in range(10):
-                super().insert_mock_review_segment(
-                    f"123456_{i}.random_alert_not_reviewed",
-                    five_days_ago_ts,
-                    five_days_ago_ts,
-                    SeverityEnum.alert,
-                    False,
-                )
-            for i in range(10):
-                super().insert_mock_review_segment(
-                    f"123456_{i}.random_alert_reviewed",
-                    five_days_ago_ts,
-                    five_days_ago_ts,
-                    SeverityEnum.alert,
-                    True,
-                )
-            for i in range(10):
-                super().insert_mock_review_segment(
-                    f"123456_{i}.random_detection_not_reviewed",
-                    five_days_ago_ts,
-                    five_days_ago_ts,
-                    SeverityEnum.detection,
-                    False,
-                )
-            for i in range(5):
-                super().insert_mock_review_segment(
-                    f"123456_{i}.random_detection_reviewed",
-                    five_days_ago_ts,
-                    five_days_ago_ts,
-                    SeverityEnum.detection,
-                    True,
-                )
-            response = client.get("/review/summary")
-            assert response.status_code == 200
-            response_json = response.json()
-            # e.g. '2024-11-19'
-            five_days_ago_formatted = five_days_ago.strftime("%Y-%m-%d")
-            expected_response = {
-                "last24Hours": {
-                    "reviewed_alert": None,
-                    "reviewed_detection": None,
-                    "total_alert": None,
-                    "total_detection": None,
-                },
-                five_days_ago_formatted: {
-                    "day": five_days_ago_formatted,
-                    "reviewed_alert": 10,
-                    "reviewed_detection": 5,
-                    "total_alert": 20,
-                    "total_detection": 15,
-                },
-            }
-            self.assertEqual(response_json, expected_response)
-
-    ####################################################################################################################
-    ###################################  POST reviews/viewed Endpoint   ################################################
-    ####################################################################################################################
-    def test_post_reviews_viewed_no_body(self):
-        with TestClient(self.app) as client:
-            super().insert_mock_review_segment("123456.random")
-            response = client.post("/reviews/viewed")
-            # Missing ids
-            assert response.status_code == 422
-
-    def test_post_reviews_viewed_no_body_ids(self):
-        with TestClient(self.app) as client:
-            super().insert_mock_review_segment("123456.random")
-            body = {"ids": [""]}
-            response = client.post("/reviews/viewed", json=body)
-            # Missing ids
-            assert response.status_code == 422
-
-    def test_post_reviews_viewed_non_existent_id(self):
-        with TestClient(self.app) as client:
-            id = "123456.random"
-            super().insert_mock_review_segment(id)
-            body = {"ids": ["1"]}
-            response = client.post("/reviews/viewed", json=body)
-            assert response.status_code == 200
-            response = response.json()
-            assert response["success"] == True
-            assert response["message"] == "Reviewed multiple items"
-            # Verify that in DB the review segment was not changed
-            review_segment_in_db = (
-                ReviewSegment.select(ReviewSegment.has_been_reviewed)
-                .where(ReviewSegment.id == id)
-                .get()
-            )
-            assert review_segment_in_db.has_been_reviewed == False
-
-    def test_post_reviews_viewed(self):
-        with TestClient(self.app) as client:
-            id = "123456.random"
-            super().insert_mock_review_segment(id)
-            body = {"ids": [id]}
-            response = client.post("/reviews/viewed", json=body)
-            assert response.status_code == 200
-            response = response.json()
-            assert response["success"] == True
-            assert response["message"] == "Reviewed multiple items"
-            # Verify that in DB the review segment was changed
-            review_segment_in_db = (
-                ReviewSegment.select(ReviewSegment.has_been_reviewed)
-                .where(ReviewSegment.id == id)
-                .get()
-            )
-            assert review_segment_in_db.has_been_reviewed == True
-
-    ####################################################################################################################
-    ###################################  POST reviews/delete Endpoint   ################################################
-    ####################################################################################################################
-    def test_post_reviews_delete_no_body(self):
-        with TestClient(self.app) as client:
-            super().insert_mock_review_segment("123456.random")
-            response = client.post("/reviews/delete")
-            # Missing ids
-            assert response.status_code == 422
-
-    def test_post_reviews_delete_no_body_ids(self):
-        with TestClient(self.app) as client:
-            super().insert_mock_review_segment("123456.random")
-            body = {"ids": [""]}
-            response = client.post("/reviews/delete", json=body)
-            # Missing ids
-            assert response.status_code == 422
-
-    def test_post_reviews_delete_non_existent_id(self):
-        with TestClient(self.app) as client:
-            id = "123456.random"
-            super().insert_mock_review_segment(id)
-            body = {"ids": ["1"]}
-            response = client.post("/reviews/delete", json=body)
-            assert response.status_code == 200
-            response_json = response.json()
-            assert response_json["success"] == True
-            assert response_json["message"] == "Deleted review items."
-            # Verify that in DB the review segment was not deleted
-            review_ids_in_db_after = self._get_reviews([id])
-            assert len(review_ids_in_db_after) == 1
-            assert review_ids_in_db_after[0].id == id
-
-    def test_post_reviews_delete(self):
-        with TestClient(self.app) as client:
-            id = "123456.random"
-            super().insert_mock_review_segment(id)
-            body = {"ids": [id]}
-            response = client.post("/reviews/delete", json=body)
-            assert response.status_code == 200
-            response_json = response.json()
-            assert response_json["success"] == True
-            assert response_json["message"] == "Deleted review items."
-            # Verify that in DB the review segment was deleted
-            review_ids_in_db_after = self._get_reviews([id])
-            assert len(review_ids_in_db_after) == 0
-
-    def test_post_reviews_delete_many(self):
-        with TestClient(self.app) as client:
-            ids = ["123456.random", "654321.random"]
-            for id in ids:
-                super().insert_mock_review_segment(id)
-                super().insert_mock_recording(id)
-
-            review_ids_in_db_before = self._get_reviews(ids)
-            recordings_ids_in_db_before = self._get_recordings(ids)
-            assert len(review_ids_in_db_before) == 2
-            assert len(recordings_ids_in_db_before) == 2
-
-            body = {"ids": ids}
-            response = client.post("/reviews/delete", json=body)
-            assert response.status_code == 200
-            response_json = response.json()
-            assert response_json["success"] == True
-            assert response_json["message"] == "Deleted review items."
-
-            # Verify that in DB all review segments and recordings that were passed were deleted
-            review_ids_in_db_after = self._get_reviews(ids)
-            recording_ids_in_db_after = self._get_recordings(ids)
-            assert len(review_ids_in_db_after) == 0
-            assert len(recording_ids_in_db_after) == 0
+            reviews_response = client.get("/review", params=params)
+            assert reviews_response.status_code == 200
+            reviews_in_response = reviews_response.json()
+            assert len(reviews_in_response) == 1
+            assert reviews_in_response[0]["id"] == id

frigate/test/test_http.py

@@ -168,7 +168,7 @@ class TestHttp(unittest.TestCase):
 
         assert event
         assert event["id"] == id
-        assert event["id"] == model_to_dict(Event.get(Event.id == id))["id"]
+        assert event == model_to_dict(Event.get(Event.id == id))
 
     def test_get_bad_event(self):
         app = create_fastapi_app(

frigate/track/tracked_object.py

@@ -13,7 +13,6 @@ from frigate.config import (
     CameraConfig,
     ModelConfig,
 )
-from frigate.review.types import SeverityEnum
 from frigate.util.image import (
     area,
     calculate_region,
@@ -60,27 +59,6 @@ class TrackedObject:
         self.pending_loitering = False
         self.previous = self.to_dict()
 
-    @property
-    def max_severity(self) -> Optional[str]:
-        review_config = self.camera_config.review
-
-        if self.obj_data["label"] in review_config.alerts.labels and (
-            not review_config.alerts.required_zones
-            or set(self.entered_zones) & set(review_config.alerts.required_zones)
-        ):
-            return SeverityEnum.alert
-
-        if (
-            not review_config.detections.labels
-            or self.obj_data["label"] in review_config.detections.labels
-        ) and (
-            not review_config.detections.required_zones
-            or set(self.entered_zones) & set(review_config.detections.required_zones)
-        ):
-            return SeverityEnum.detection
-
-        return None
-
     def _is_false_positive(self):
         # once a true positive, always a true positive
         if not self.false_positive:
@@ -254,7 +232,6 @@ class TrackedObject:
             "attributes": self.attributes,
             "current_attributes": self.obj_data["attributes"],
             "pending_loitering": self.pending_loitering,
-            "max_severity": self.max_severity,
         }
 
         if include_thumbnail:

frigate/util/builtin.py

@@ -13,12 +13,12 @@ import urllib.parse
 from collections.abc import Mapping
 from pathlib import Path
 from typing import Any, Optional, Tuple, Union
-from zoneinfo import ZoneInfoNotFoundError
 
 import numpy as np
 import pytz
 from ruamel.yaml import YAML
 from tzlocal import get_localzone
+from zoneinfo import ZoneInfoNotFoundError
 
 from frigate.const import REGEX_HTTP_CAMERA_USER_PASS, REGEX_RTSP_CAMERA_USER_PASS
 

frigate/util/image.py

@@ -219,35 +219,19 @@ def draw_box_with_label(
     text_width = size[0][0]
     text_height = size[0][1]
     line_height = text_height + size[1]
-    # get frame height
-    frame_height = frame.shape[0]
     # set the text start position
     if position == "ul":
         text_offset_x = x_min
-        text_offset_y = max(0, y_min - (line_height + 8))
+        text_offset_y = 0 if y_min < line_height else y_min - (line_height + 8)
     elif position == "ur":
-        text_offset_x = max(0, x_max - (text_width + 8))
-        text_offset_y = max(0, y_min - (line_height + 8))
+        text_offset_x = x_max - (text_width + 8)
+        text_offset_y = 0 if y_min < line_height else y_min - (line_height + 8)
     elif position == "bl":
         text_offset_x = x_min
-        text_offset_y = min(frame_height - line_height, y_max)
+        text_offset_y = y_max
     elif position == "br":
-        text_offset_x = max(0, x_max - (text_width + 8))
-        text_offset_y = min(frame_height - line_height, y_max)
-    # Adjust position if it overlaps with the box or goes out of frame
-    if position in {"ul", "ur"}:
-        if text_offset_y < y_min + thickness:  # Label overlaps with the box
-            if y_min - (line_height + 8) < 0 and y_max + line_height <= frame_height:
-                # Not enough space above, and there is space below
-                text_offset_y = y_max
-            elif y_min - (line_height + 8) >= 0:
-                # Enough space above, keep the label at the top
-                text_offset_y = max(0, y_min - (line_height + 8))
-    elif position in {"bl", "br"}:
-        if text_offset_y + line_height > frame_height:
-            # If there's not enough space below, try above the box
-            text_offset_y = max(0, y_min - (line_height + 8))
-
+        text_offset_x = x_max - (text_width + 8)
+        text_offset_y = y_max
     # make the coords of the box with a small padding of two pixels
     textbox_coords = (
         (text_offset_x, text_offset_y),

frigate/video.py

@@ -113,7 +113,7 @@ def capture_frames(
         fps.value = frame_rate.eps()
         skipped_fps.value = skipped_eps.eps()
         current_frame.value = datetime.datetime.now().timestamp()
-        frame_name = f"{config.name}_{frame_index}"
+        frame_name = f"{config.name}{frame_index}"
         frame_buffer = frame_manager.write(frame_name)
         try:
             frame_buffer[:] = ffmpeg_process.stdout.read(frame_size)

web/package-lock.json

@@ -72,7 +72,6 @@
         "tailwind-merge": "^2.4.0",
         "tailwind-scrollbar": "^3.1.0",
         "tailwindcss-animate": "^1.0.7",
-        "use-long-press": "^3.2.0",
         "vaul": "^0.9.1",
         "vite-plugin-monaco-editor": "^1.1.0",
         "zod": "^3.23.8"
@@ -8710,15 +8709,6 @@
         "scheduler": ">=0.19.0"
       }
     },
-    "node_modules/use-long-press": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/use-long-press/-/use-long-press-3.2.0.tgz",
-      "integrity": "sha512-uq5o2qFR1VRjHn8Of7Fl344/AGvgk7C5Mcb4aSb1ZRVp6PkgdXJJLdRrlSTJQVkkQcDuqFbFc3mDX4COg7mRTA==",
-      "license": "MIT",
-      "peerDependencies": {
-        "react": ">=16.8.0"
-      }
-    },
     "node_modules/use-sidecar": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.2.tgz",

web/package.json

@@ -78,7 +78,6 @@
     "tailwind-merge": "^2.4.0",
     "tailwind-scrollbar": "^3.1.0",
     "tailwindcss-animate": "^1.0.7",
-    "use-long-press": "^3.2.0",
     "vaul": "^0.9.1",
     "vite-plugin-monaco-editor": "^1.1.0",
     "zod": "^3.23.8"

web/src/api/index.tsx

@@ -29,11 +29,8 @@ export function ApiProvider({ children, options }: ApiProviderType) {
             error.response &&
             [401, 302, 307].includes(error.response.status)
           ) {
-            // redirect to the login page if not already there
-            const loginPage = error.response.headers.get("location") ?? "login";
-            if (window.location.href !== loginPage) {
-              window.location.href = loginPage;
-            }
+            window.location.href =
+              error.response.headers.get("location") ?? "login";
           }
         },
         ...options,

web/src/components/auth/AuthForm.tsx

@@ -63,7 +63,7 @@ export function UserAuthForm({ className, ...props }: UserAuthFormProps) {
           toast.error("Exceeded rate limit. Try again later.", {
             position: "top-center",
           });
-        } else if (err.response?.status === 401) {
+        } else if (err.response?.status === 400) {
           toast.error("Login failed", {
             position: "top-center",
           });

web/src/components/card/SearchThumbnail.tsx

@@ -1,4 +1,4 @@
-import { useMemo } from "react";
+import { useCallback, useMemo } from "react";
 import { useApiHost } from "@/api";
 import { getIconForLabel } from "@/utils/iconUtil";
 import useSWR from "swr";
@@ -12,11 +12,10 @@ import { capitalizeFirstLetter } from "@/utils/stringUtil";
 import { SearchResult } from "@/types/search";
 import { cn } from "@/lib/utils";
 import { TooltipPortal } from "@radix-ui/react-tooltip";
-import useContextMenu from "@/hooks/use-contextmenu";
 
 type SearchThumbnailProps = {
   searchResult: SearchResult;
-  onClick: (searchResult: SearchResult, ctrl: boolean, detail: boolean) => void;
+  onClick: (searchResult: SearchResult) => void;
 };
 
 export default function SearchThumbnail({
@@ -29,9 +28,9 @@ export default function SearchThumbnail({
 
   // interactions
 
-  useContextMenu(imgRef, () => {
-    onClick(searchResult, true, false);
-  });
+  const handleOnClick = useCallback(() => {
+    onClick(searchResult);
+  }, [searchResult, onClick]);
 
   const objectLabel = useMemo(() => {
     if (
@@ -46,10 +45,7 @@ export default function SearchThumbnail({
   }, [config, searchResult]);
 
   return (
-    <div
-      className="relative size-full cursor-pointer"
-      onClick={() => onClick(searchResult, false, true)}
-    >
+    <div className="relative size-full cursor-pointer" onClick={handleOnClick}>
       <ImageLoadingIndicator
         className="absolute inset-0"
         imgLoaded={imgLoaded}
@@ -83,7 +79,7 @@ export default function SearchThumbnail({
                 <div className="mx-3 pb-1 text-sm text-white">
                   <Chip
                     className={`z-0 flex items-center justify-between gap-1 space-x-1 bg-gray-500 bg-gradient-to-br from-gray-400 to-gray-500 text-xs`}
-                    onClick={() => onClick(searchResult, false, true)}
+                    onClick={() => onClick(searchResult)}
                   >
                     {getIconForLabel(objectLabel, "size-3 text-white")}
                     {Math.round(

web/src/components/filter/SearchActionGroup.tsx

@@ -1,132 +0,0 @@
-import { useCallback, useState } from "react";
-import axios from "axios";
-import { Button, buttonVariants } from "../ui/button";
-import { isDesktop } from "react-device-detect";
-import { HiTrash } from "react-icons/hi";
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-} from "../ui/alert-dialog";
-import useKeyboardListener from "@/hooks/use-keyboard-listener";
-import { toast } from "sonner";
-
-type SearchActionGroupProps = {
-  selectedObjects: string[];
-  setSelectedObjects: (ids: string[]) => void;
-  pullLatestData: () => void;
-};
-export default function SearchActionGroup({
-  selectedObjects,
-  setSelectedObjects,
-  pullLatestData,
-}: SearchActionGroupProps) {
-  const onClearSelected = useCallback(() => {
-    setSelectedObjects([]);
-  }, [setSelectedObjects]);
-
-  const onDelete = useCallback(async () => {
-    await axios
-      .delete(`events/`, {
-        data: { event_ids: selectedObjects },
-      })
-      .then((resp) => {
-        if (resp.status == 200) {
-          toast.success("Tracked objects deleted successfully.", {
-            position: "top-center",
-          });
-          setSelectedObjects([]);
-          pullLatestData();
-        }
-      })
-      .catch(() => {
-        toast.error("Failed to delete tracked objects.", {
-          position: "top-center",
-        });
-      });
-  }, [selectedObjects, setSelectedObjects, pullLatestData]);
-
-  const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
-  const [bypassDialog, setBypassDialog] = useState(false);
-
-  useKeyboardListener(["Shift"], (_, modifiers) => {
-    setBypassDialog(modifiers.shift);
-  });
-
-  const handleDelete = useCallback(() => {
-    if (bypassDialog) {
-      onDelete();
-    } else {
-      setDeleteDialogOpen(true);
-    }
-  }, [bypassDialog, onDelete]);
-
-  return (
-    <>
-      <AlertDialog
-        open={deleteDialogOpen}
-        onOpenChange={() => setDeleteDialogOpen(!deleteDialogOpen)}
-      >
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>Confirm Delete</AlertDialogTitle>
-          </AlertDialogHeader>
-          <AlertDialogDescription>
-            Deleting these {selectedObjects.length} tracked objects removes the
-            snapshot, any saved embeddings, and any associated object lifecycle
-            entries. Recorded footage of these tracked objects in History view
-            will <em>NOT</em> be deleted.
-            <br />
-            <br />
-            Are you sure you want to proceed?
-            <br />
-            <br />
-            Hold the <em>Shift</em> key to bypass this dialog in the future.
-          </AlertDialogDescription>
-          <AlertDialogFooter>
-            <AlertDialogCancel>Cancel</AlertDialogCancel>
-            <AlertDialogAction
-              className={buttonVariants({ variant: "destructive" })}
-              onClick={onDelete}
-            >
-              Delete
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-
-      <div className="absolute inset-x-2 inset-y-0 flex items-center justify-between gap-2 bg-background py-2 md:left-auto">
-        <div className="mx-1 flex items-center justify-center text-sm text-muted-foreground">
-          <div className="p-1">{`${selectedObjects.length} selected`}</div>
-          <div className="p-1">{"|"}</div>
-          <div
-            className="cursor-pointer p-2 text-primary hover:rounded-lg hover:bg-secondary"
-            onClick={onClearSelected}
-          >
-            Unselect
-          </div>
-        </div>
-        <div className="flex items-center gap-1 md:gap-2">
-          <Button
-            className="flex items-center gap-2 p-2"
-            aria-label="Delete"
-            size="sm"
-            onClick={handleDelete}
-          >
-            <HiTrash className="text-secondary-foreground" />
-            {isDesktop && (
-              <div className="text-primary">
-                {bypassDialog ? "Delete Now" : "Delete"}
-              </div>
-            )}
-          </Button>
-        </div>
-      </div>
-    </>
-  );
-}

web/src/components/filter/SearchFilterGroup.tsx

@@ -15,15 +15,13 @@ import {
   SearchFilter,
   SearchFilters,
   SearchSource,
-  SearchSortType,
 } from "@/types/search";
 import { DateRange } from "react-day-picker";
 import { cn } from "@/lib/utils";
-import { MdLabel, MdSort } from "react-icons/md";
+import { MdLabel } from "react-icons/md";
 import PlatformAwareDialog from "../overlay/dialog/PlatformAwareDialog";
 import SearchFilterDialog from "../overlay/dialog/SearchFilterDialog";
 import { CalendarRangeFilterButton } from "./CalendarFilterButton";
-import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 
 type SearchFilterGroupProps = {
   className: string;
@@ -109,25 +107,6 @@ export default function SearchFilterGroup({
     [config, allLabels, allZones],
   );
 
-  const availableSortTypes = useMemo(() => {
-    const sortTypes = ["date_asc", "date_desc"];
-    if (filter?.min_score || filter?.max_score) {
-      sortTypes.push("score_desc", "score_asc");
-    }
-    if (filter?.event_id || filter?.query) {
-      sortTypes.push("relevance");
-    }
-    return sortTypes as SearchSortType[];
-  }, [filter]);
-
-  const defaultSortType = useMemo<SearchSortType>(() => {
-    if (filter?.query || filter?.event_id) {
-      return "relevance";
-    } else {
-      return "date_desc";
-    }
-  }, [filter]);
-
   const groups = useMemo(() => {
     if (!config) {
       return [];
@@ -200,16 +179,6 @@ export default function SearchFilterGroup({
         filterValues={filterValues}
         onUpdateFilter={onUpdateFilter}
       />
-      {filters.includes("sort") && Object.keys(filter ?? {}).length > 0 && (
-        <SortTypeButton
-          availableSortTypes={availableSortTypes ?? []}
-          defaultSortType={defaultSortType}
-          selectedSortType={filter?.sort}
-          updateSortType={(newSort) => {
-            onUpdateFilter({ ...filter, sort: newSort });
-          }}
-        />
-      )}
     </div>
   );
 }
@@ -393,176 +362,3 @@ export function GeneralFilterContent({
     </>
   );
 }
-
-type SortTypeButtonProps = {
-  availableSortTypes: SearchSortType[];
-  defaultSortType: SearchSortType;
-  selectedSortType: SearchSortType | undefined;
-  updateSortType: (sortType: SearchSortType | undefined) => void;
-};
-function SortTypeButton({
-  availableSortTypes,
-  defaultSortType,
-  selectedSortType,
-  updateSortType,
-}: SortTypeButtonProps) {
-  const [open, setOpen] = useState(false);
-  const [currentSortType, setCurrentSortType] = useState<
-    SearchSortType | undefined
-  >(selectedSortType as SearchSortType);
-
-  // ui
-
-  useEffect(() => {
-    setCurrentSortType(selectedSortType);
-    // only refresh when state changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [selectedSortType]);
-
-  const trigger = (
-    <Button
-      size="sm"
-      variant={
-        selectedSortType != defaultSortType && selectedSortType != undefined
-          ? "select"
-          : "default"
-      }
-      className="flex items-center gap-2 capitalize"
-      aria-label="Labels"
-    >
-      <MdSort
-        className={`${selectedSortType != defaultSortType && selectedSortType != undefined ? "text-selected-foreground" : "text-secondary-foreground"}`}
-      />
-      <div
-        className={`${selectedSortType != defaultSortType && selectedSortType != undefined ? "text-selected-foreground" : "text-primary"}`}
-      >
-        Sort
-      </div>
-    </Button>
-  );
-  const content = (
-    <SortTypeContent
-      availableSortTypes={availableSortTypes ?? []}
-      defaultSortType={defaultSortType}
-      selectedSortType={selectedSortType}
-      currentSortType={currentSortType}
-      setCurrentSortType={setCurrentSortType}
-      updateSortType={updateSortType}
-      onClose={() => setOpen(false)}
-    />
-  );
-
-  return (
-    <PlatformAwareDialog
-      trigger={trigger}
-      content={content}
-      contentClassName={
-        isDesktop
-          ? "scrollbar-container h-auto max-h-[80dvh] overflow-y-auto"
-          : "max-h-[75dvh] overflow-hidden p-4"
-      }
-      open={open}
-      onOpenChange={(open) => {
-        if (!open) {
-          setCurrentSortType(selectedSortType);
-        }
-
-        setOpen(open);
-      }}
-    />
-  );
-}
-
-type SortTypeContentProps = {
-  availableSortTypes: SearchSortType[];
-  defaultSortType: SearchSortType;
-  selectedSortType: SearchSortType | undefined;
-  currentSortType: SearchSortType | undefined;
-  updateSortType: (sort_type: SearchSortType | undefined) => void;
-  setCurrentSortType: (sort_type: SearchSortType | undefined) => void;
-  onClose: () => void;
-};
-export function SortTypeContent({
-  availableSortTypes,
-  defaultSortType,
-  selectedSortType,
-  currentSortType,
-  updateSortType,
-  setCurrentSortType,
-  onClose,
-}: SortTypeContentProps) {
-  const sortLabels = {
-    date_asc: "Date (Ascending)",
-    date_desc: "Date (Descending)",
-    score_asc: "Object Score (Ascending)",
-    score_desc: "Object Score (Descending)",
-    relevance: "Relevance",
-  };
-
-  return (
-    <>
-      <div className="overflow-x-hidden">
-        <div className="my-2.5 flex flex-col gap-2.5">
-          <RadioGroup
-            value={
-              Array.isArray(currentSortType)
-                ? currentSortType?.[0]
-                : (currentSortType ?? defaultSortType)
-            }
-            defaultValue={defaultSortType}
-            onValueChange={(value) =>
-              setCurrentSortType(value as SearchSortType)
-            }
-            className="w-full space-y-1"
-          >
-            {availableSortTypes.map((value) => (
-              <div className="flex flex-row gap-2">
-                <RadioGroupItem
-                  key={value}
-                  value={value}
-                  id={`sort-${value}`}
-                  className={
-                    value == (currentSortType ?? defaultSortType)
-                      ? "bg-selected from-selected/50 to-selected/90 text-selected"
-                      : "bg-secondary from-secondary/50 to-secondary/90 text-secondary"
-                  }
-                />
-                <Label
-                  htmlFor={`sort-${value}`}
-                  className="flex cursor-pointer items-center space-x-2"
-                >
-                  <span>{sortLabels[value]}</span>
-                </Label>
-              </div>
-            ))}
-          </RadioGroup>
-        </div>
-      </div>
-      <DropdownMenuSeparator />
-      <div className="flex items-center justify-evenly p-2">
-        <Button
-          aria-label="Apply"
-          variant="select"
-          onClick={() => {
-            if (selectedSortType != currentSortType) {
-              updateSortType(currentSortType);
-            }
-
-            onClose();
-          }}
-        >
-          Apply
-        </Button>
-        <Button
-          aria-label="Reset"
-          onClick={() => {
-            setCurrentSortType(undefined);
-            updateSortType(undefined);
-          }}
-        >
-          Reset
-        </Button>
-      </div>
-    </>
-  );
-}

web/src/components/input/InputWithTags.tsx

@@ -18,7 +18,6 @@ import {
   FilterType,
   SavedSearchQuery,
   SearchFilter,
-  SearchSortType,
   SearchSource,
 } from "@/types/search";
 import useSuggestions from "@/hooks/use-suggestions";
@@ -324,9 +323,6 @@ export default function InputWithTags({
           case "event_id":
             newFilters.event_id = value;
             break;
-          case "sort":
-            newFilters.sort = value as SearchSortType;
-            break;
           default:
             // Handle array types (cameras, labels, subLabels, zones)
             if (!newFilters[type]) newFilters[type] = [];

web/src/components/menu/SearchResultActions.tsx

@@ -108,15 +108,13 @@ export default function SearchResultActions({
           </a>
         </MenuItem>
       )}
-      {searchResult.data.type == "object" && (
-        <MenuItem
-          aria-label="Show the object lifecycle"
-          onClick={showObjectLifecycle}
-        >
-          <FaArrowsRotate className="mr-2 size-4" />
-          <span>View object lifecycle</span>
-        </MenuItem>
-      )}
+      <MenuItem
+        aria-label="Show the object lifecycle"
+        onClick={showObjectLifecycle}
+      >
+        <FaArrowsRotate className="mr-2 size-4" />
+        <span>View object lifecycle</span>
+      </MenuItem>
       {config?.semantic_search?.enabled && isContextMenu && (
         <MenuItem
           aria-label="Find similar tracked objects"
@@ -130,7 +128,6 @@ export default function SearchResultActions({
         config?.plus?.enabled &&
         searchResult.has_snapshot &&
         searchResult.end_time &&
-        searchResult.data.type == "object" &&
         !searchResult.plus_id && (
           <MenuItem aria-label="Submit to Frigate Plus" onClick={showSnapshot}>
             <FrigatePlusIcon className="mr-2 size-4 cursor-pointer text-primary" />
@@ -184,24 +181,22 @@ export default function SearchResultActions({
         </ContextMenu>
       ) : (
         <>
-          {config?.semantic_search?.enabled &&
-            searchResult.data.type == "object" && (
-              <Tooltip>
-                <TooltipTrigger>
-                  <MdImageSearch
-                    className="size-5 cursor-pointer text-primary-variant hover:text-primary"
-                    onClick={findSimilar}
-                  />
-                </TooltipTrigger>
-                <TooltipContent>Find similar</TooltipContent>
-              </Tooltip>
-            )}
+          {config?.semantic_search?.enabled && (
+            <Tooltip>
+              <TooltipTrigger>
+                <MdImageSearch
+                  className="size-5 cursor-pointer text-primary-variant hover:text-primary"
+                  onClick={findSimilar}
+                />
+              </TooltipTrigger>
+              <TooltipContent>Find similar</TooltipContent>
+            </Tooltip>
+          )}
 
           {!isMobileOnly &&
             config?.plus?.enabled &&
             searchResult.has_snapshot &&
             searchResult.end_time &&
-            searchResult.data.type == "object" &&
             !searchResult.plus_id && (
               <Tooltip>
                 <TooltipTrigger>

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

@@ -379,7 +379,6 @@ function EventItem({
 
               {event.has_snapshot &&
                 event.plus_id == undefined &&
-                event.data.type == "object" &&
                 config?.plus.enabled && (
                   <Tooltip>
                     <TooltipTrigger>

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

@@ -452,7 +452,7 @@ function ObjectDetailsTab({
             draggable={false}
             src={`${apiHost}api/events/${search.id}/thumbnail.jpg`}
           />
-          {config?.semantic_search.enabled && search.data.type == "object" && (
+          {config?.semantic_search.enabled && (
             <Button
               aria-label="Find similar tracked objects"
               onClick={() => {
@@ -626,67 +626,65 @@ export function ObjectSnapshotTab({
                 </div>
               )}
             </TransformComponent>
-            {search.data.type == "object" &&
-              search.plus_id !== "not_enabled" &&
-              search.end_time && (
-                <Card className="p-1 text-sm md:p-2">
-                  <CardContent className="flex flex-col items-center justify-between gap-3 p-2 md:flex-row">
-                    <div className={cn("flex flex-col space-y-3")}>
-                      <div
-                        className={
-                          "text-lg font-semibold leading-none tracking-tight"
-                        }
-                      >
-                        Submit To Frigate+
-                      </div>
-                      <div className="text-sm text-muted-foreground">
-                        Objects in locations you want to avoid are not false
-                        positives. Submitting them as false positives will
-                        confuse the model.
-                      </div>
+            {search.plus_id !== "not_enabled" && search.end_time && (
+              <Card className="p-1 text-sm md:p-2">
+                <CardContent className="flex flex-col items-center justify-between gap-3 p-2 md:flex-row">
+                  <div className={cn("flex flex-col space-y-3")}>
+                    <div
+                      className={
+                        "text-lg font-semibold leading-none tracking-tight"
+                      }
+                    >
+                      Submit To Frigate+
                     </div>
+                    <div className="text-sm text-muted-foreground">
+                      Objects in locations you want to avoid are not false
+                      positives. Submitting them as false positives will confuse
+                      the model.
+                    </div>
+                  </div>
 
-                    <div className="flex flex-row justify-center gap-2 md:justify-end">
-                      {state == "reviewing" && (
-                        <>
-                          <Button
-                            className="bg-success"
-                            aria-label="Confirm this label for Frigate Plus"
-                            onClick={() => {
-                              setState("uploading");
-                              onSubmitToPlus(false);
-                            }}
-                          >
-                            This is{" "}
-                            {/^[aeiou]/i.test(search?.label || "") ? "an" : "a"}{" "}
-                            {search?.label}
-                          </Button>
-                          <Button
-                            className="text-white"
-                            aria-label="Do not confirm this label for Frigate Plus"
-                            variant="destructive"
-                            onClick={() => {
-                              setState("uploading");
-                              onSubmitToPlus(true);
-                            }}
-                          >
-                            This is not{" "}
-                            {/^[aeiou]/i.test(search?.label || "") ? "an" : "a"}{" "}
-                            {search?.label}
-                          </Button>
-                        </>
-                      )}
-                      {state == "uploading" && <ActivityIndicator />}
-                      {state == "submitted" && (
-                        <div className="flex flex-row items-center justify-center gap-2">
-                          <FaCheckCircle className="text-success" />
-                          Submitted
-                        </div>
-                      )}
-                    </div>
-                  </CardContent>
-                </Card>
-              )}
+                  <div className="flex flex-row justify-center gap-2 md:justify-end">
+                    {state == "reviewing" && (
+                      <>
+                        <Button
+                          className="bg-success"
+                          aria-label="Confirm this label for Frigate Plus"
+                          onClick={() => {
+                            setState("uploading");
+                            onSubmitToPlus(false);
+                          }}
+                        >
+                          This is{" "}
+                          {/^[aeiou]/i.test(search?.label || "") ? "an" : "a"}{" "}
+                          {search?.label}
+                        </Button>
+                        <Button
+                          className="text-white"
+                          aria-label="Do not confirm this label for Frigate Plus"
+                          variant="destructive"
+                          onClick={() => {
+                            setState("uploading");
+                            onSubmitToPlus(true);
+                          }}
+                        >
+                          This is not{" "}
+                          {/^[aeiou]/i.test(search?.label || "") ? "an" : "a"}{" "}
+                          {search?.label}
+                        </Button>
+                      </>
+                    )}
+                    {state == "uploading" && <ActivityIndicator />}
+                    {state == "submitted" && (
+                      <div className="flex flex-row items-center justify-center gap-2">
+                        <FaCheckCircle className="text-success" />
+                        Submitted
+                      </div>
+                    )}
+                  </div>
+                </CardContent>
+              </Card>
+            )}
           </div>
         </TransformWrapper>
       </div>

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

@@ -175,7 +175,7 @@ export default function SearchFilterDialog({
               time_range: undefined,
               zones: undefined,
               sub_labels: undefined,
-              search_type: undefined,
+              search_type: ["thumbnail", "description"],
               min_score: undefined,
               max_score: undefined,
               has_snapshot: undefined,

web/src/hooks/use-overlay-state.tsx

@@ -15,10 +15,7 @@ export function useOverlayState<S>(
     (value: S, replace: boolean = false) => {
       const newLocationState = { ...currentLocationState };
       newLocationState[key] = value;
-      navigate(location.pathname + location.search, {
-        state: newLocationState,
-        replace,
-      });
+      navigate(location.pathname, { state: newLocationState, replace });
     },
     // we know that these deps are correct
     // eslint-disable-next-line react-hooks/exhaustive-deps

web/src/hooks/use-press.ts

@@ -1,54 +0,0 @@
-// https://gist.github.com/cpojer/641bf305e6185006ea453e7631b80f95
-
-import { useCallback, useState } from "react";
-import {
-  LongPressCallbackMeta,
-  LongPressReactEvents,
-  useLongPress,
-} from "use-long-press";
-
-export default function usePress(
-  options: Omit<Parameters<typeof useLongPress>[1], "onCancel" | "onStart"> & {
-    onLongPress: NonNullable<Parameters<typeof useLongPress>[0]>;
-    onPress: (event: LongPressReactEvents<Element>) => void;
-  },
-) {
-  const { onLongPress, onPress, ...actualOptions } = options;
-  const [hasLongPress, setHasLongPress] = useState(false);
-
-  const onCancel = useCallback(() => {
-    if (hasLongPress) {
-      setHasLongPress(false);
-    }
-  }, [hasLongPress]);
-
-  const bind = useLongPress(
-    useCallback(
-      (
-        event: LongPressReactEvents<Element>,
-        meta: LongPressCallbackMeta<unknown>,
-      ) => {
-        setHasLongPress(true);
-        onLongPress(event, meta);
-      },
-      [onLongPress],
-    ),
-    {
-      ...actualOptions,
-      onCancel,
-      onStart: onCancel,
-    },
-  );
-
-  return useCallback(
-    () => ({
-      ...bind(),
-      onClick: (event: LongPressReactEvents<HTMLDivElement>) => {
-        if (!hasLongPress) {
-          onPress(event);
-        }
-      },
-    }),
-    [bind, hasLongPress, onPress],
-  );
-}

web/src/pages/Explore.tsx

@@ -116,7 +116,6 @@ export default function Explore() {
           is_submitted: searchSearchParams["is_submitted"],
           has_clip: searchSearchParams["has_clip"],
           event_id: searchSearchParams["event_id"],
-          sort: searchSearchParams["sort"],
           limit:
             Object.keys(searchSearchParams).length == 0 ? API_LIMIT : undefined,
           timezone,
@@ -149,7 +148,6 @@ export default function Explore() {
         is_submitted: searchSearchParams["is_submitted"],
         has_clip: searchSearchParams["has_clip"],
         event_id: searchSearchParams["event_id"],
-        sort: searchSearchParams["sort"],
         timezone,
         include_thumbnails: 0,
       },
@@ -167,17 +165,12 @@ export default function Explore() {
 
     const [url, params] = searchQuery;
 
-    const isAscending = params.sort?.includes("date_asc");
-
+    // If it's not the first page, use the last item's start_time as the 'before' parameter
     if (pageIndex > 0 && previousPageData) {
       const lastDate = previousPageData[previousPageData.length - 1].start_time;
       return [
         url,
-        {
-          ...params,
-          [isAscending ? "after" : "before"]: lastDate.toString(),
-          limit: API_LIMIT,
-        },
+        { ...params, before: lastDate.toString(), limit: API_LIMIT },
       ];
     }
 

web/src/pages/Live.tsx

@@ -62,7 +62,6 @@ function Live() {
     if (selectedCameraName) {
       const capitalized = selectedCameraName
         .split("_")
-        .filter((text) => text)
         .map((text) => text[0].toUpperCase() + text.substring(1));
       document.title = `${capitalized.join(" ")} - Live - Frigate`;
     } else if (cameraGroup && cameraGroup != "default") {

web/src/types/search.ts

@@ -6,7 +6,6 @@ const SEARCH_FILTERS = [
   "zone",
   "sub",
   "source",
-  "sort",
 ] as const;
 export type SearchFilters = (typeof SEARCH_FILTERS)[number];
 export const DEFAULT_SEARCH_FILTERS: SearchFilters[] = [
@@ -17,18 +16,10 @@ export const DEFAULT_SEARCH_FILTERS: SearchFilters[] = [
   "zone",
   "sub",
   "source",
-  "sort",
 ];
 
 export type SearchSource = "similarity" | "thumbnail" | "description";
 
-export type SearchSortType =
-  | "date_asc"
-  | "date_desc"
-  | "score_asc"
-  | "score_desc"
-  | "relevance";
-
 export type SearchResult = {
   id: string;
   camera: string;
@@ -74,7 +65,6 @@ export type SearchFilter = {
   time_range?: string;
   search_type?: SearchSource[];
   event_id?: string;
-  sort?: SearchSortType;
 };
 
 export const DEFAULT_TIME_RANGE_AFTER = "00:00";
@@ -96,7 +86,6 @@ export type SearchQueryParams = {
   query?: string;
   page?: number;
   time_range?: string;
-  sort?: SearchSortType;
 };
 
 export type SearchQuery = [string, SearchQueryParams] | null;

web/src/views/explore/ExploreView.tsx

@@ -26,7 +26,7 @@ type ExploreViewProps = {
   searchDetail: SearchResult | undefined;
   setSearchDetail: (search: SearchResult | undefined) => void;
   setSimilaritySearch: (search: SearchResult) => void;
-  onSelectSearch: (item: SearchResult, ctrl: boolean, page?: SearchTab) => void;
+  onSelectSearch: (item: SearchResult, index: number, page?: SearchTab) => void;
 };
 
 export default function ExploreView({
@@ -125,7 +125,7 @@ type ThumbnailRowType = {
   setSearchDetail: (search: SearchResult | undefined) => void;
   mutate: () => void;
   setSimilaritySearch: (search: SearchResult) => void;
-  onSelectSearch: (item: SearchResult, ctrl: boolean, page?: SearchTab) => void;
+  onSelectSearch: (item: SearchResult, index: number, page?: SearchTab) => void;
 };
 
 function ThumbnailRow({
@@ -205,7 +205,7 @@ type ExploreThumbnailImageProps = {
   setSearchDetail: (search: SearchResult | undefined) => void;
   mutate: () => void;
   setSimilaritySearch: (search: SearchResult) => void;
-  onSelectSearch: (item: SearchResult, ctrl: boolean, page?: SearchTab) => void;
+  onSelectSearch: (item: SearchResult, index: number, page?: SearchTab) => void;
 };
 function ExploreThumbnailImage({
   event,
@@ -225,11 +225,11 @@ function ExploreThumbnailImage({
   };
 
   const handleShowObjectLifecycle = () => {
-    onSelectSearch(event, false, "object lifecycle");
+    onSelectSearch(event, 0, "object lifecycle");
   };
 
   const handleShowSnapshot = () => {
-    onSelectSearch(event, false, "snapshot");
+    onSelectSearch(event, 0, "snapshot");
   };
 
   return (

web/src/views/search/SearchView.tsx

@@ -30,7 +30,6 @@ import {
 } from "@/components/ui/tooltip";
 import Chip from "@/components/indicators/Chip";
 import { TooltipPortal } from "@radix-ui/react-tooltip";
-import SearchActionGroup from "@/components/filter/SearchActionGroup";
 
 type SearchViewProps = {
   search: string;
@@ -182,53 +181,20 @@ export default function SearchView({
 
   // search interaction
 
-  const [selectedObjects, setSelectedObjects] = useState<string[]>([]);
+  const [selectedIndex, setSelectedIndex] = useState<number | null>(null);
   const itemRefs = useRef<(HTMLDivElement | null)[]>([]);
 
   const onSelectSearch = useCallback(
-    (item: SearchResult, ctrl: boolean, page: SearchTab = "details") => {
-      if (selectedObjects.length > 1 || ctrl) {
-        const index = selectedObjects.indexOf(item.id);
-
-        if (index != -1) {
-          if (selectedObjects.length == 1) {
-            setSelectedObjects([]);
-          } else {
-            const copy = [
-              ...selectedObjects.slice(0, index),
-              ...selectedObjects.slice(index + 1),
-            ];
-            setSelectedObjects(copy);
-          }
-        } else {
-          const copy = [...selectedObjects];
-          copy.push(item.id);
-          setSelectedObjects(copy);
-        }
-      } else {
-        setPage(page);
-        setSearchDetail(item);
-      }
+    (item: SearchResult, index: number, page: SearchTab = "details") => {
+      setPage(page);
+      setSearchDetail(item);
+      setSelectedIndex(index);
     },
-    [selectedObjects],
+    [],
   );
 
-  const onSelectAllObjects = useCallback(() => {
-    if (!uniqueResults || uniqueResults.length == 0) {
-      return;
-    }
-
-    if (selectedObjects.length < uniqueResults.length) {
-      setSelectedObjects(uniqueResults.map((value) => value.id));
-    } else {
-      setSelectedObjects([]);
-    }
-  }, [uniqueResults, selectedObjects]);
-
   useEffect(() => {
-    setSelectedObjects([]);
-    // unselect items when search term or filter changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    setSelectedIndex(0);
   }, [searchTerm, searchFilter]);
 
   // confidence score
@@ -277,44 +243,23 @@ export default function SearchView({
       }
 
       switch (key) {
-        case "a":
-          if (modifiers.ctrl) {
-            onSelectAllObjects();
-          }
-          break;
         case "ArrowLeft":
-          if (uniqueResults.length > 0) {
-            const currentIndex = searchDetail
-              ? uniqueResults.findIndex(
-                  (result) => result.id === searchDetail.id,
-                )
-              : -1;
-
+          setSelectedIndex((prevIndex) => {
             const newIndex =
-              currentIndex === -1
+              prevIndex === null
                 ? uniqueResults.length - 1
-                : (currentIndex - 1 + uniqueResults.length) %
-                  uniqueResults.length;
-
+                : (prevIndex - 1 + uniqueResults.length) % uniqueResults.length;
             setSearchDetail(uniqueResults[newIndex]);
-          }
+            return newIndex;
+          });
           break;
-
         case "ArrowRight":
-          if (uniqueResults.length > 0) {
-            const currentIndex = searchDetail
-              ? uniqueResults.findIndex(
-                  (result) => result.id === searchDetail.id,
-                )
-              : -1;
-
+          setSelectedIndex((prevIndex) => {
             const newIndex =
-              currentIndex === -1
-                ? 0
-                : (currentIndex + 1) % uniqueResults.length;
-
+              prevIndex === null ? 0 : (prevIndex + 1) % uniqueResults.length;
             setSearchDetail(uniqueResults[newIndex]);
-          }
+            return newIndex;
+          });
           break;
         case "PageDown":
           contentRef.current?.scrollBy({
@@ -330,80 +275,32 @@ export default function SearchView({
           break;
       }
     },
-    [uniqueResults, inputFocused, onSelectAllObjects, searchDetail],
+    [uniqueResults, inputFocused],
   );
 
   useKeyboardListener(
-    ["a", "ArrowLeft", "ArrowRight", "PageDown", "PageUp"],
+    ["ArrowLeft", "ArrowRight", "PageDown", "PageUp"],
     onKeyboardShortcut,
     !inputFocused,
   );
 
   // scroll into view
 
-  const [prevSearchDetail, setPrevSearchDetail] = useState<
-    SearchResult | undefined
-  >();
-
-  // keep track of previous ref to outline thumbnail when dialog closes
-  const prevSearchDetailRef = useRef<SearchResult | undefined>();
-
   useEffect(() => {
-    if (searchDetail === undefined && prevSearchDetailRef.current) {
-      setPrevSearchDetail(prevSearchDetailRef.current);
+    if (
+      selectedIndex !== null &&
+      uniqueResults &&
+      itemRefs.current?.[selectedIndex]
+    ) {
+      scrollIntoView(itemRefs.current[selectedIndex], {
+        block: "center",
+        behavior: "smooth",
+        scrollMode: "if-needed",
+      });
     }
-    prevSearchDetailRef.current = searchDetail;
-  }, [searchDetail]);
-
-  useEffect(() => {
-    if (uniqueResults && itemRefs.current && prevSearchDetail) {
-      const selectedIndex = uniqueResults.findIndex(
-        (result) => result.id === prevSearchDetail.id,
-      );
-
-      const parent = itemRefs.current[selectedIndex];
-
-      if (selectedIndex !== -1 && parent) {
-        const target = parent.querySelector(".review-item-ring");
-        if (target) {
-          scrollIntoView(target, {
-            block: "center",
-            behavior: "smooth",
-            scrollMode: "if-needed",
-          });
-          target.classList.add(`outline-selected`);
-          target.classList.remove("outline-transparent");
-
-          setTimeout(() => {
-            target.classList.remove(`outline-selected`);
-            target.classList.add("outline-transparent");
-          }, 3000);
-        }
-      }
-    }
-    // we only want to scroll when the dialog closes
+    // we only want to scroll when the index changes
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [prevSearchDetail]);
-
-  useEffect(() => {
-    if (uniqueResults && itemRefs.current && searchDetail) {
-      const selectedIndex = uniqueResults.findIndex(
-        (result) => result.id === searchDetail.id,
-      );
-
-      const parent = itemRefs.current[selectedIndex];
-
-      if (selectedIndex !== -1 && parent) {
-        scrollIntoView(parent, {
-          block: "center",
-          behavior: "smooth",
-          scrollMode: "if-needed",
-        });
-      }
-    }
-    // we only want to scroll when changing the detail pane
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [searchDetail]);
+  }, [selectedIndex]);
 
   // observer for loading more
 
@@ -472,39 +369,22 @@ export default function SearchView({
         {hasExistingSearch && (
           <ScrollArea className="w-full whitespace-nowrap lg:ml-[35%]">
             <div className="flex flex-row gap-2">
-              {selectedObjects.length == 0 ? (
-                <>
-                  <SearchFilterGroup
-                    className={cn(
-                      "w-full justify-between md:justify-start lg:justify-end",
-                    )}
-                    filter={searchFilter}
-                    onUpdateFilter={onUpdateFilter}
-                  />
-                  <SearchSettings
-                    columns={columns}
-                    setColumns={setColumns}
-                    defaultView={defaultView}
-                    setDefaultView={setDefaultView}
-                    filter={searchFilter}
-                    onUpdateFilter={onUpdateFilter}
-                  />
-                  <ScrollBar orientation="horizontal" className="h-0" />
-                </>
-              ) : (
-                <div
-                  className={cn(
-                    "scrollbar-container flex justify-center gap-2 overflow-x-auto",
-                    "h-10 w-full justify-between md:justify-start lg:justify-end",
-                  )}
-                >
-                  <SearchActionGroup
-                    selectedObjects={selectedObjects}
-                    setSelectedObjects={setSelectedObjects}
-                    pullLatestData={refresh}
-                  />
-                </div>
-              )}
+              <SearchFilterGroup
+                className={cn(
+                  "w-full justify-between md:justify-start lg:justify-end",
+                )}
+                filter={searchFilter}
+                onUpdateFilter={onUpdateFilter}
+              />
+              <SearchSettings
+                columns={columns}
+                setColumns={setColumns}
+                defaultView={defaultView}
+                setDefaultView={setDefaultView}
+                filter={searchFilter}
+                onUpdateFilter={onUpdateFilter}
+              />
+              <ScrollBar orientation="horizontal" className="h-0" />
             </div>
           </ScrollArea>
         )}
@@ -532,14 +412,14 @@ export default function SearchView({
           <div className={gridClassName}>
             {uniqueResults &&
               uniqueResults.map((value, index) => {
-                const selected = selectedObjects.includes(value.id);
+                const selected = selectedIndex === index;
 
                 return (
                   <div
                     key={value.id}
                     ref={(item) => (itemRefs.current[index] = item)}
                     data-start={value.start_time}
-                    className="relative flex flex-col rounded-lg"
+                    className="review-item relative flex flex-col rounded-lg"
                   >
                     <div
                       className={cn(
@@ -548,20 +428,7 @@ export default function SearchView({
                     >
                       <SearchThumbnail
                         searchResult={value}
-                        onClick={(
-                          value: SearchResult,
-                          ctrl: boolean,
-                          detail: boolean,
-                        ) => {
-                          if (detail && selectedObjects.length == 0) {
-                            setSearchDetail(value);
-                          } else {
-                            onSelectSearch(
-                              value,
-                              ctrl || selectedObjects.length > 0,
-                            );
-                          }
-                        }}
+                        onClick={() => onSelectSearch(value, index)}
                       />
                       {(searchTerm ||
                         searchFilter?.search_type?.includes("similarity")) && (
@@ -602,10 +469,10 @@ export default function SearchView({
                         }}
                         refreshResults={refresh}
                         showObjectLifecycle={() =>
-                          onSelectSearch(value, false, "object lifecycle")
+                          onSelectSearch(value, index, "object lifecycle")
                         }
                         showSnapshot={() =>
-                          onSelectSearch(value, false, "snapshot")
+                          onSelectSearch(value, index, "snapshot")
                         }
                       />
                     </div>