frigate/api/event.py

@@ -69,25 +69,6 @@ logger = logging.getLogger(__name__)
 router = APIRouter(tags=[Tags.events])
 
 
-def _build_attribute_filter_clause(attributes: str):
-    filtered_attributes = [
-        attr.strip() for attr in attributes.split(",") if attr.strip()
-    ]
-    attribute_clauses = []
-
-    for attr in filtered_attributes:
-        attribute_clauses.append(Event.data.cast("text") % f'*:"{attr}"*')
-
-        escaped_attr = json.dumps(attr, ensure_ascii=True)[1:-1]
-        if escaped_attr != attr:
-            attribute_clauses.append(Event.data.cast("text") % f'*:"{escaped_attr}"*')
-
-    if not attribute_clauses:
-        return None
-
-    return reduce(operator.or_, attribute_clauses)
-
-
 @router.get(
     "/events",
     response_model=list[EventResponse],
@@ -212,8 +193,13 @@ def events(
 
     if attributes != "all":
         # Custom classification results are stored as data[model_name] = result_value
-        attribute_clause = _build_attribute_filter_clause(attributes)
+        filtered_attributes = attributes.split(",")
-        if attribute_clause is not None:
+        attribute_clauses = []
+
+        for attr in filtered_attributes:
+            attribute_clauses.append(Event.data.cast("text") % f'*:"{attr}"*')
+
+        attribute_clause = reduce(operator.or_, attribute_clauses)
         clauses.append(attribute_clause)
 
     if recognized_license_plate != "all":
@@ -522,7 +508,7 @@ def events_search(
     cameras = params.cameras
     labels = params.labels
     sub_labels = params.sub_labels
-    attributes = unquote(params.attributes)
+    attributes = params.attributes
     zones = params.zones
     after = params.after
     before = params.before
@@ -621,9 +607,13 @@ def events_search(
 
     if attributes != "all":
         # Custom classification results are stored as data[model_name] = result_value
-        attribute_clause = _build_attribute_filter_clause(attributes)
+        filtered_attributes = attributes.split(",")
-        if attribute_clause is not None:
+        attribute_clauses = []
-            event_filters.append(attribute_clause)
+
+        for attr in filtered_attributes:
+            attribute_clauses.append(Event.data.cast("text") % f'*:"{attr}"*')
+
+        event_filters.append(reduce(operator.or_, attribute_clauses))
 
     if zones != "all":
         zone_clauses = []

frigate/events/maintainer.py

@@ -6,7 +6,6 @@ from typing import Dict
 
 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 @@ class EventProcessor(threading.Thread):
                     "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/test/http_api/test_http_event.py

@@ -168,57 +168,6 @@ class TestHttpApp(BaseTestHttp):
             assert events[0]["id"] == id
             assert events[1]["id"] == id2
 
-    def test_get_event_list_match_multilingual_attribute(self):
-        event_id = "123456.zh"
-        attribute = "中文标签"
-
-        with AuthTestClient(self.app) as client:
-            super().insert_mock_event(event_id, data={"custom_attr": attribute})
-
-            events = client.get("/events", params={"attributes": attribute}).json()
-            assert len(events) == 1
-            assert events[0]["id"] == event_id
-
-            events = client.get(
-                "/events", params={"attributes": "%E4%B8%AD%E6%96%87%E6%A0%87%E7%AD%BE"}
-            ).json()
-            assert len(events) == 1
-            assert events[0]["id"] == event_id
-
-    def test_events_search_match_multilingual_attribute(self):
-        event_id = "123456.zh.search"
-        attribute = "中文标签"
-        mock_embeddings = Mock()
-        mock_embeddings.search_thumbnail.return_value = [(event_id, 0.05)]
-
-        self.app.frigate_config.semantic_search.enabled = True
-        self.app.embeddings = mock_embeddings
-
-        with AuthTestClient(self.app) as client:
-            super().insert_mock_event(event_id, data={"custom_attr": attribute})
-
-            events = client.get(
-                "/events/search",
-                params={
-                    "search_type": "similarity",
-                    "event_id": event_id,
-                    "attributes": attribute,
-                },
-            ).json()
-            assert len(events) == 1
-            assert events[0]["id"] == event_id
-
-            events = client.get(
-                "/events/search",
-                params={
-                    "search_type": "similarity",
-                    "event_id": event_id,
-                    "attributes": "%E4%B8%AD%E6%96%87%E6%A0%87%E7%AD%BE",
-                },
-            ).json()
-            assert len(events) == 1
-            assert events[0]["id"] == event_id
-
     def test_get_good_event(self):
         id = "123456.random"
 

frigate/track/object_processing.py

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

frigate/track/tracked_object.py

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