Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2024-12-23 19:11:14 +01:00
Code Issues Projects Releases Wiki Activity

Fix breakages by manual_event_api branch (#6542)

Browse Source 
* Fix breakages by manual_event_api branch

* More fixes
This commit is contained in:
Nicolas Mowen 2023-05-19 10:59:24 -06:00 committed by GitHub
parent 42f3ee3de5
commit fec1dd3f46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
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 event.data.get("box") is None:
include_annotation = None include_annotation = None
if event.end_time is None: if event.end_time is None:
@ -254,8 +254,7 @@ def send_to_plus(id):
event.save() event.save()
if not include_annotation is None: if not include_annotation is None:
region = event.region box = event.data["box"]
box = event.box
try: try:
current_app.plus_api.add_annotation( current_app.plus_api.add_annotation(
@ -313,11 +312,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 +761,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 +920,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)