From 006569391f372010bb8c2db02a66ca31e2939a4c Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Thu, 10 Mar 2022 05:03:00 -0700
Subject: [PATCH] MQTT support for `all` objects for each camera & zone (#2908)

---
 docs/docs/integrations/mqtt.md |  2 ++
 frigate/object_processing.py   | 49 ++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/docs/docs/integrations/mqtt.md b/docs/docs/integrations/mqtt.md
index ef6c07a42..eed1a2264 100644
--- a/docs/docs/integrations/mqtt.md
+++ b/docs/docs/integrations/mqtt.md
@@ -18,10 +18,12 @@ Causes frigate to exit. Docker should be configured to automatically restart the
 ### `frigate/<camera_name>/<object_name>`
 
 Publishes the count of objects for the camera for use as a sensor in Home Assistant.
+`all` can be used as the object_name for the count of all objects for the camera.
 
 ### `frigate/<zone_name>/<object_name>`
 
 Publishes the count of objects for the zone for use as a sensor in Home Assistant.
+`all` can be used as the object_name for the count of all objects for the zone.
 
 ### `frigate/<camera_name>/<object_name>/snapshot`
 
diff --git a/frigate/object_processing.py b/frigate/object_processing.py
index 37d45e127..759f5909a 100644
--- a/frigate/object_processing.py
+++ b/frigate/object_processing.py
@@ -554,13 +554,24 @@ class CameraState:
             if not obj.false_positive
         )
 
+        # keep track of all labels detected for this camera
+        total_label_count = 0
+
         # report on detected objects
         for obj_name, count in obj_counter.items():
+            total_label_count += count
+
             if count != self.object_counts[obj_name]:
                 self.object_counts[obj_name] = count
                 for c in self.callbacks["object_status"]:
                     c(self.name, obj_name, count)
 
+        # publish for all labels detected for this camera
+        if total_label_count != self.object_counts.get("all"):
+            self.object_counts["all"] = total_label_count
+            for c in self.callbacks["object_status"]:
+                c(self.name, "all", total_label_count)
+
         # expire any objects that are >0 and no longer detected
         expired_objects = [
             obj_name
@@ -568,6 +579,10 @@ class CameraState:
             if count > 0 and obj_name not in obj_counter
         ]
         for obj_name in expired_objects:
+            # Ignore the artificial all label
+            if obj_name == "all":
+                continue
+
             self.object_counts[obj_name] = 0
             for c in self.callbacks["object_status"]:
                 c(self.name, obj_name, 0)
@@ -889,9 +904,14 @@ class TrackedObjectProcessor(threading.Thread):
                     for obj in camera_state.tracked_objects.values()
                     if zone in obj.current_zones and not obj.false_positive
                 )
+                total_label_count = 0
 
                 # update counts and publish status
                 for label in set(self.zone_data[zone].keys()) | set(obj_counter.keys()):
+                    # Ignore the artificial all label
+                    if label == "all":
+                        continue
+
                     # if we have previously published a count for this zone/label
                     zone_label = self.zone_data[zone][label]
                     if camera in zone_label:
@@ -906,6 +926,10 @@ class TrackedObjectProcessor(threading.Thread):
                                 new_count,
                                 retain=False,
                             )
+
+                        # Set the count for the /zone/all topic.
+                        total_label_count += new_count
+
                     # if this is a new zone/label combo for this camera
                     else:
                         if label in obj_counter:
@@ -916,6 +940,31 @@ class TrackedObjectProcessor(threading.Thread):
                                 retain=False,
                             )
 
+                            # Set the count for the /zone/all topic.
+                            total_label_count += obj_counter[label]
+
+                # if we have previously published a count for this zone all labels
+                zone_label = self.zone_data[zone]["all"]
+                if camera in zone_label:
+                    current_count = sum(zone_label.values())
+                    zone_label[camera] = total_label_count
+                    new_count = sum(zone_label.values())
+
+                    if new_count != current_count:
+                        self.client.publish(
+                            f"{self.topic_prefix}/{zone}/all",
+                            new_count,
+                            retain=False,
+                        )
+                # if this is a new zone all label for this camera
+                else:
+                    zone_label[camera] = total_label_count
+                    self.client.publish(
+                        f"{self.topic_prefix}/{zone}/all",
+                        total_label_count,
+                        retain=False,
+                    )
+
             # cleanup event finished queue
             while not self.event_processed_queue.empty():
                 event_id, camera = self.event_processed_queue.get()