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

single pass fetch and process

Browse Source
This commit is contained in:
Josh Hawkins 2024-10-05 12:18:49 -05:00
parent 57d0aabd56
commit 3e58a6dfaf
1 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
frigate/api/event.py
View File

@ -539,37 +539,32 @@ def events_search(request: Request, params: EventsSearchQueryParams = Depends())
if search_results: if search_results:
events_query = events_query.where(Event.id << list(search_results.keys())) events_query = events_query.where(Event.id << list(search_results.keys()))
events = events_query.dicts() # Fetch events and process them in a single pass
processed_events = []
# Build the final event list for event in events_query.dicts():
events = [ processed_event = {k: v for k, v in event.items() if k != "data"}
{k: v for k, v in event.items() if k != "data"} processed_event["data"] = {
| { k: v
"data": { for k, v in event["data"].items()
k: v if k in ["type", "score", "top_score", "description"]
for k, v in event["data"].items()
if k in ["type", "score", "top_score", "description"]
}
} }
| (
{
"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
]
# Sort by search distance if search_results are available if event["id"] in search_results:
processed_event["search_distance"] = search_results[event["id"]]["distance"]
processed_event["search_source"] = search_results[event["id"]]["source"]
processed_events.append(processed_event)
# Sort by search distance if search_results are available, otherwise by start_time
if search_results: if search_results:
events = sorted(events, key=lambda x: x.get("search_distance", float("inf"))) processed_events.sort(key=lambda x: x.get("search_distance", float("inf")))
else:
processed_events.sort(key=lambda x: x["start_time"], reverse=True)
# Limit the number of events returned # Limit the number of events returned
events = events[:limit] processed_events = processed_events[:limit]
return JSONResponse(content=events) return JSONResponse(content=processed_events)
@router.get("/events/summary") @router.get("/events/summary")