Merge f54917811d into 3101d5f27b

frigate/track/object_processing.py

@@ -33,6 +33,7 @@ from frigate.config.camera.updater import (
     CameraConfigUpdateEnum,
     CameraConfigUpdateSubscriber,
 )
+from frigate.config.classification import ObjectClassificationType
 from frigate.const import (
     FAST_QUEUE_TIMEOUT,
     UPDATE_CAMERA_ACTIVITY,
@@ -759,8 +760,16 @@ class TrackedObjectProcessor(threading.Thread):
 
             self.update_mqtt_motion(camera, frame_time, motion_boxes)
 
+            attribute_model_names = [
+                name
+                for name, model_config in self.config.classification.custom.items()
+                if model_config.object_config
+                and model_config.object_config.classification_type
+                == ObjectClassificationType.attribute
+            ]
             tracked_objects = [
-                o.to_dict() for o in camera_state.tracked_objects.values()
+                o.to_dict(attribute_model_names=attribute_model_names)
+                for o in camera_state.tracked_objects.values()
             ]
 
             # publish info on this frame

frigate/track/tracked_object.py

@@ -376,15 +376,11 @@ class TrackedObject:
         )
         return (thumb_update, significant_change, path_update, autotracker_update)
 
-    def to_dict(self) -> dict[str, Any]:
-        # Tracking internals excluded from output (centroid, estimate, estimate_velocity)
-        _EXCLUDED_OBJ_DATA_KEYS = {
-            "centroid",
-            "estimate",
-            "estimate_velocity",
-        }
-
-        event: dict[str, Any] = {
+    def to_dict(
+        self,
+        attribute_model_names: list[str] | None = None,
+    ) -> dict[str, Any]:
+        event = {
             "id": self.obj_data["id"],
             "camera": self.camera_config.name,
             "frame_time": self.obj_data["frame_time"],
@@ -418,11 +414,11 @@ class TrackedObject:
             "path_data": self.path_data.copy(),
             "recognized_license_plate": self.obj_data.get("recognized_license_plate"),
         }
-
-        # Add any other obj_data keys (e.g. custom attribute fields) not yet included
-        for key, value in self.obj_data.items():
-            if key not in _EXCLUDED_OBJ_DATA_KEYS and key not in event:
-                event[key] = value
+        if attribute_model_names is not None:
+            for name in attribute_model_names:
+                value = self.obj_data.get(name)
+                if value is not None:
+                    event[name] = value
 
         return event