Various fixes (#14703)

* Fix not retaining custom events * Fix media apis
blakeblackshear · Oct 31, 2024 · ac8ddad · ac8ddad
1 parent 885485d
commit ac8ddad
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/frigate/api/media.py b/frigate/api/media.py
@@ -917,7 +917,7 @@ def grid_snapshot(
         ret, jpg = cv2.imencode(".jpg", frame, [int(cv2.IMWRITE_JPEG_QUALITY), 70])
 
         return Response(
-            jpg.tobytes,
+            jpg.tobytes(),
             media_type="image/jpeg",
             headers={"Cache-Control": "no-store"},
         )
@@ -1453,7 +1453,6 @@ def preview_thumbnail(file_name: str):
 
     return Response(
         jpg_bytes,
-        # FIXME: Shouldn't it be either jpg or webp depending on the endpoint?
         media_type="image/webp",
         headers={
             "Content-Type": "image/webp",
@@ -1482,7 +1481,7 @@ def label_thumbnail(request: Request, camera_name: str, label: str):
         ret, jpg = cv2.imencode(".jpg", frame, [int(cv2.IMWRITE_JPEG_QUALITY), 70])
 
         return Response(
-            jpg.tobytes,
+            jpg.tobytes(),
             media_type="image/jpeg",
             headers={"Cache-Control": "no-store"},
         )
@@ -1535,6 +1534,6 @@ def label_snapshot(request: Request, camera_name: str, label: str):
         _, jpg = cv2.imencode(".jpg", frame, [int(cv2.IMWRITE_JPEG_QUALITY), 70])
 
         return Response(
-            jpg.tobytes,
+            jpg.tobytes(),
             media_type="image/jpeg",
         )
diff --git a/frigate/config/camera/record.py b/frigate/config/camera/record.py
@@ -94,3 +94,10 @@ class RecordConfig(FrigateBaseModel):
     enabled_in_config: Optional[bool] = Field(
         default=None, title="Keep track of original state of recording."
     )
+
+    @property
+    def event_pre_capture(self) -> int:
+        return max(
+            self.alerts.pre_capture,
+            self.detections.pre_capture,
+        )
diff --git a/frigate/events/external.py b/frigate/events/external.py
@@ -70,7 +70,7 @@ def create_manual_event(
                     "sub_label": sub_label,
                     "score": score,
                     "camera": camera,
-                    "start_time": now,
+                    "start_time": now - camera_config.record.event_pre_capture,
                     "end_time": end,
                     "thumbnail": thumbnail,
                     "has_clip": camera_config.record.enabled and include_recording,

diff --git a/frigate/record/maintainer.py b/frigate/record/maintainer.py
@@ -299,16 +299,12 @@ async def validate_and_move_segment(
             # if it doesn't overlap with an event, go ahead and drop the segment
             # if it ends more than the configured pre_capture for the camera
             else:
-                pre_capture = max(
-                    record_config.alerts.pre_capture,
-                    record_config.detections.pre_capture,
-                )
                 camera_info = self.object_recordings_info[camera]
                 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
+                    most_recently_processed_frame_time - record_config.event_pre_capture
                 ).astimezone(datetime.timezone.utc)
                 if end_time < retain_cutoff:
                     Path(cache_path).unlink(missing_ok=True)