administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-15 15:45:27 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix query

Browse Source
This commit is contained in:
Josh Hawkins 2024-10-05 06:46:34 -05:00
parent 6bfee9993e
commit 18e1eca914
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
frigate/api/event.py
View File

@ -525,22 +525,23 @@ def events_search(request: Request, params: EventsSearchQueryParams = Depends())
return JSONResponse(content=[]) return JSONResponse(content=[])
# Fetch events in a single query # Fetch events in a single query
events = ( events_query = Event.select(*selected_columns).join(
Event.select(*selected_columns) ReviewSegment,
.join( JOIN.LEFT_OUTER,
ReviewSegment, on=(fn.json_extract(ReviewSegment.data, "$.detections").contains(Event.id)),
JOIN.LEFT_OUTER,
on=(fn.json_extract(ReviewSegment.data, "$.detections").contains(Event.id)),
)
.where(
(Event.id << list(search_results.keys()))
& reduce(operator.and_, event_filters)
if event_filters
else True
)
.dicts()
) )
# Apply filters, if any
if event_filters:
events_query = events_query.where(reduce(operator.and_, event_filters))
# If we did a similarity search, limit events to those in search_results
if search_results:
events_query = events_query.where(Event.id << list(search_results.keys()))
events = events_query.dicts()
# Build the final event list
events = [ events = [
{k: v for k, v in event.items() if k != "data"} {k: v for k, v in event.items() if k != "data"}
| { | {
@ -550,13 +551,23 @@ def events_search(request: Request, params: EventsSearchQueryParams = Depends())
if k in ["type", "score", "top_score", "description"] if k in ["type", "score", "top_score", "description"]
} }
} }
| { | (
"search_distance": search_results[event["id"]]["distance"], {
"search_source": search_results[event["id"]]["source"], "search_distance": search_results[event["id"]]["distance"],
} "search_source": search_results[event["id"]]["source"],
}
if event["id"] in search_results
else {}
)
for event in events for event in events
] ]
events = sorted(events, key=lambda x: x["search_distance"])[:limit]
# Sort by search distance if search_results are available
if search_results:
events = sorted(events, key=lambda x: x.get("search_distance", float("inf")))
# Limit the number of events returned
events = events[:limit]
return JSONResponse(content=events) return JSONResponse(content=events)