Bump protobuf from 3.20.3 to 5.29.6 in /docker/tensorrt

.github/workflows/pull_request.yml

@@ -10,6 +10,8 @@ on:
 
 env:
   DEFAULT_PYTHON: 3.11
+  REGISTRY: ghcr.io
+  DEV_IMAGE_NAME: ${{ github.repository }}-dev
 
 jobs:
   web_lint:
@@ -78,18 +80,18 @@ jobs:
         uses: actions/checkout@v6
         with:
           persist-credentials: false
-      - uses: actions/setup-node@v6
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2 
         with:
-          node-version: 20.x
-      - name: Install devcontainer cli
-        run: npm install --global @devcontainers/cli
-      - name: Build devcontainer
-        env:
-          DOCKER_BUILDKIT: "1"
-        run: devcontainer build --workspace-folder .
-      - name: Start devcontainer
-        run: devcontainer up --workspace-folder .
-      - name: Run mypy in devcontainer
-        run: devcontainer exec --workspace-folder . bash -lc "python3 -u -m mypy --config-file frigate/mypy.ini frigate"
-      - name: Run unit tests in devcontainer
-        run: devcontainer exec --workspace-folder . bash -lc "python3 -u -m unittest"
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build devcontainer image and run checks
+        uses: devcontainers/ci@v0.3
+        with:
+          imageName: ${{ env.REGISTRY }}/${{ env.DEV_IMAGE_NAME }}
+          cacheFrom: ${{ env.REGISTRY }}/${{ env.DEV_IMAGE_NAME }}
+          push: always
+          runCmd: |-
+            python3 -u -m mypy --config-file frigate/mypy.ini frigate &&
+            python3 -u -m unittest

docker/tensorrt/requirements-amd64.txt

@@ -15,4 +15,4 @@ nvidia_nccl_cu12==2.23.4; platform_machine == 'x86_64'
 nvidia_nvjitlink_cu12==12.5.82; platform_machine == 'x86_64'
 onnx==1.16.*; platform_machine == 'x86_64'
 onnxruntime-gpu==1.22.*; platform_machine == 'x86_64'
-protobuf==3.20.3; platform_machine == 'x86_64'
+protobuf==5.29.6; platform_machine == 'x86_64'

docker/tensorrt/requirements-models-arm64.txt

@@ -1,2 +1,2 @@
 onnx == 1.14.0; platform_machine == 'aarch64'
-protobuf == 3.20.3; platform_machine == 'aarch64'
+protobuf == 5.29.6; platform_machine == 'aarch64'

docs/docs/integrations/mqtt.md

@@ -173,7 +173,8 @@ Message published when [object classification](/configuration/custom_classificat
   "timestamp": 1607123958.748393,
   "model": "person_classifier",
   "sub_label": "delivery_person",
-  "score": 0.87
+  "score": 0.87,
+  "zones": ["front_yard", "driveway"]
 }
 ```
 
@@ -187,10 +188,15 @@ Message published when [object classification](/configuration/custom_classificat
   "timestamp": 1607123958.748393,
   "model": "helmet_detector",
   "attribute": "yes",
-  "score": 0.92
+  "score": 0.92,
+  "zones": ["front_yard"]
 }
 ```
 
+:::note
+The `zones` field is only included if the tracked object is currently in one or more zones.
+:::
+
 ### `frigate/reviews`
 
 Message published for each changed review item. The first message is published when the `detection` or `alert` is initiated.

frigate/data_processing/real_time/custom_classification.py

@@ -613,19 +613,20 @@ def process_frame(self, obj_data, frame):
                     (object_id, consensus_label, consensus_score),
                     EventMetadataTypeEnum.sub_label,
                 )
+                classification_data = {
+                    "type": TrackedObjectUpdateTypesEnum.classification,
+                    "id": object_id,
+                    "camera": camera,
+                    "timestamp": now,
+                    "model": self.model_config.name,
+                    "sub_label": consensus_label,
+                    "score": consensus_score,
+                }
+                if obj_data.get("current_zones"):
+                    classification_data["zones"] = obj_data["current_zones"]
                 self.requestor.send_data(
                     "tracked_object_update",
-                    json.dumps(
-                        {
-                            "type": TrackedObjectUpdateTypesEnum.classification,
-                            "id": object_id,
-                            "camera": camera,
-                            "timestamp": now,
-                            "model": self.model_config.name,
-                            "sub_label": consensus_label,
-                            "score": consensus_score,
-                        }
-                    ),
+                    json.dumps(classification_data),
                 )
             elif (
                 self.model_config.object_config.classification_type
@@ -640,19 +641,20 @@ def process_frame(self, obj_data, frame):
                     ),
                     EventMetadataTypeEnum.attribute.value,
                 )
+                classification_data = {
+                    "type": TrackedObjectUpdateTypesEnum.classification,
+                    "id": object_id,
+                    "camera": camera,
+                    "timestamp": now,
+                    "model": self.model_config.name,
+                    "attribute": consensus_label,
+                    "score": consensus_score,
+                }
+                if obj_data.get("current_zones"):
+                    classification_data["zones"] = obj_data["current_zones"]
                 self.requestor.send_data(
                     "tracked_object_update",
-                    json.dumps(
-                        {
-                            "type": TrackedObjectUpdateTypesEnum.classification,
-                            "id": object_id,
-                            "camera": camera,
-                            "timestamp": now,
-                            "model": self.model_config.name,
-                            "attribute": consensus_label,
-                            "score": consensus_score,
-                        }
-                    ),
+                    json.dumps(classification_data),
                 )
 
     def handle_request(self, topic, request_data):