From ba5fc7583a855c520c30eaf422433c51de11ace6 Mon Sep 17 00:00:00 2001
From: Nick Mowen <nickmowen213@gmail.com>
Date: Thu, 5 May 2022 22:06:11 -0600
Subject: [PATCH] Cleanups for sub_label http

---
 frigate/http.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/frigate/http.py b/frigate/http.py
index 9183e7489..70eb179ae 100644
--- a/frigate/http.py
+++ b/frigate/http.py
@@ -249,6 +249,24 @@ def set_sub_label(id):
     )
 
 
+@bp.route("/sub_labels")
+def get_sub_labels():
+    try:
+        events = (
+            Event.select(
+                Event.sub_label,
+            ).group_by(Event.sub_label)
+        ).dicts()
+    except Exception as e:
+        return jsonify(
+            {"success": False, "message": f"Failed to get sub_labels: {e}"}, "404"
+        )
+
+    sub_labels = [e["sub_label"] for e in events]
+    sub_labels.remove(None)
+    return jsonify(sub_labels)
+
+
 @bp.route("/events/<id>", methods=("DELETE",))
 def delete_event(id):
     try:
@@ -587,20 +605,6 @@ def mjpeg_feed(camera_name):
         return "Camera named {} not found".format(camera_name), 404
 
 
-@bp.route("/sub_labels")
-def get_sub_labels():
-    try:
-        sub_labels = Event.select(
-            Event.sub_label,
-        ).where(Event.sub_label != None)
-    except:
-        return jsonify(
-            {"success": False, "message": "Failed to get sub_labels"}, "404"
-        )
-
-    return jsonify(sub_labels)
-
-
 @bp.route("/<camera_name>/latest.jpg")
 def latest_frame(camera_name):
     draw_options = {