Rewrite to use a CTE to leverage speedups by using sqllite internal optimization to do a single query instead of a starter query to get distinct labels and a subsequent loop of querys per distinct event labels.

Frigate is currently shipping sqlite 3.46.1, which is above the minimum version 3.25 needed for CTEs.
This commit is contained in:
Greg 2026-05-08 16:18:37 -07:00
parent 48b1426891
commit 311fb1bd19

View File

@ -389,59 +389,46 @@ def events_explore(
limit: int = 10, limit: int = 10,
allowed_cameras: List[str] = Depends(get_allowed_cameras_for_filter), allowed_cameras: List[str] = Depends(get_allowed_cameras_for_filter),
): ):
# get distinct labels for all events if not allowed_cameras:
distinct_labels = ( return JSONResponse(content=[])
Event.select(Event.label)
.where(Event.camera << allowed_cameras) # Single query: per-label COUNT and top-N ranking by start_time computed
.distinct() # via window functions in a CTE, then filtered to rn <= limit. Replaces
.order_by(Event.label) # the previous loop that issued 2 queries per distinct label.
camera_placeholders = ",".join(["?"] * len(allowed_cameras))
sql = f"""
WITH ranked AS (
SELECT
id, camera, label, sub_label, zones, start_time, end_time,
has_clip, has_snapshot, plus_id, retain_indefinitely,
top_score, false_positive, box, data,
COUNT(*) OVER (PARTITION BY label) AS event_count,
ROW_NUMBER() OVER (
PARTITION BY label ORDER BY start_time DESC
) AS rn
FROM event
WHERE camera IN ({camera_placeholders})
) )
SELECT * FROM ranked
WHERE rn <= ?
ORDER BY event_count DESC, start_time DESC
"""
label_counts = {} allowed_data_keys = {
"type",
"score",
"top_score",
"description",
"sub_label_score",
"average_estimated_speed",
"velocity_angle",
"path_data",
"recognized_license_plate",
"recognized_license_plate_score",
}
explore_columns = ( processed_events = [
Event.id, {
Event.camera,
Event.label,
Event.sub_label,
Event.zones,
Event.start_time,
Event.end_time,
Event.has_clip,
Event.has_snapshot,
Event.plus_id,
Event.retain_indefinitely,
Event.top_score,
Event.false_positive,
Event.box,
Event.data,
)
def event_generator():
for label_obj in distinct_labels.iterator():
label = label_obj.label
# get most recent events for this label
label_events = (
Event.select(*explore_columns)
.where((Event.label == label) & (Event.camera << allowed_cameras))
.order_by(Event.start_time.desc())
.limit(limit)
.iterator()
)
# count total events for this label
label_counts[label] = (
Event.select()
.where((Event.label == label) & (Event.camera << allowed_cameras))
.count()
)
yield from label_events
def process_events():
for event in event_generator():
processed_event = {
"id": event.id, "id": event.id,
"camera": event.camera, "camera": event.camera,
"label": event.label, "label": event.label,
@ -458,31 +445,13 @@ def events_explore(
"box": event.box, "box": event.box,
"data": { "data": {
k: v k: v
for k, v in event.data.items() for k, v in (event.data or {}).items()
if k if k in allowed_data_keys
in [
"type",
"score",
"top_score",
"description",
"sub_label_score",
"average_estimated_speed",
"velocity_angle",
"path_data",
"recognized_license_plate",
"recognized_license_plate_score",
]
}, },
"event_count": label_counts[event.label], "event_count": event.event_count,
} }
yield processed_event for event in Event.raw(sql, *allowed_cameras, limit)
]
# convert iterator to list and sort
processed_events = sorted(
process_events(),
key=lambda x: (x["event_count"], x["start_time"]),
reverse=True,
)
return JSONResponse(content=processed_events) return JSONResponse(content=processed_events)