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

Fix breakages by manual_event_api branch

Browse Source
This commit is contained in:
Nick Mowen 2023-05-19 09:43:22 -06:00
parent 42f3ee3de5
commit d6a5befca4
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frigate/http.py
View File

@ -198,7 +198,7 @@ def send_to_plus(id):
return make_response(jsonify({"success": False, "message": message}), 404) return make_response(jsonify({"success": False, "message": message}), 404)
# events from before the conversion to relative dimensions cant include annotations # events from before the conversion to relative dimensions cant include annotations
if any(d > 1 for d in event.box): if any(d > 1 for d in event.data["box"]):
include_annotation = None include_annotation = None
if event.end_time is None: if event.end_time is None:
@ -313,11 +313,15 @@ def false_positive(id):
# need to refetch the event now that it has a plus_id # need to refetch the event now that it has a plus_id
event = Event.get(Event.id == id) event = Event.get(Event.id == id)
region = event.region region = event.data["region"]
box = event.box box = event.data["box"]
# provide top score if score is unavailable # provide top score if score is unavailable
score = event.top_score if event.score is None else event.score score = (
(event.data["top_score"] if event.data["top_score"] else event.top_score)
if event.data["score"] is None
else event.data["score"]
)
try: try:
current_app.plus_api.add_false_positive( current_app.plus_api.add_false_positive(
@ -758,6 +762,7 @@ def events():
Event.top_score, Event.top_score,
Event.false_positive, Event.false_positive,
Event.box, Event.box,
Event.data,
] ]
if camera != "all": if camera != "all":
@ -916,6 +921,11 @@ def config():
config["plus"] = {"enabled": current_app.plus_api.is_active()} config["plus"] = {"enabled": current_app.plus_api.is_active()}
for detector, detector_config in config["detectors"].items():
detector_config["model"][
"labelmap"
] = current_app.frigate_config.model.merged_labelmap
return jsonify(config) return jsonify(config)