mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-09-05 17:51:36 +02:00
Use preview frames for Review Descriptions (#19450)
* Use preview frames for genai * Cleanup * Adjust
This commit is contained in:
parent
6c50e69172
commit
6678d167f4
@ -12,7 +12,7 @@ import cv2
|
|||||||
|
|
||||||
from frigate.comms.inter_process import InterProcessRequestor
|
from frigate.comms.inter_process import InterProcessRequestor
|
||||||
from frigate.config import FrigateConfig
|
from frigate.config import FrigateConfig
|
||||||
from frigate.const import CLIPS_DIR, UPDATE_REVIEW_DESCRIPTION
|
from frigate.const import CACHE_DIR, CLIPS_DIR, UPDATE_REVIEW_DESCRIPTION
|
||||||
from frigate.data_processing.types import PostProcessDataEnum
|
from frigate.data_processing.types import PostProcessDataEnum
|
||||||
from frigate.genai import GenAIClient
|
from frigate.genai import GenAIClient
|
||||||
from frigate.util.builtin import EventsPerSecond, InferenceSpeed
|
from frigate.util.builtin import EventsPerSecond, InferenceSpeed
|
||||||
@ -34,7 +34,6 @@ class ReviewDescriptionProcessor(PostProcessorApi):
|
|||||||
super().__init__(config, metrics, None)
|
super().__init__(config, metrics, None)
|
||||||
self.requestor = requestor
|
self.requestor = requestor
|
||||||
self.metrics = metrics
|
self.metrics = metrics
|
||||||
self.tracked_review_items: dict[str, list[tuple[int, bytes]]] = {}
|
|
||||||
self.genai_client = client
|
self.genai_client = client
|
||||||
self.review_desc_speed = InferenceSpeed(self.metrics.review_desc_speed)
|
self.review_desc_speed = InferenceSpeed(self.metrics.review_desc_speed)
|
||||||
self.review_descs_dps = EventsPerSecond()
|
self.review_descs_dps = EventsPerSecond()
|
||||||
@ -54,27 +53,38 @@ class ReviewDescriptionProcessor(PostProcessorApi):
|
|||||||
id = data["after"]["id"]
|
id = data["after"]["id"]
|
||||||
|
|
||||||
if data["type"] == "new" or data["type"] == "update":
|
if data["type"] == "new" or data["type"] == "update":
|
||||||
if id not in self.tracked_review_items:
|
return
|
||||||
self.tracked_review_items[id] = []
|
else:
|
||||||
|
final_data = data["after"]
|
||||||
|
|
||||||
thumb_time = data["after"]["data"]["thumb_time"]
|
|
||||||
thumb_path = data["after"]["thumb_path"]
|
|
||||||
|
|
||||||
if thumb_time and thumb_path:
|
|
||||||
if (
|
if (
|
||||||
len(self.tracked_review_items[id]) > 0
|
final_data["severity"] == "alert"
|
||||||
and self.tracked_review_items[id][0] == thumb_time
|
and not self.config.cameras[camera].review.genai.alerts
|
||||||
|
):
|
||||||
|
return
|
||||||
|
elif (
|
||||||
|
final_data["severity"] == "detection"
|
||||||
|
and not self.config.cameras[camera].review.genai.detections
|
||||||
):
|
):
|
||||||
# we have already processed this thumbnail
|
|
||||||
return
|
return
|
||||||
|
|
||||||
|
frames = self.get_cache_frames(
|
||||||
|
camera, final_data["start_time"], final_data["end_time"]
|
||||||
|
)
|
||||||
|
|
||||||
|
if not frames:
|
||||||
|
frames = [final_data["thumb_path"]]
|
||||||
|
|
||||||
|
thumbs = []
|
||||||
|
|
||||||
|
for idx, thumb_path in enumerate(frames):
|
||||||
thumb_data = cv2.imread(thumb_path)
|
thumb_data = cv2.imread(thumb_path)
|
||||||
ret, jpg = cv2.imencode(
|
ret, jpg = cv2.imencode(
|
||||||
".jpg", thumb_data, [int(cv2.IMWRITE_JPEG_QUALITY), 100]
|
".jpg", thumb_data, [int(cv2.IMWRITE_JPEG_QUALITY), 100]
|
||||||
)
|
)
|
||||||
|
|
||||||
if ret:
|
if ret:
|
||||||
self.tracked_review_items[id].append((thumb_time, jpg.tobytes()))
|
thumbs.append(jpg.tobytes())
|
||||||
|
|
||||||
if self.config.cameras[
|
if self.config.cameras[
|
||||||
data["after"]["camera"]
|
data["after"]["camera"]
|
||||||
@ -87,29 +97,10 @@ class ReviewDescriptionProcessor(PostProcessorApi):
|
|||||||
thumb_path,
|
thumb_path,
|
||||||
os.path.join(
|
os.path.join(
|
||||||
CLIPS_DIR,
|
CLIPS_DIR,
|
||||||
f"genai-requests/{id}/{thumb_time}.webp",
|
f"genai-requests/{id}/{idx}.webp",
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
else:
|
|
||||||
if id not in self.tracked_review_items:
|
|
||||||
return
|
|
||||||
|
|
||||||
final_data = data["after"]
|
|
||||||
|
|
||||||
if (
|
|
||||||
final_data["severity"] == "alert"
|
|
||||||
and not self.config.cameras[camera].review.genai.alerts
|
|
||||||
):
|
|
||||||
self.tracked_review_items.pop(id)
|
|
||||||
return
|
|
||||||
elif (
|
|
||||||
final_data["severity"] == "detection"
|
|
||||||
and not self.config.cameras[camera].review.genai.detections
|
|
||||||
):
|
|
||||||
self.tracked_review_items.pop(id)
|
|
||||||
return
|
|
||||||
|
|
||||||
# kickoff analysis
|
# kickoff analysis
|
||||||
self.review_descs_dps.update()
|
self.review_descs_dps.update()
|
||||||
threading.Thread(
|
threading.Thread(
|
||||||
@ -120,14 +111,47 @@ class ReviewDescriptionProcessor(PostProcessorApi):
|
|||||||
self.review_desc_speed,
|
self.review_desc_speed,
|
||||||
camera,
|
camera,
|
||||||
final_data,
|
final_data,
|
||||||
copy.copy([r[1] for r in self.tracked_review_items[id]]),
|
thumbs,
|
||||||
),
|
),
|
||||||
).start()
|
).start()
|
||||||
self.tracked_review_items.pop(id)
|
|
||||||
|
|
||||||
def handle_request(self, request_data):
|
def handle_request(self, request_data):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
def get_cache_frames(
|
||||||
|
self, camera: str, start_time: float, end_time: float
|
||||||
|
) -> list[str]:
|
||||||
|
preview_dir = os.path.join(CACHE_DIR, "preview_frames")
|
||||||
|
file_start = f"preview_{camera}"
|
||||||
|
start_file = f"{file_start}-{start_time}.webp"
|
||||||
|
end_file = f"{file_start}-{end_time}.webp"
|
||||||
|
all_frames = []
|
||||||
|
|
||||||
|
for file in sorted(os.listdir(preview_dir)):
|
||||||
|
if not file.startswith(file_start):
|
||||||
|
continue
|
||||||
|
|
||||||
|
if file < start_file:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if file > end_file:
|
||||||
|
break
|
||||||
|
|
||||||
|
all_frames.append(os.path.join(preview_dir, file))
|
||||||
|
|
||||||
|
frame_count = len(all_frames)
|
||||||
|
if frame_count <= 10:
|
||||||
|
return all_frames
|
||||||
|
|
||||||
|
selected_frames = []
|
||||||
|
step_size = (frame_count - 1) / 9
|
||||||
|
|
||||||
|
for i in range(10):
|
||||||
|
index = round(i * step_size)
|
||||||
|
selected_frames.append(all_frames[index])
|
||||||
|
|
||||||
|
return selected_frames
|
||||||
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def run_analysis(
|
def run_analysis(
|
||||||
|
@ -70,6 +70,9 @@ class GenAIClient:
|
|||||||
**IMPORTANT:**
|
**IMPORTANT:**
|
||||||
- Values must be plain strings, floats, or integers — no nested objects, no extra commentary.
|
- Values must be plain strings, floats, or integers — no nested objects, no extra commentary.
|
||||||
"""
|
"""
|
||||||
|
logger.debug(
|
||||||
|
f"Sending {len(thumbnails)} images to create review description on {review_data['camera']}"
|
||||||
|
)
|
||||||
response = self._send(context_prompt, thumbnails)
|
response = self._send(context_prompt, thumbnails)
|
||||||
|
|
||||||
if response:
|
if response:
|
||||||
|
@ -356,7 +356,7 @@ def stats_snapshot(
|
|||||||
embeddings_metrics.yolov9_lpr_pps.value, 2
|
embeddings_metrics.yolov9_lpr_pps.value, 2
|
||||||
)
|
)
|
||||||
|
|
||||||
if embeddings_metrics.review_desc_dps.value > 0.0:
|
if embeddings_metrics.review_desc_speed.value > 0.0:
|
||||||
stats["embeddings"]["review_description_speed"] = round(
|
stats["embeddings"]["review_description_speed"] = round(
|
||||||
embeddings_metrics.review_desc_speed.value * 1000, 2
|
embeddings_metrics.review_desc_speed.value * 1000, 2
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user