Revert "Fix saving attributes for object to DB (#22000)"

This reverts commit 73c1e12.

Author: NickM-27

frigate/events/maintainer.py

@@ -6,7 +6,6 @@
 
 from frigate.comms.events_updater import EventEndPublisher, EventUpdateSubscriber
 from frigate.config import FrigateConfig
-from frigate.config.classification import ObjectClassificationType
 from frigate.events.types import EventStateEnum, EventTypeEnum
 from frigate.models import Event
 from frigate.util.builtin import to_relative_box
@@ -248,18 +247,6 @@ def handle_object_detection(
                     "recognized_license_plate"
                 ][1]
 
-            # only overwrite attribute-type custom model fields in the database if they're set
-            for name, model_config in self.config.classification.custom.items():
-                if (
-                    model_config.object_config
-                    and model_config.object_config.classification_type
-                    == ObjectClassificationType.attribute
-                ):
-                    value = event_data.get(name)
-                    if value is not None:
-                        event[Event.data][name] = value[0]
-                        event[Event.data][f"{name}_score"] = value[1]
-
             (
                 Event.insert(event)
                 .on_conflict(

frigate/track/object_processing.py

@@ -33,7 +33,6 @@
     CameraConfigUpdateEnum,
     CameraConfigUpdateSubscriber,
 )
-from frigate.config.classification import ObjectClassificationType
 from frigate.const import (
     FAST_QUEUE_TIMEOUT,
     UPDATE_CAMERA_ACTIVITY,
@@ -760,16 +759,8 @@ def run(self) -> None:
 
             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(attribute_model_names=attribute_model_names)
-                for o in camera_state.tracked_objects.values()
+                o.to_dict() for o in camera_state.tracked_objects.values()
             ]
 
             # publish info on this frame

frigate/track/tracked_object.py

@@ -376,10 +376,7 @@ def update(
         )
         return (thumb_update, significant_change, path_update, autotracker_update)
 
-    def to_dict(
-        self,
-        attribute_model_names: list[str] | None = None,
-    ) -> dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:
         event = {
             "id": self.obj_data["id"],
             "camera": self.camera_config.name,
@@ -414,11 +411,6 @@ def to_dict(
             "path_data": self.path_data.copy(),
             "recognized_license_plate": self.obj_data.get("recognized_license_plate"),
         }
-        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