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

address PR comment on thumb search param name

Browse Source
This commit is contained in:
Jason Hunter 2023-12-21 21:37:51 -05:00
parent 4ff0c3afa3
commit 8de27ab1e5
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/docs/integrations/api.md
View File

@ -175,7 +175,7 @@ Events from the database. Accepts the following query string parameters:
| `min_length` | float | Minimum length of the event | | `min_length` | float | Minimum length of the event |
| `max_length` | float | Maximum length of the event | | `max_length` | float | Maximum length of the event |
| `search` | str | Search query for semantic search | | `search` | str | Search query for semantic search |
| `like` | str | Event ID for thumbnail similarity search | | `thumb_like` | str | Event ID for thumbnail similarity search |
### `GET /api/timeline` ### `GET /api/timeline`

6
frigate/http.py
View File

@ -1056,7 +1056,7 @@ def events():
max_length = request.args.get("max_length", type=float) max_length = request.args.get("max_length", type=float)
search = request.args.get("search", type=str) or None search = request.args.get("search", type=str) or None
search_type = request.args.get("search_type", "all") search_type = request.args.get("search_type", "all")
like = request.args.get("like", type=str) or None thumb_like = request.args.get("thumb_like", type=str) or None
clauses = [] clauses = []
@ -1219,10 +1219,10 @@ def events():
elif len(embeddings_filters) == 1: elif len(embeddings_filters) == 1:
where = embeddings_filters[0] where = embeddings_filters[0]
if like is not None: if thumb_like is not None:
# Grab the ids of events that match the thumbnail image embeddings # Grab the ids of events that match the thumbnail image embeddings
thumbnails: Collection = current_app.embeddings.thumbnail thumbnails: Collection = current_app.embeddings.thumbnail
search_event = Event.get(Event.id == like) search_event = Event.get(Event.id == thumb_like)
thumbnail = base64.b64decode(search_event.thumbnail) thumbnail = base64.b64decode(search_event.thumbnail)
img = np.array(Image.open(io.BytesIO(thumbnail)).convert("RGB")) img = np.array(Image.open(io.BytesIO(thumbnail)).convert("RGB"))
thumb_result: QueryResult = thumbnails.query( thumb_result: QueryResult = thumbnails.query(

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

@ -274,10 +274,10 @@ export default function Events({ path, ...props }) {
if (e) { if (e) {
e.stopPropagation(); e.stopPropagation();
} }
if (searchParams?.like == event_id) { if (searchParams?.thumb_like == event_id) {
return; return;
} }
onFilter('like', event_id); onFilter('thumb_like', event_id);
}; };
const showSubmitToPlus = (event_id, label, box, e) => { const showSubmitToPlus = (event_id, label, box, e) => {
@ -310,7 +310,7 @@ export default function Events({ path, ...props }) {
(name, value) => { (name, value) => {
setShowInProgress(false); setShowInProgress(false);
const updatedParams = { ...searchParams, [name]: value }; const updatedParams = { ...searchParams, [name]: value };
if (name !== 'like') delete updatedParams['like']; if (name !== 'thumb_like') delete updatedParams['thumb_like'];
setSearchParams(updatedParams); setSearchParams(updatedParams);
const queryString = Object.keys(updatedParams) const queryString = Object.keys(updatedParams)
.map((key) => { .map((key) => {
@ -336,7 +336,7 @@ export default function Events({ path, ...props }) {
const isDone = const isDone =
(eventPages?.[eventPages.length - 1]?.length ?? 0) < API_LIMIT || (eventPages?.[eventPages.length - 1]?.length ?? 0) < API_LIMIT ||
(searchParams?.search?.length ?? 0) > 0 || (searchParams?.search?.length ?? 0) > 0 ||
(searchParams?.like?.length ?? 0) > 0; (searchParams?.thumb_like?.length ?? 0) > 0;
// hooks for infinite scroll // hooks for infinite scroll
const observer = useRef(); const observer = useRef();