add release workflow for images

docker/main/build_nginx.sh

@@ -2,7 +2,7 @@
 
 set -euxo pipefail
 
-NGINX_VERSION="1.25.3"
+NGINX_VERSION="1.25.2"
 VOD_MODULE_VERSION="1.31"
 SECURE_TOKEN_MODULE_VERSION="1.5"
 RTMP_MODULE_VERSION="1.2.2"

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

@@ -32,8 +32,6 @@ http {
     gzip_proxied no-cache no-store private expired auth;
     gzip_vary on;
 
-    proxy_cache_path /dev/shm/nginx_cache levels=1:2 keys_zone=api_cache:10m max_size=10m inactive=1m use_temp_path=off;
-
     upstream frigate_api {
         server 127.0.0.1:5001;
         keepalive 1024;
@@ -187,19 +185,6 @@ http {
             proxy_pass http://frigate_api/;
             include proxy.conf;
 
-            proxy_cache api_cache;
-            proxy_cache_lock on;
-            proxy_cache_use_stale updating;
-            proxy_cache_valid 200 5s;
-            proxy_cache_bypass $http_x_cache_bypass;
-            add_header X-Cache-Status $upstream_cache_status;
-
-            location /api/vod/ {
-                proxy_pass http://frigate_api/vod/;
-                include proxy.conf;
-                proxy_cache off;
-            }
-
             location /api/stats {
                 access_log off;
                 rewrite ^/api/(.*)$ $1 break;

docs/docs/configuration/index.md

@@ -231,8 +231,6 @@ detect:
   fps: 5
   # Optional: enables detection for the camera (default: True)
   enabled: True
-  # Optional: Number of consecutive detection hits required for an object to be initialized in the tracker. (default: 1/2 the frame rate)
-  min_initialized: 2
   # Optional: Number of frames without a detection before Frigate considers an object to be gone. (default: 5x the frame rate)
   max_disappeared: 25
   # Optional: Configuration for stationary object tracking

docs/docs/plus/index.md

@@ -9,34 +9,6 @@ With a subscription, and at each annual renewal, you will receive 12 model train
 
 Information on how to integrate Frigate+ with Frigate can be found in the [integrations docs](/integrations/plus).
 
-## Improving your model
-
-You may find that Frigate+ models result in more false positives initially, but by submitting true and false positives, the model will improve. Because a limited number of users submitted images to Frigate+ prior to this launch, you may need to submit several hundred images per camera to see good results. With all the new images now being submitted, future base models will improve as more and more users (including you) submit examples to Frigate+.
-
-False positives can be reduced by submitting **both** true positives and false positives. This will help the model differentiate between what is and isn't correct. You should aim for a target of 80% true positive submissions and 20% false positives across all of your images. If you are experiencing false positives in a specific area, submitting true positives for any object type near that area in similar lighting conditions will help teach the model what that area looks like when no objects are present.
-
-You may find that it's helpful to lower your thresholds a little in order to generate more false/true positives near the threshold value. For example, if you have some false positives that are scoring at 68% and some true positives scoring at 72%, you can try lowering your threshold to 65% and submitting both true and false positives within that range. This will help the model learn and widen the gap between true and false positive scores.
-
-Note that only verified images will be used when training your model. Submitting an image from Frigate as a true or false positive will not verify the image. You still must verify the image in Frigate+ in order for it to be used in training.
-
-In order to request your first model, you will need to have annotated and verified at least 10 images. Each subsequent model request will require that 10 additional images are verified. However, this is the bare minimum. For the best results, you should provide at least 100 verified images per camera. Keep in mind that varying conditions should be included. You will want images from cloudy days, sunny days, dawn, dusk, and night.
-
-As circumstances change, you may need to submit new examples to address new types of false positives. For example, the change from summer days to snowy winter days or other changes such as a new grill or patio furniture may require additional examples and training.
-
-## Properly labeling images
-
-For the best results, follow the following guidelines.
-
-**Label every object in the image**: It is important that you label all objects in each image before verifying. If you don't label a car for example, the model will be taught that part of the image is _not_ a car and it will start to get confused.
-
-**Make tight bounding boxes**: Tighter bounding boxes improve the recognition and ensure that accurate bounding boxes are predicted at runtime.
-
-**Label the full object even when occluded**: If you have a person standing behind a car, label the full person even though a portion of their body may be hidden behind the car. This helps predict accurate bounding boxes and improves zone accuracy and filters at runtime.
-
-**`amazon`, `ups`, and `fedex` should label the logo**: For a Fedex truck, label the truck as a `car` and make a different bounding box just for the Fedex logo. If there are multiple logos, label each of them.
-
-![Fedex Logo](/img/plus/fedex-logo.jpg)
-
 ## Frequently asked questions
 
 ### Are my models trained just on my image uploads? How are they built?
@@ -45,7 +17,7 @@ Frigate+ models are built by fine tuning a base model with the images you have a
 
 ### What is a training credit and how do I use them?
 
-Essentially, `1 training credit = 1 trained model`. When you have uploaded, annotated, and verified additional images and you are ready to train your model, you will submit a model request which will use one credit. The model that is trained will utilize all of the verified images in your account. When new base models are available, it will require the use of a training credit to generate a new user model on the new base model.
+Essentially, `1 training credit = 1 trained model`. When you have uploaded, annotated, and verified additional images and you are ready to train your model, you will submit a model request which will use one credit. The model that is trained will utilize all of the verified images in your account.
 
 ### Are my video feeds sent to the cloud for analysis when using Frigate+ models?
 
@@ -137,3 +109,31 @@ When using Frigate+ models, Frigate will choose the snapshot of a person object
 `amazon`, `ups`, and `fedex` labels are used to automatically assign a sub label to car objects.
 
 ![Fedex Attribute](/img/plus/attribute-example-fedex.jpg)
+
+## Properly labeling images
+
+For the best results, follow the following guidelines.
+
+**Label every object in the image**: It is important that you label all objects in each image before verifying. If you don't label a car for example, the model will be taught that part of the image is _not_ a car and it will start to get confused.
+
+**Make tight bounding boxes**: Tighter bounding boxes improve the recognition and ensure that accurate bounding boxes are predicted at runtime.
+
+**Label the full object even when occluded**: If you have a person standing behind a car, label the full person even though a portion of their body may be hidden behind the car. This helps predict accurate bounding boxes and improves zone accuracy and filters at runtime.
+
+**`amazon`, `ups`, and `fedex` should label the logo**: For a Fedex truck, label the truck as a `car` and make a different bounding box just for the Fedex logo. If there are multiple logos, label each of them.
+
+![Fedex Logo](/img/plus/fedex-logo.jpg)
+
+## Improving your model
+
+You may find that Frigate+ models result in more false positives initially, but by submitting true and false positives, the model will improve. This may be because your cameras don't look quite enough like the user submissions that were used to train the base model. Over time, this will improve as more and more users (including you) submit examples to Frigate+.
+
+False positives can be reduced by submitting **both** true positives and false positives. This will help the model differentiate between what is and isn't correct.
+
+You may find that it's helpful to lower your thresholds a little in order to generate more false/true positives near the threshold value. For example, if you have some false positives that are scoring at 68% and some true positives scoring at 72%, you can try lowering your threshold to 65% and submitting both true and false positives within that range. This will help the model learn and widen the gap between true and false positive scores.
+
+Note that only verified images will be used when training your model. Submitting an image from Frigate as a true or false positive will not verify the image. You still must verify the image in Frigate+ in order for it to be used in training.
+
+In order to request your first model, you will need to have annotated and verified at least 10 images. Each subsequent model request will require that 10 additional images are verified. However, this is the bare minimum. For the best results, you should provide at least 100 verified images per camera. Keep in mind that varying conditions should be included. You will want images from cloudy days, sunny days, dawn, dusk, and night.
+
+As circumstances change, you may need to submit new examples to address new types of false positives. For example, the change from summer days to snowy winter days or other changes such as a new grill or patio furniture may require additional examples and training.

frigate/config.py

@@ -352,9 +352,6 @@ class DetectConfig(FrigateBaseModel):
         default=5, title="Number of frames per second to process through detection."
     )
     enabled: bool = Field(default=True, title="Detection Enabled.")
-    min_initialized: Optional[int] = Field(
-        title="Minimum number of consecutive hits for an object to be initialized by the tracker."
-    )
     max_disappeared: Optional[int] = Field(
         title="Maximum number of frames the object can dissapear before detection ends."
     )
@@ -1146,11 +1143,6 @@ class FrigateConfig(FrigateBaseModel):
                             else DEFAULT_DETECT_DIMENSIONS["height"]
                         )
 
-            # Default min_initialized configuration
-            min_initialized = camera_config.detect.fps / 2
-            if camera_config.detect.min_initialized is None:
-                camera_config.detect.min_initialized = min_initialized
-
             # Default max_disappeared configuration
             max_disappeared = camera_config.detect.fps * 5
             if camera_config.detect.max_disappeared is None:

frigate/events/external.py

@@ -106,10 +106,10 @@ class ExternalEventProcessor:
         # write jpg snapshot with optional annotations
         if draw.get("boxes") and isinstance(draw.get("boxes"), list):
             for box in draw.get("boxes"):
-                x = int(box["box"][0] * camera_config.detect.width)
-                y = int(box["box"][1] * camera_config.detect.height)
-                width = int(box["box"][2] * camera_config.detect.width)
-                height = int(box["box"][3] * camera_config.detect.height)
+                x = box["box"][0] * camera_config.detect.width
+                y = box["box"][1] * camera_config.detect.height
+                width = box["box"][2] * camera_config.detect.width
+                height = box["box"][3] * camera_config.detect.height
 
                 draw_box_with_label(
                     img_frame,

frigate/output.py

@@ -463,7 +463,7 @@ class BirdsEyeFrameManager:
     def calculate_layout(self, cameras_to_add: list[str], coefficient) -> tuple[any]:
         """Calculate the optimal layout for 2+ cameras."""
 
-        def map_layout(camera_layout: list[list[any]], row_height: int):
+        def map_layout(row_height: int):
             """Map the calculated layout."""
             candidate_layout = []
             starting_x = 0
@@ -492,7 +492,7 @@ class BirdsEyeFrameManager:
                         x + scaled_width > self.canvas.width
                         or y + scaled_height > self.canvas.height
                     ):
-                        return x + scaled_width, y + scaled_height, None
+                        return 0, 0, None
 
                     final_row.append((cameras[0], (x, y, scaled_width, scaled_height)))
                     x += scaled_width
@@ -564,24 +564,10 @@ class BirdsEyeFrameManager:
             return None
 
         row_height = int(self.canvas.height / coefficient)
-        total_width, total_height, standard_candidate_layout = map_layout(
-            camera_layout, row_height
-        )
+        total_width, total_height, standard_candidate_layout = map_layout(row_height)
 
         if not standard_candidate_layout:
-            # if standard layout didn't work
-            # try reducing row_height by the % overflow
-            scale_down_percent = max(
-                total_width / self.canvas.width,
-                total_height / self.canvas.height,
-            )
-            row_height = int(row_height / scale_down_percent)
-            total_width, total_height, standard_candidate_layout = map_layout(
-                camera_layout, row_height
-            )
-
-            if not standard_candidate_layout:
-                return None
+            return None
 
         # layout can't be optimized more
         if total_width / self.canvas.width >= 0.99:
@@ -592,7 +578,7 @@ class BirdsEyeFrameManager:
             1 / (total_height / self.canvas.height),
         )
         row_height = int(row_height * scale_up_percent)
-        _, _, scaled_layout = map_layout(camera_layout, row_height)
+        _, _, scaled_layout = map_layout(row_height)
 
         if scaled_layout:
             return scaled_layout

frigate/record/export.py

@@ -6,7 +6,6 @@ import os
 import subprocess as sp
 import threading
 from enum import Enum
-from pathlib import Path
 
 from frigate.config import FrigateConfig
 from frigate.const import EXPORT_DIR, MAX_PLAYLIST_SECONDS
@@ -122,7 +121,6 @@ class RecordingExporter(threading.Thread):
                 f"Failed to export recording for command {' '.join(ffmpeg_cmd)}"
             )
             logger.error(p.stderr)
-            Path(file_name).unlink(missing_ok=True)
             return
 
         logger.debug(f"Updating finalized export {file_name}")

frigate/record/maintainer.py

@@ -260,10 +260,8 @@ class RecordingMaintainer(threading.Thread):
                 most_recently_processed_frame_time = (
                     camera_info[-1][0] if len(camera_info) > 0 else 0
                 )
-                retain_cutoff = datetime.datetime.fromtimestamp(
-                    most_recently_processed_frame_time - pre_capture
-                ).astimezone(datetime.timezone.utc)
-                if end_time.astimezone(datetime.timezone.utc) < retain_cutoff:
+                retain_cutoff = most_recently_processed_frame_time - pre_capture
+                if end_time.timestamp() < retain_cutoff:
                     Path(cache_path).unlink(missing_ok=True)
                     self.end_time_cache.pop(cache_path, None)
         # else retain days includes this segment
@@ -275,11 +273,7 @@ class RecordingMaintainer(threading.Thread):
             )
 
             # ensure delayed segment info does not lead to lost segments
-            if datetime.datetime.fromtimestamp(
-                most_recently_processed_frame_time
-            ).astimezone(datetime.timezone.utc) >= end_time.astimezone(
-                datetime.timezone.utc
-            ):
+            if most_recently_processed_frame_time >= end_time.timestamp():
                 record_mode = self.config.cameras[camera].record.retain.mode
                 return await self.move_segment(
                     camera, start_time, end_time, duration, cache_path, record_mode

frigate/track/norfair_tracker.py

@@ -68,6 +68,7 @@ class NorfairTracker(ObjectTracker):
         self.untracked_object_boxes: list[list[int]] = []
         self.disappeared = {}
         self.positions = {}
+        self.max_disappeared = config.detect.max_disappeared
         self.camera_config = config
         self.detect_config = config.detect
         self.ptz_metrics = ptz_metrics
@@ -80,8 +81,8 @@ class NorfairTracker(ObjectTracker):
         self.tracker = Tracker(
             distance_function=frigate_distance,
             distance_threshold=2.5,
-            initialization_delay=self.detect_config.min_initialized,
-            hit_counter_max=self.detect_config.max_disappeared,
+            initialization_delay=self.detect_config.fps / 2,
+            hit_counter_max=self.max_disappeared,
         )
         if self.ptz_autotracker_enabled.value:
             self.ptz_motion_estimator = PtzMotionEstimator(

frigate/util/builtin.py

@@ -114,8 +114,10 @@ def load_config_with_no_duplicates(raw_config) -> dict:
 
 def clean_camera_user_pass(line: str) -> str:
     """Removes user and password from line."""
-    rtsp_cleaned = re.sub(REGEX_RTSP_CAMERA_USER_PASS, "://*:*@", line)
-    return re.sub(REGEX_HTTP_CAMERA_USER_PASS, "user=*&password=*", rtsp_cleaned)
+    if "rtsp://" in line:
+        return re.sub(REGEX_RTSP_CAMERA_USER_PASS, "://*:*@", line)
+    else:
+        return re.sub(REGEX_HTTP_CAMERA_USER_PASS, "user=*&password=*", line)
 
 
 def escape_special_characters(path: str) -> str:

frigate/video.py

@@ -233,15 +233,14 @@ class CameraWatchdog(threading.Thread):
                 poll = p["process"].poll()
 
                 if self.config.record.enabled and "record" in p["roles"]:
-                    latest_segment_time = self.get_latest_segment_datetime(
+                    latest_segment_time = self.get_latest_segment_timestamp(
                         p.get(
-                            "latest_segment_time",
-                            datetime.datetime.now().astimezone(datetime.timezone.utc),
+                            "latest_segment_time", datetime.datetime.now().timestamp()
                         )
                     )
 
-                    if datetime.datetime.now().astimezone(datetime.timezone.utc) > (
-                        latest_segment_time + datetime.timedelta(seconds=120)
+                    if datetime.datetime.now().timestamp() > (
+                        latest_segment_time + 120
                     ):
                         self.logger.error(
                             f"No new recording segments were created for {self.camera_name} in the last 120s. restarting the ffmpeg record process..."
@@ -289,7 +288,7 @@ class CameraWatchdog(threading.Thread):
         )
         self.capture_thread.start()
 
-    def get_latest_segment_datetime(self, latest_segment: datetime.datetime) -> int:
+    def get_latest_segment_timestamp(self, latest_timestamp) -> int:
         """Checks if ffmpeg is still writing recording segments to cache."""
         cache_files = sorted(
             [
@@ -300,15 +299,13 @@ class CameraWatchdog(threading.Thread):
                 and not d.startswith("clip_")
             ]
         )
-        newest_segment_timestamp = latest_segment
+        newest_segment_timestamp = latest_timestamp
 
         for file in cache_files:
             if self.camera_name in file:
                 basename = os.path.splitext(file)[0]
                 _, date = basename.rsplit("-", maxsplit=1)
-                ts = datetime.datetime.strptime(date, "%Y%m%d%H%M%S").astimezone(
-                    datetime.timezone.utc
-                )
+                ts = datetime.datetime.strptime(date, "%Y%m%d%H%M%S").timestamp()
                 if ts > newest_segment_timestamp:
                     newest_segment_timestamp = ts
 

web/src/api/index.jsx

@@ -7,7 +7,6 @@ import axios from 'axios';
 axios.defaults.baseURL = `${baseUrl}api/`;
 axios.defaults.headers.common = {
   'X-CSRF-TOKEN': 1,
-  'X-CACHE-BYPASS': 1,
 };
 
 export function ApiProvider({ children, options }) {