go all in on ruff

.devcontainer/devcontainer.json

@@ -42,7 +42,6 @@
       "extensions": [
         "ms-python.python",
         "ms-python.vscode-pylance",
-        "ms-python.black-formatter",
         "visualstudioexptteam.vscodeintellicode",
         "mhutchie.git-graph",
         "ms-azuretools.vscode-docker",
@@ -53,13 +52,10 @@
         "csstools.postcss",
         "blanu.vscode-styled-jsx",
         "bradlc.vscode-tailwindcss",
-        "ms-python.isort",
         "charliermarsh.ruff"
       ],
       "settings": {
         "remote.autoForwardPorts": false,
-        "python.linting.pylintEnabled": true,
-        "python.linting.enabled": true,
         "python.formatting.provider": "none",
         "python.languageServer": "Pylance",
         "editor.formatOnPaste": false,
@@ -72,7 +68,7 @@
         "eslint.workingDirectories": ["./web"],
         "isort.args": ["--settings-path=./pyproject.toml"],
         "[python]": {
-          "editor.defaultFormatter": "ms-python.black-formatter",
+          "editor.defaultFormatter": "charliermarsh.ruff",
           "editor.formatOnSave": true,
           "editor.codeActionsOnSave": {
             "source.fixAll": true,

.github/workflows/pull_request.yml

@@ -72,13 +72,10 @@ jobs:
         run: |
           python3 -m pip install -U pip
           python3 -m pip install -r docker/main/requirements-dev.txt
-      - name: Check black
+      - name: Check formatting
         run: |
-          black --check --diff frigate migrations docker *.py
+          ruff format --check --diff frigate migrations docker *.py
-      - name: Check isort
+      - name: Check lint
-        run: |
-          isort --check --diff frigate migrations docker *.py
-      - name: Check ruff
         run: |
           ruff check frigate migrations docker *.py
 

docker-compose.yml

@@ -14,13 +14,14 @@ services:
       dockerfile: docker/main/Dockerfile
       # Use target devcontainer-trt for TensorRT dev
       target: devcontainer
-    deploy:
+    ## Uncomment this block for nvidia gpu support
-          resources:
+    # deploy:
-              reservations:
+    #       resources:
-                  devices:
+    #           reservations:
-                      - driver: nvidia
+    #               devices:
-                        count: 1
+    #                   - driver: nvidia
-                        capabilities: [gpu]
+    #                     count: 1
+    #                     capabilities: [gpu]
     environment:
       YOLO_MODELS: yolov7-320
     devices:

docker/main/requirements-dev.txt

@@ -1,3 +1 @@
-black == 23.10.*
-isort
 ruff

frigate/record/maintainer.py

@@ -225,12 +225,8 @@ class RecordingMaintainer(threading.Thread):
 
         # if cached file's start_time is earlier than the retain days for the camera
         if start_time <= (
-            (
             datetime.datetime.now().astimezone(datetime.timezone.utc)
-                - datetime.timedelta(
+            - datetime.timedelta(days=self.config.cameras[camera].record.retain.days)
-                    days=self.config.cameras[camera].record.retain.days
-                )
-            )
         ):
             # if the cached segment overlaps with the events:
             overlaps = False

frigate/util/image.py

@@ -287,17 +287,14 @@ def yuv_crop_and_resize(frame, region, height=None):
     # copy u2
     yuv_cropped_frame[
         size + uv_channel_y_offset : size + uv_channel_y_offset + uv_crop_height,
-        size // 2
+        size // 2 + uv_channel_x_offset : size // 2
-        + uv_channel_x_offset : size // 2
         + uv_channel_x_offset
         + uv_crop_width,
     ] = frame[u2[1] : u2[3], u2[0] : u2[2]]
 
     # copy v1
     yuv_cropped_frame[
-        size
+        size + size // 4 + uv_channel_y_offset : size
-        + size // 4
-        + uv_channel_y_offset : size
         + size // 4
         + uv_channel_y_offset
         + uv_crop_height,
@@ -306,14 +303,11 @@ def yuv_crop_and_resize(frame, region, height=None):
 
     # copy v2
     yuv_cropped_frame[
-        size
+        size + size // 4 + uv_channel_y_offset : size
-        + size // 4
-        + uv_channel_y_offset : size
         + size // 4
         + uv_channel_y_offset
         + uv_crop_height,
-        size // 2
+        size // 2 + uv_channel_x_offset : size // 2
-        + uv_channel_x_offset : size // 2
         + uv_channel_x_offset
         + uv_crop_width,
     ] = frame[v2[1] : v2[3], v2[0] : v2[2]]

pyproject.toml

@@ -1,5 +1,3 @@
-[tool.isort]
-profile = "black"
-
 [tool.ruff]
 ignore = ["E501","E711","E712"]
+extend-select = ["I"]