Merge branch 'dev' into 230523-optimize-sync-records

.github/workflows/pull_request.yml

@@ -79,6 +79,10 @@ jobs:
   python_tests:
     runs-on: ubuntu-latest
     name: Python Tests
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [amd64,arm64]
     steps:
       - name: Check out code
         uses: actions/checkout@v3
@@ -90,13 +94,22 @@ jobs:
       - name: Build web
         run: npm run build
         working-directory: ./web
+      - run: make version
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Build
-        run: make
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: false
+          load: true
+          platforms: linux/${{ matrix.platform }}
+          tags: |
+            frigate:${{ matrix.platform }}
+          target: frigate
       - name: Run mypy
-        run: docker run --rm --entrypoint=python3 frigate:latest -u -m mypy --config-file frigate/mypy.ini frigate
+        run: docker run --platform linux/${{ matrix.platform }} --rm --entrypoint=python3 frigate:${{ matrix.platform }} -u -m mypy --config-file frigate/mypy.ini frigate
       - name: Run tests
-        run: docker run --rm --entrypoint=python3 frigate:latest -u -m unittest
+        run: docker run --platform linux/${{ matrix.platform }} --rm --entrypoint=python3 frigate:${{ matrix.platform }} -u -m unittest

frigate/detectors/plugins/cpu_tfl.py

@@ -3,7 +3,7 @@ import numpy as np
 
 from frigate.detectors.detection_api import DetectionApi
 from frigate.detectors.detector_config import BaseDetectorConfig
-from typing import Literal
+from typing_extensions import Literal
 from pydantic import Extra, Field
 
 try:

frigate/detectors/plugins/deepstack.py

@@ -5,7 +5,7 @@ import io
 
 from frigate.detectors.detection_api import DetectionApi
 from frigate.detectors.detector_config import BaseDetectorConfig
-from typing import Literal
+from typing_extensions import Literal
 from pydantic import Extra, Field
 from PIL import Image
 
@@ -50,7 +50,10 @@ class DeepStack(DetectionApi):
             image_bytes = output.getvalue()
         data = {"api_key": self.api_key}
         response = requests.post(
-            self.api_url, files={"image": image_bytes}, timeout=self.api_timeout
+            self.api_url,
+            data=data,
+            files={"image": image_bytes},
+            timeout=self.api_timeout,
         )
         response_json = response.json()
         detections = np.zeros((20, 6), np.float32)

frigate/detectors/plugins/edgetpu_tfl.py

@@ -3,7 +3,7 @@ import numpy as np
 
 from frigate.detectors.detection_api import DetectionApi
 from frigate.detectors.detector_config import BaseDetectorConfig
-from typing import Literal
+from typing_extensions import Literal
 from pydantic import Extra, Field
 
 try:

frigate/detectors/plugins/openvino.py

@@ -4,7 +4,7 @@ import openvino.runtime as ov
 
 from frigate.detectors.detection_api import DetectionApi
 from frigate.detectors.detector_config import BaseDetectorConfig, ModelTypeEnum
-from typing import Literal
+from typing_extensions import Literal
 from pydantic import Extra, Field
 
 

frigate/detectors/plugins/tensorrt.py

@@ -13,7 +13,7 @@ except ModuleNotFoundError as e:
 
 from frigate.detectors.detection_api import DetectionApi
 from frigate.detectors.detector_config import BaseDetectorConfig
-from typing import Literal
+from typing_extensions import Literal
 from pydantic import Field
 
 logger = logging.getLogger(__name__)