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

fix issue where similarity would limit events before sorting returning wrong results

Browse Source
This commit is contained in:
Jason Hunter 2023-12-19 15:32:45 -05:00
parent 4e6495fedb
commit 5ac1baaba3
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frigate/http.py
View File

@ -477,7 +477,8 @@ def set_description(id):
# If semantic search is enabled, update the index # If semantic search is enabled, update the index
if current_app.embeddings is not None: if current_app.embeddings is not None:
current_app.embeddings.description.upsert( description: Collection = current_app.embeddings.description
description.upsert(
documents=[new_description], documents=[new_description],
metadatas=[get_metadata(event)], metadatas=[get_metadata(event)],
ids=[id], ids=[id],
@ -1039,7 +1040,7 @@ def events():
if zones == "all" and zone != "all": if zones == "all" and zone != "all":
zones = zone zones = zone
limit = request.args.get("limit", 100) limit = request.args.get("limit", 100, type=int)
after = request.args.get("after", type=float) after = request.args.get("after", type=float)
before = request.args.get("before", type=float) before = request.args.get("before", type=float)
time_range = request.args.get("time_range", DEFAULT_TIME_RANGE) time_range = request.args.get("time_range", DEFAULT_TIME_RANGE)
@ -1209,7 +1210,7 @@ def events():
clauses.append((True)) clauses.append((True))
# Handle semantic search # Handle semantic search
event_order = None event_order = {}
if current_app.embeddings is not None: if current_app.embeddings is not None:
where = None where = None
if len(embeddings_filters) > 1: if len(embeddings_filters) > 1:
@ -1266,18 +1267,18 @@ def events():
Event.select(*selected_columns) Event.select(*selected_columns)
.where(reduce(operator.and_, clauses)) .where(reduce(operator.and_, clauses))
.order_by(Event.start_time.desc()) .order_by(Event.start_time.desc())
.limit(limit) .limit(len(event_order) or limit)
.dicts() .dicts()
.iterator() .iterator()
) )
events = list(events) events = list(events)
if event_order is not None: if event_order:
events = [ events = [
{**events, "search_similarity": event_order[events["id"]]} {**events, "search_similarity": event_order[events["id"]]}
for events in events for events in events
] ]
events = sorted(events, key=lambda x: x["search_similarity"]) events = sorted(events, key=lambda x: x["search_similarity"])[:limit]
return jsonify(events) return jsonify(events)

1
web-old/src/routes/Events.jsx
View File

@ -855,6 +855,7 @@ function Event({
<TextArea <TextArea
label="" label=""
value={event.data.description} value={event.data.description}
placeholder="Write the description for this event here..."
onChangeText={(value) => onUpdateDescription(event, value)} onChangeText={(value) => onUpdateDescription(event, value)}
onClick={(e) => e.stopPropagation()} onClick={(e) => e.stopPropagation()}
/> />