Merge 9044a61f47 into 8e8346099e

Miscellaneous Fixes (#20973 )
HLS adjustments (#20983 )
2025-12-21 20:46:43 +03:00 · 2025-11-21 11:01:26 +00:00 · 2025-11-20 17:50:17 -06:00 · 2025-11-20 15:58:58 -07:00 · 2025-11-20 15:50:00 -06:00 · 2025-10-21 11:07:43 +00:00
21 changed files with 1081 additions and 423 deletions
--- a/docker/main/rootfs/usr/local/nginx/conf/nginx.conf
+++ b/docker/main/rootfs/usr/local/nginx/conf/nginx.conf
@ -320,6 +320,12 @@ http {
                add_header Cache-Control "public";
            }

+            location /fonts/ {
+                access_log off;
+                expires 1y;
+                add_header Cache-Control "public";
+            }
+
            location /locales/ {
                access_log off;
                add_header Cache-Control "public";
--- a/docs/docs/configuration/genai.md
+++ b/docs/docs/configuration/genai.md
@ -70,7 +70,7 @@ You should have at least 8 GB of RAM available (or VRAM if running on GPU) to ru
 genai:
  provider: ollama
  base_url: http://localhost:11434
-  model: llava:7b
+  model: qwen3-vl:4b
 ```

 ## Google Gemini
--- a/docs/docs/configuration/genai/config.md
+++ b/docs/docs/configuration/genai/config.md
@ -35,19 +35,18 @@ Each model is available in multiple parameter sizes (3b, 4b, 8b, etc.). Larger s

 :::tip

-If you are trying to use a single model for Frigate and HomeAssistant, it will need to support vision and tools calling. https://github.com/skye-harris/ollama-modelfiles contains optimized model configs for this task.
+If you are trying to use a single model for Frigate and HomeAssistant, it will need to support vision and tools calling. qwen3-VL supports vision and tools simultaneously in Ollama.

 :::

 The following models are recommended:

 | Model             | Notes                                                                |
-| ----------------- | ----------------------------------------------------------- |
-| `qwen3-vl`        | Strong visual and situational understanding                 |
+| ----------------- | -------------------------------------------------------------------- |
+| `qwen3-vl`        | Strong visual and situational understanding, higher vram requirement |
 | `Intern3.5VL`     | Relatively fast with good vision comprehension                       |
 | `gemma3`          | Strong frame-to-frame understanding, slower inference times          |
 | `qwen2.5-vl`      | Fast but capable model with good vision comprehension                |
-| `llava-phi3`      | Lightweight and fast model with vision comprehension        |

 :::note

--- a/frigate/stats/util.py
+++ b/frigate/stats/util.py
@ -362,7 +362,7 @@ def stats_snapshot(
            stats["embeddings"]["review_description_speed"] = round(
                embeddings_metrics.review_desc_speed.value * 1000, 2
            )
-            stats["embeddings"]["review_descriptions"] = round(
+            stats["embeddings"]["review_description_events_per_second"] = round(
                embeddings_metrics.review_desc_dps.value, 2
            )

@ -370,7 +370,7 @@ def stats_snapshot(
            stats["embeddings"]["object_description_speed"] = round(
                embeddings_metrics.object_desc_speed.value * 1000, 2
            )
-            stats["embeddings"]["object_descriptions"] = round(
+            stats["embeddings"]["object_description_events_per_second"] = round(
                embeddings_metrics.object_desc_dps.value, 2
            )

@ -378,7 +378,7 @@ def stats_snapshot(
            stats["embeddings"][f"{key}_classification_speed"] = round(
                embeddings_metrics.classification_speeds[key].value * 1000, 2
            )
-            stats["embeddings"][f"{key}_classification"] = round(
+            stats["embeddings"][f"{key}_classification_events_per_second"] = round(
                embeddings_metrics.classification_cps[key].value, 2
            )

--- a/web/package-lock.json
+++ b/web/package-lock.json
@ -95,7 +95,7 @@
        "@types/react-icons": "^3.0.0",
        "@types/react-transition-group": "^4.4.10",
        "@types/strftime": "^0.9.8",
-        "@typescript-eslint/eslint-plugin": "^7.5.0",
+        "@typescript-eslint/eslint-plugin": "^8.46.2",
        "@typescript-eslint/parser": "^7.5.0",
        "@vitejs/plugin-react-swc": "^3.8.0",
        "@vitest/coverage-v8": "^3.0.7",
@ -701,16 +701,20 @@
      }
    },
    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
      "dev": true,
+      "license": "MIT",
      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
      },
      "engines": {
        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
      "peerDependencies": {
        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
      }
@ -3956,88 +3960,119 @@
      "license": "MIT"
    },
    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.12.0.tgz",
-      "integrity": "sha512-7F91fcbuDf/d3S8o21+r3ZncGIke/+eWk0EpO21LXhDfLahriZF9CGj4fbAetEjlaBdjdSm9a6VeXbpbT6Z40Q==",
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.2.tgz",
+      "integrity": "sha512-ZGBMToy857/NIPaaCucIUQgqueOiq7HeAKkhlvqVV4lm089zUFW6ikRySx2v+cAhKeUCPuWVHeimyk6Dw1iY3w==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.12.0",
-        "@typescript-eslint/type-utils": "7.12.0",
-        "@typescript-eslint/utils": "7.12.0",
-        "@typescript-eslint/visitor-keys": "7.12.0",
+        "@typescript-eslint/scope-manager": "8.46.2",
+        "@typescript-eslint/type-utils": "8.46.2",
+        "@typescript-eslint/utils": "8.46.2",
+        "@typescript-eslint/visitor-keys": "8.46.2",
        "graphemer": "^1.4.0",
-        "ignore": "^5.3.1",
+        "ignore": "^7.0.0",
        "natural-compare": "^1.4.0",
-        "ts-api-utils": "^1.3.0"
+        "ts-api-utils": "^2.1.0"
      },
      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      },
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/typescript-eslint"
      },
      "peerDependencies": {
-        "@typescript-eslint/parser": "^7.0.0",
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "@typescript-eslint/parser": "^8.46.2",
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
      }
    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.12.0.tgz",
-      "integrity": "sha512-lib96tyRtMhLxwauDWUp/uW3FMhLA6D0rJ8T7HmH7x23Gk1Gwwu8UZ94NMXBvOELn6flSPiBrCKlehkiXyaqwA==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.2.tgz",
+      "integrity": "sha512-LF4b/NmGvdWEHD2H4MsHD8ny6JpiVNDzrSZr3CsckEgCbAGZbYM4Cqxvi9L+WqDMT+51Ozy7lt2M+d0JLEuBqA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.12.0",
-        "@typescript-eslint/utils": "7.12.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
+        "@typescript-eslint/types": "8.46.2",
+        "@typescript-eslint/visitor-keys": "8.46.2"
      },
      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      },
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
      }
    },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "7.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.12.0.tgz",
-      "integrity": "sha512-Y6hhwxwDx41HNpjuYswYp6gDbkiZ8Hin9Bf5aJQn1bpTs3afYY4GX+MPYxma8jtoIV2GRwTM/UJm/2uGCVv+DQ==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.2.tgz",
+      "integrity": "sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.2.tgz",
+      "integrity": "sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.12.0",
-        "@typescript-eslint/types": "7.12.0",
-        "@typescript-eslint/typescript-estree": "7.12.0"
+        "@typescript-eslint/types": "8.46.2",
+        "eslint-visitor-keys": "^4.2.1"
      },
      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
      },
      "funding": {
        "type": "opencollective",
        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ts-api-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
      },
      "peerDependencies": {
-        "eslint": "^8.56.0"
+        "typescript": ">=4.8.4"
      }
    },
    "node_modules/@typescript-eslint/parser": {
@ -4069,6 +4104,42 @@
        }
      }
    },
+    "node_modules/@typescript-eslint/project-service": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.2.tgz",
+      "integrity": "sha512-PULOLZ9iqwI7hXcmL4fVfIsBi6AN9YxRc0frbvmg8f+4hQAjQ5GYNKK0DIArNo+rOKmR/iBYwkpBmnIwin4wBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.46.2",
+        "@typescript-eslint/types": "^8.46.2",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/project-service/node_modules/@typescript-eslint/types": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.2.tgz",
+      "integrity": "sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
    "node_modules/@typescript-eslint/scope-manager": {
      "version": "7.12.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.12.0.tgz",
@ -4087,6 +4158,161 @@
        "url": "https://opencollective.com/typescript-eslint"
      }
    },
+    "node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.2.tgz",
+      "integrity": "sha512-a7QH6fw4S57+F5y2FIxxSDyi5M4UfGF+Jl1bCGd7+L4KsaUY80GsiF/t0UoRFDHAguKlBaACWJRmdrc6Xfkkag==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.2.tgz",
+      "integrity": "sha512-HbPM4LbaAAt/DjxXaG9yiS9brOOz6fabal4uvUmaUYe6l3K1phQDMQKBRUrr06BQkxkvIZVVHttqiybM9nJsLA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.46.2",
+        "@typescript-eslint/typescript-estree": "8.46.2",
+        "@typescript-eslint/utils": "8.46.2",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.2.tgz",
+      "integrity": "sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.2.tgz",
+      "integrity": "sha512-f7rW7LJ2b7Uh2EiQ+7sza6RDZnajbNbemn54Ob6fRwQbgcIn+GWfyuHDHRYgRoZu1P4AayVScrRW+YfbTvPQoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.46.2",
+        "@typescript-eslint/tsconfig-utils": "8.46.2",
+        "@typescript-eslint/types": "8.46.2",
+        "@typescript-eslint/visitor-keys": "8.46.2",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.2.tgz",
+      "integrity": "sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.46.2",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/type-utils/node_modules/ts-api-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
+      }
+    },
    "node_modules/@typescript-eslint/types": {
      "version": "7.12.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.12.0.tgz",
@ -4156,6 +4382,161 @@
        "url": "https://github.com/sponsors/isaacs"
      }
    },
+    "node_modules/@typescript-eslint/utils": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.2.tgz",
+      "integrity": "sha512-sExxzucx0Tud5tE0XqR0lT0psBQvEpnpiul9XbGUB1QwpWJJAps1O/Z7hJxLGiZLBKMCutjTzDgmd1muEhBnVg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.7.0",
+        "@typescript-eslint/scope-manager": "8.46.2",
+        "@typescript-eslint/types": "8.46.2",
+        "@typescript-eslint/typescript-estree": "8.46.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0",
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.2.tgz",
+      "integrity": "sha512-LF4b/NmGvdWEHD2H4MsHD8ny6JpiVNDzrSZr3CsckEgCbAGZbYM4Cqxvi9L+WqDMT+51Ozy7lt2M+d0JLEuBqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.46.2",
+        "@typescript-eslint/visitor-keys": "8.46.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.2.tgz",
+      "integrity": "sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.2.tgz",
+      "integrity": "sha512-f7rW7LJ2b7Uh2EiQ+7sza6RDZnajbNbemn54Ob6fRwQbgcIn+GWfyuHDHRYgRoZu1P4AayVScrRW+YfbTvPQoQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.46.2",
+        "@typescript-eslint/tsconfig-utils": "8.46.2",
+        "@typescript-eslint/types": "8.46.2",
+        "@typescript-eslint/visitor-keys": "8.46.2",
+        "debug": "^4.3.4",
+        "fast-glob": "^3.3.2",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^2.1.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.46.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.2.tgz",
+      "integrity": "sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.46.2",
+        "eslint-visitor-keys": "^4.2.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@typescript-eslint/utils/node_modules/ts-api-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
+      }
+    },
    "node_modules/@typescript-eslint/visitor-keys": {
      "version": "7.12.0",
      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.12.0.tgz",
--- a/web/package.json
+++ b/web/package.json
@ -101,7 +101,7 @@
    "@types/react-icons": "^3.0.0",
    "@types/react-transition-group": "^4.4.10",
    "@types/strftime": "^0.9.8",
-    "@typescript-eslint/eslint-plugin": "^7.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.46.2",
    "@typescript-eslint/parser": "^7.5.0",
    "@vitejs/plugin-react-swc": "^3.8.0",
    "@vitest/coverage-v8": "^3.0.7",
--- a/web/public/locales/en/views/live.json
+++ b/web/public/locales/en/views/live.json
@ -177,6 +177,10 @@
  "noCameras": {
    "title": "No Cameras Configured",
    "description": "Get started by connecting a camera to Frigate.",
-    "buttonText": "Add Camera"
+    "buttonText": "Add Camera",
+    "restricted": {
+      "title": "No Cameras Available",
+      "description": "You don't have permission to view any cameras in this group."
+    }
  }
 }
--- a/web/public/locales/en/views/system.json
+++ b/web/public/locales/en/views/system.json
@ -169,6 +169,7 @@
  "enrichments": {
    "title": "Enrichments",
    "infPerSecond": "Inferences Per Second",
+    "averageInf": "Average Inference Time",
    "embeddings": {
      "image_embedding": "Image Embedding",
      "text_embedding": "Text Embedding",
@ -180,7 +181,13 @@
      "plate_recognition_speed": "Plate Recognition Speed",
      "text_embedding_speed": "Text Embedding Speed",
      "yolov9_plate_detection_speed": "YOLOv9 Plate Detection Speed",
-      "yolov9_plate_detection": "YOLOv9 Plate Detection"
+      "yolov9_plate_detection": "YOLOv9 Plate Detection",
+      "review_description": "Review Description",
+      "review_description_speed": "Review Description Speed",
+      "review_description_events_per_second": "Review Description",
+      "object_description": "Object Description",
+      "object_description_speed": "Object Description Speed",
+      "object_description_events_per_second": "Object Description"
    }
  }
 }
--- a/web/src/components/filter/CameraGroupSelector.tsx
+++ b/web/src/components/filter/CameraGroupSelector.tsx
@ -9,7 +9,7 @@ import useSWR from "swr";
 import { MdHome } from "react-icons/md";
 import { usePersistedOverlayState } from "@/hooks/use-overlay-state";
 import { Button, buttonVariants } from "../ui/button";
-import { useCallback, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip";
 import { LuPencil, LuPlus } from "react-icons/lu";
 import {
@ -87,6 +87,8 @@ type CameraGroupSelectorProps = {
 export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
  const { t } = useTranslation(["components/camera"]);
  const { data: config } = useSWR<FrigateConfig>("config");
+  const allowedCameras = useAllowedCameras();
+  const isCustomRole = useIsCustomRole();

  // tooltip

@ -119,10 +121,22 @@ export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
      return [];
    }

-    return Object.entries(config.camera_groups).sort(
-      (a, b) => a[1].order - b[1].order,
+    const allGroups = Object.entries(config.camera_groups);
+
+    // If custom role, filter out groups where user has no accessible cameras
+    if (isCustomRole) {
+      return allGroups
+        .filter(([, groupConfig]) => {
+          // Check if user has access to at least one camera in this group
+          return groupConfig.cameras.some((cameraName) =>
+            allowedCameras.includes(cameraName),
          );
-  }, [config]);
+        })
+        .sort((a, b) => a[1].order - b[1].order);
+    }
+
+    return allGroups.sort((a, b) => a[1].order - b[1].order);
+  }, [config, allowedCameras, isCustomRole]);

  // add group

@ -139,6 +153,7 @@ export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
        activeGroup={group}
        setGroup={setGroup}
        deleteGroup={deleteGroup}
+        isCustomRole={isCustomRole}
      />
      <Scroller className={`${isMobile ? "whitespace-nowrap" : ""}`}>
        <div
@ -206,6 +221,7 @@ export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
            );
          })}

+          {!isCustomRole && (
            <Button
              className="bg-secondary text-muted-foreground"
              aria-label={t("group.add")}
@ -214,6 +230,7 @@ export function CameraGroupSelector({ className }: CameraGroupSelectorProps) {
            >
              <LuPlus className="size-4 text-primary" />
            </Button>
+          )}
          {isMobile && <ScrollBar orientation="horizontal" className="h-0" />}
        </div>
      </Scroller>
@ -228,6 +245,7 @@ type NewGroupDialogProps = {
  activeGroup?: string;
  setGroup: (value: string | undefined, replace?: boolean | undefined) => void;
  deleteGroup: () => void;
+  isCustomRole?: boolean;
 };
 function NewGroupDialog({
  open,
@ -236,6 +254,7 @@ function NewGroupDialog({
  activeGroup,
  setGroup,
  deleteGroup,
+  isCustomRole,
 }: NewGroupDialogProps) {
  const { t } = useTranslation(["components/camera"]);
  const { mutate: updateConfig } = useSWR<FrigateConfig>("config");
@ -261,6 +280,12 @@ function NewGroupDialog({
    `${activeGroup}-draggable-layout`,
  );

+  useEffect(() => {
+    if (!open) {
+      setEditState("none");
+    }
+  }, [open]);
+
  // callbacks

  const onDeleteGroup = useCallback(
@ -349,13 +374,7 @@ function NewGroupDialog({
        position="top-center"
        closeButton={true}
      />
-      <Overlay
-        open={open}
-        onOpenChange={(open) => {
-          setEditState("none");
-          setOpen(open);
-        }}
-      >
+      <Overlay open={open} onOpenChange={setOpen}>
        <Content
          className={cn(
            "scrollbar-container overflow-y-auto",
@ -371,6 +390,7 @@ function NewGroupDialog({
              >
                <Title>{t("group.label")}</Title>
                <Description className="sr-only">{t("group.edit")}</Description>
+                {!isCustomRole && (
                  <div
                    className={cn(
                      "absolute",
@ -393,6 +413,7 @@ function NewGroupDialog({
                      <LuPlus />
                    </Button>
                  </div>
+                )}
              </Header>
              <div className="flex flex-col gap-4 md:gap-3">
                {currentGroups.map((group) => (
@ -401,6 +422,7 @@ function NewGroupDialog({
                    group={group}
                    onDeleteGroup={() => onDeleteGroup(group[0])}
                    onEditGroup={() => onEditGroup(group)}
+                    isReadOnly={isCustomRole}
                  />
                ))}
              </div>
@ -512,12 +534,14 @@ type CameraGroupRowProps = {
  group: [string, CameraGroupConfig];
  onDeleteGroup: () => void;
  onEditGroup: () => void;
+  isReadOnly?: boolean;
 };

 export function CameraGroupRow({
  group,
  onDeleteGroup,
  onEditGroup,
+  isReadOnly,
 }: CameraGroupRowProps) {
  const { t } = useTranslation(["components/camera"]);
  const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
@ -564,7 +588,7 @@ export function CameraGroupRow({
          </AlertDialogContent>
        </AlertDialog>

-        {isMobile && (
+        {isMobile && !isReadOnly && (
          <>
            <DropdownMenu modal={!isDesktop}>
              <DropdownMenuTrigger>
@ -589,7 +613,7 @@ export function CameraGroupRow({
            </DropdownMenu>
          </>
        )}
-        {!isMobile && (
+        {!isMobile && !isReadOnly && (
          <div className="flex flex-row items-center gap-2">
            <Tooltip>
              <TooltipTrigger asChild>
--- a/web/src/components/overlay/detail/SearchDetailDialog.tsx
+++ b/web/src/components/overlay/detail/SearchDetailDialog.tsx
@ -807,6 +807,15 @@ function ObjectDetailsTab({
    }
  }, [search]);

+  const isEventsKey = useCallback((key: unknown): boolean => {
+    const candidate = Array.isArray(key) ? key[0] : key;
+    const EVENTS_KEY_PATTERNS = ["events", "events/search", "events/explore"];
+    return (
+      typeof candidate === "string" &&
+      EVENTS_KEY_PATTERNS.some((p) => candidate.includes(p))
+    );
+  }, []);
+
  const updateDescription = useCallback(() => {
    if (!search) {
      return;
@ -821,11 +830,7 @@ function ObjectDetailsTab({
          });
        }
        mutate(
-          (key) =>
-            typeof key === "string" &&
-            (key.includes("events") ||
-              key.includes("events/search") ||
-              key.includes("events/explore")),
+          (key) => isEventsKey(key),
          (currentData: SearchResult[][] | SearchResult[] | undefined) =>
            mapSearchResults(currentData, (event) =>
              event.id === search.id
@ -838,6 +843,7 @@ function ObjectDetailsTab({
            revalidate: false,
          },
        );
+        setSearch({ ...search, data: { ...search.data, description: desc } });
      })
      .catch((error) => {
        const errorMessage =
@ -854,7 +860,7 @@ function ObjectDetailsTab({
        );
        setDesc(search.data.description);
      });
-  }, [desc, search, mutate, t, mapSearchResults]);
+  }, [desc, search, mutate, t, mapSearchResults, isEventsKey, setSearch]);

  const regenerateDescription = useCallback(
    (source: "snapshot" | "thumbnails") => {
@ -921,11 +927,7 @@ function ObjectDetailsTab({
            });

            mutate(
-              (key) =>
-                typeof key === "string" &&
-                (key.includes("events") ||
-                  key.includes("events/search") ||
-                  key.includes("events/explore")),
+              (key) => isEventsKey(key),
              (currentData: SearchResult[][] | SearchResult[] | undefined) =>
                mapSearchResults(currentData, (event) =>
                  event.id === search.id
@ -972,7 +974,7 @@ function ObjectDetailsTab({
          );
        });
    },
-    [search, apiHost, mutate, setSearch, t, mapSearchResults],
+    [search, apiHost, mutate, setSearch, t, mapSearchResults, isEventsKey],
  );

  // recognized plate
@ -996,11 +998,7 @@ function ObjectDetailsTab({
            });

            mutate(
-              (key) =>
-                typeof key === "string" &&
-                (key.includes("events") ||
-                  key.includes("events/search") ||
-                  key.includes("events/explore")),
+              (key) => isEventsKey(key),
              (currentData: SearchResult[][] | SearchResult[] | undefined) =>
                mapSearchResults(currentData, (event) =>
                  event.id === search.id
@ -1047,7 +1045,7 @@ function ObjectDetailsTab({
          );
        });
    },
-    [search, apiHost, mutate, setSearch, t, mapSearchResults],
+    [search, apiHost, mutate, setSearch, t, mapSearchResults, isEventsKey],
  );

  // speech transcription
@ -1103,12 +1101,9 @@ function ObjectDetailsTab({
          });

      setState("submitted");
+      setSearch({ ...search, plus_id: "new_upload" });
      mutate(
-        (key) =>
-          typeof key === "string" &&
-          (key.includes("events") ||
-            key.includes("events/search") ||
-            key.includes("events/explore")),
+        (key) => isEventsKey(key),
        (currentData: SearchResult[][] | SearchResult[] | undefined) =>
          mapSearchResults(currentData, (event) =>
            event.id === search.id
@ -1122,7 +1117,7 @@ function ObjectDetailsTab({
        },
      );
    },
-    [search, mutate, mapSearchResults],
+    [search, mutate, mapSearchResults, setSearch, isEventsKey],
  );

  const popoverContainerRef = useRef<HTMLDivElement | null>(null);
--- a/web/src/components/overlay/dialog/FrigatePlusDialog.tsx
+++ b/web/src/components/overlay/dialog/FrigatePlusDialog.tsx
@ -6,31 +6,68 @@ import {
  DialogTitle,
 } from "@/components/ui/dialog";
 import { Event } from "@/types/event";
-import { isDesktop, isMobile } from "react-device-detect";
-import { ObjectSnapshotTab } from "../detail/SearchDetailDialog";
+import { isDesktop, isMobile, isSafari } from "react-device-detect";
 import { cn } from "@/lib/utils";
+import { useCallback, useEffect, useState } from "react";
+import axios from "axios";
+import { useTranslation, Trans } from "react-i18next";
+import { Button } from "@/components/ui/button";
+import ActivityIndicator from "@/components/indicators/activity-indicator";
+import { FaCheckCircle } from "react-icons/fa";
+import { Card, CardContent } from "@/components/ui/card";
+import { TransformComponent, TransformWrapper } from "react-zoom-pan-pinch";
+import ImageLoadingIndicator from "@/components/indicators/ImageLoadingIndicator";
+import { baseUrl } from "@/api/baseUrl";
+import { getTranslatedLabel } from "@/utils/i18n";
+import useImageLoaded from "@/hooks/use-image-loaded";

-type FrigatePlusDialogProps = {
+export type FrigatePlusDialogProps = {
  upload?: Event;
  dialog?: boolean;
  onClose: () => void;
  onEventUploaded: () => void;
 };
+
 export function FrigatePlusDialog({
  upload,
  dialog = true,
  onClose,
  onEventUploaded,
 }: FrigatePlusDialogProps) {
-  if (!upload) {
-    return;
-  }
-  if (dialog) {
+  const { t, i18n } = useTranslation(["components/dialog"]);
+
+  type SubmissionState = "reviewing" | "uploading" | "submitted";
+  const [state, setState] = useState<SubmissionState>(
+    upload?.plus_id ? "submitted" : "reviewing",
+  );
+  useEffect(() => {
+    setState(upload?.plus_id ? "submitted" : "reviewing");
+  }, [upload?.plus_id]);
+
+  const onSubmitToPlus = useCallback(
+    async (falsePositive: boolean) => {
+      if (!upload) return;
+      falsePositive
+        ? axios.put(`events/${upload.id}/false_positive`)
+        : axios.post(`events/${upload.id}/plus`, { include_annotation: 1 });
+      setState("submitted");
+      onEventUploaded();
+    },
+    [upload, onEventUploaded],
+  );
+
+  const [imgRef, imgLoaded, onImgLoad] = useImageLoaded();
+  const showCard =
+    !!upload &&
+    upload.data.type === "object" &&
+    upload.plus_id !== "not_enabled" &&
+    upload.end_time &&
+    upload.label !== "on_demand";
+
+  if (!dialog || !upload) return null;
+
  return (
-      <Dialog
-        open={upload != undefined}
-        onOpenChange={(open) => (!open ? onClose() : null)}
-      >
+    <Dialog open={true} onOpenChange={(open) => (!open ? onClose() : null)}>
      <DialogContent
        className={cn(
          "scrollbar-container overflow-y-auto",
@ -45,12 +82,123 @@ export function FrigatePlusDialog({
            Submit this snapshot to Frigate+
          </DialogDescription>
        </DialogHeader>
-          <ObjectSnapshotTab
-            search={upload}
-            onEventUploaded={onEventUploaded}
+
+        <div className="relative size-full">
+          <ImageLoadingIndicator
+            className="absolute inset-0 aspect-video min-h-[60dvh] w-full"
+            imgLoaded={imgLoaded}
          />
+          <div className={imgLoaded ? "visible" : "invisible"}>
+            <TransformWrapper minScale={1.0} wheel={{ smoothStep: 0.005 }}>
+              <div className="flex flex-col space-y-3">
+                <TransformComponent
+                  wrapperStyle={{ width: "100%", height: "100%" }}
+                  contentStyle={{
+                    position: "relative",
+                    width: "100%",
+                    height: "100%",
+                  }}
+                >
+                  {upload.id && (
+                    <div className="relative mx-auto">
+                      <img
+                        ref={imgRef}
+                        className="mx-auto max-h-[60dvh] rounded-lg bg-black object-contain"
+                        src={`${baseUrl}api/events/${upload.id}/snapshot.jpg`}
+                        alt={`${upload.label}`}
+                        loading={isSafari ? "eager" : "lazy"}
+                        onLoad={onImgLoad}
+                      />
+                    </div>
+                  )}
+                </TransformComponent>
+
+                {showCard && (
+                  <Card className="p-1 text-sm md:p-2">
+                    <CardContent className="flex flex-col items-center justify-between gap-3 p-2 md:flex-row">
+                      <div className="flex flex-col space-y-3">
+                        <div className="text-lg leading-none">
+                          {t("explore.plus.submitToPlus.label")}
+                        </div>
+                        <div className="text-sm text-muted-foreground">
+                          {t("explore.plus.submitToPlus.desc")}
+                        </div>
+                      </div>
+                      <div className="flex w-full flex-1 flex-col justify-center gap-2 md:ml-8 md:w-auto md:justify-end">
+                        {state === "reviewing" && (
+                          <>
+                            <div>
+                              {i18n.language === "en" ? (
+                                /^[aeiou]/i.test(upload.label || "") ? (
+                                  <Trans
+                                    ns="components/dialog"
+                                    values={{ label: upload.label }}
+                                  >
+                                    explore.plus.review.question.ask_an
+                                  </Trans>
+                                ) : (
+                                  <Trans
+                                    ns="components/dialog"
+                                    values={{ label: upload.label }}
+                                  >
+                                    explore.plus.review.question.ask_a
+                                  </Trans>
+                                )
+                              ) : (
+                                <Trans
+                                  ns="components/dialog"
+                                  values={{
+                                    untranslatedLabel: upload.label,
+                                    translatedLabel: getTranslatedLabel(
+                                      upload.label,
+                                    ),
+                                  }}
+                                >
+                                  explore.plus.review.question.ask_full
+                                </Trans>
+                              )}
+                            </div>
+                            <div className="flex w-full flex-row gap-2">
+                              <Button
+                                className="flex-1 bg-success"
+                                aria-label={t("button.yes", { ns: "common" })}
+                                onClick={() => {
+                                  setState("uploading");
+                                  onSubmitToPlus(false);
+                                }}
+                              >
+                                {t("button.yes", { ns: "common" })}
+                              </Button>
+                              <Button
+                                className="flex-1 text-white"
+                                aria-label={t("button.no", { ns: "common" })}
+                                variant="destructive"
+                                onClick={() => {
+                                  setState("uploading");
+                                  onSubmitToPlus(true);
+                                }}
+                              >
+                                {t("button.no", { ns: "common" })}
+                              </Button>
+                            </div>
+                          </>
+                        )}
+                        {state === "uploading" && <ActivityIndicator />}
+                        {state === "submitted" && (
+                          <div className="flex flex-row items-center justify-center gap-2">
+                            <FaCheckCircle className="size-4 text-success" />
+                            {t("explore.plus.review.state.submitted")}
+                          </div>
+                        )}
+                      </div>
+                    </CardContent>
+                  </Card>
+                )}
+              </div>
+            </TransformWrapper>
+          </div>
+        </div>
      </DialogContent>
    </Dialog>
  );
 }
-}
--- a/web/src/components/player/HlsVideoPlayer.tsx
+++ b/web/src/components/player/HlsVideoPlayer.tsx
@ -6,7 +6,7 @@ import {
  useState,
 } from "react";
 import Hls from "hls.js";
-import { isAndroid, isDesktop, isMobile } from "react-device-detect";
+import { isDesktop, isMobile } from "react-device-detect";
 import { TransformComponent, TransformWrapper } from "react-zoom-pan-pinch";
 import VideoControls from "./VideoControls";
 import { VideoResolutionType } from "@/types/live";
@ -22,7 +22,7 @@ import { useTranslation } from "react-i18next";
 import ObjectTrackOverlay from "@/components/overlay/ObjectTrackOverlay";

 // Android native hls does not seek correctly
-const USE_NATIVE_HLS = !isAndroid;
+const USE_NATIVE_HLS = false;
 const HLS_MIME_TYPE = "application/vnd.apple.mpegurl" as const;
 const unsupportedErrorCodes = [
  MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED,
--- a/web/src/components/player/dynamic/DynamicVideoPlayer.tsx
+++ b/web/src/components/player/dynamic/DynamicVideoPlayer.tsx
@ -111,7 +111,7 @@ export default function DynamicVideoPlayer({
  const [loadingTimeout, setLoadingTimeout] = useState<NodeJS.Timeout>();
  const [source, setSource] = useState<HlsSource>({
    playlist: `${apiHost}vod/${camera}/start/${timeRange.after}/end/${timeRange.before}/master.m3u8`,
-    startPosition: startTimestamp ? timeRange.after - startTimestamp : 0,
+    startPosition: startTimestamp ? startTimestamp - timeRange.after : 0,
  });

  // start at correct time
--- a/web/src/components/settings/wizard/Step1NameCamera.tsx
+++ b/web/src/components/settings/wizard/Step1NameCamera.tsx
@ -377,7 +377,7 @@ export default function Step1NameCamera({
                          );
                          return selectedBrand &&
                            selectedBrand.value != "other" ? (
-                            <Popover>
+                            <Popover modal={true}>
                              <PopoverTrigger asChild>
                                <Button
                                  variant="ghost"
--- a/web/src/components/settings/wizard/Step3StreamConfig.tsx
+++ b/web/src/components/settings/wizard/Step3StreamConfig.tsx
@ -600,7 +600,7 @@ export default function Step3StreamConfig({
                  <Label className="text-sm font-medium text-primary-variant">
                    {t("cameraWizard.step3.roles")}
                  </Label>
-                  <Popover>
+                  <Popover modal={true}>
                    <PopoverTrigger asChild>
                      <Button variant="ghost" size="sm" className="h-4 w-4 p-0">
                        <LuInfo className="size-3" />
@ -670,7 +670,7 @@ export default function Step3StreamConfig({
                  <Label className="text-sm font-medium text-primary-variant">
                    {t("cameraWizard.step3.featuresTitle")}
                  </Label>
-                  <Popover>
+                  <Popover modal={true}>
                    <PopoverTrigger asChild>
                      <Button variant="ghost" size="sm" className="h-4 w-4 p-0">
                        <LuInfo className="size-3" />
--- a/web/src/pages/Live.tsx
+++ b/web/src/pages/Live.tsx
@ -93,19 +93,23 @@ function Live() {
  const allowedCameras = useAllowedCameras();

  const includesBirdseye = useMemo(() => {
+    // Restricted users should never have access to birdseye
+    if (isCustomRole) {
+      return false;
+    }
+
    if (
      config &&
      Object.keys(config.camera_groups).length &&
      cameraGroup &&
      config.camera_groups[cameraGroup] &&
-      cameraGroup != "default" &&
-      (!isCustomRole || "birdseye" in allowedCameras)
+      cameraGroup != "default"
    ) {
      return config.camera_groups[cameraGroup].cameras.includes("birdseye");
    } else {
      return false;
    }
-  }, [config, cameraGroup, allowedCameras, isCustomRole]);
+  }, [config, cameraGroup, isCustomRole]);

  const cameras = useMemo(() => {
    if (!config) {
--- a/web/src/views/classification/ModelSelectionView.tsx
+++ b/web/src/views/classification/ModelSelectionView.tsx
@ -39,6 +39,7 @@ import {
  AlertDialogTitle,
 } from "@/components/ui/alert-dialog";
 import BlurredIconButton from "@/components/button/BlurredIconButton";
+import { Skeleton } from "@/components/ui/skeleton";

 const allModelTypes = ["objects", "states"] as const;
 type ModelType = (typeof allModelTypes)[number];
@ -332,9 +333,7 @@ function ModelCard({ config, onClick, onUpdate, onDelete }: ModelCardProps) {
            <ImageShadowOverlay lowerClassName="h-[30%] z-0" />
          </>
        ) : (
-          <div className="flex size-full items-center justify-center bg-background_alt">
-            <MdModelTraining className="size-16 text-muted-foreground" />
-          </div>
+          <Skeleton className="flex size-full items-center justify-center" />
        )}
        <div className="absolute bottom-2 left-3 text-lg text-white smart-capitalize">
          {config.name}
--- a/web/src/views/live/LiveDashboardView.tsx
+++ b/web/src/views/live/LiveDashboardView.tsx
@ -20,7 +20,14 @@ import {
  FrigateConfig,
 } from "@/types/frigateConfig";
 import { ReviewSegment } from "@/types/review";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import {
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import {
  isDesktop,
  isMobile,
@ -46,6 +53,8 @@ import { useStreamingSettings } from "@/context/streaming-settings-provider";
 import { useTranslation } from "react-i18next";
 import { EmptyCard } from "@/components/card/EmptyCard";
 import { BsFillCameraVideoOffFill } from "react-icons/bs";
+import { AuthContext } from "@/context/auth-context";
+import { useIsCustomRole } from "@/hooks/use-is-custom-role";

 type LiveDashboardViewProps = {
  cameras: CameraConfig[];
@ -374,10 +383,6 @@ export default function LiveDashboardView({
    onSaveMuting(true);
  };

-  if (cameras.length == 0 && !includeBirdseye) {
-    return <NoCameraView />;
-  }
-
  return (
    <div
      className="scrollbar-container size-full select-none overflow-y-auto px-1 pt-2 md:p-2"
@ -439,6 +444,10 @@ export default function LiveDashboardView({
        </div>
      )}

+      {cameras.length == 0 && !includeBirdseye ? (
+        <NoCameraView />
+      ) : (
+        <>
          {!fullscreen && events && events.length > 0 && (
            <ScrollArea>
              <TooltipProvider>
@ -494,7 +503,8 @@ export default function LiveDashboardView({
                )}
                {cameras.map((camera) => {
                  let grow;
-              const aspectRatio = camera.detect.width / camera.detect.height;
+                  const aspectRatio =
+                    camera.detect.width / camera.detect.height;
                  if (aspectRatio > 2) {
                    grow = `${mobileLayout == "grid" && "col-span-2"} aspect-wide`;
                  } else if (aspectRatio < 1) {
@ -503,10 +513,12 @@ export default function LiveDashboardView({
                    grow = "aspect-video";
                  }
                  const availableStreams = camera.live.streams || {};
-              const firstStreamEntry = Object.values(availableStreams)[0] || "";
+                  const firstStreamEntry =
+                    Object.values(availableStreams)[0] || "";

                  const streamNameFromSettings =
-                currentGroupStreamingSettings?.[camera.name]?.streamName || "";
+                    currentGroupStreamingSettings?.[camera.name]?.streamName ||
+                    "";
                  const streamExists =
                    streamNameFromSettings &&
                    Object.values(availableStreams).includes(
@ -535,7 +547,9 @@ export default function LiveDashboardView({
                      camera={camera.name}
                      cameraGroup={cameraGroup}
                      streamName={streamName}
-                  preferredLiveMode={preferredLiveModes[camera.name] ?? "mse"}
+                      preferredLiveMode={
+                        preferredLiveModes[camera.name] ?? "mse"
+                      }
                      isRestreamed={isRestreamedStates[camera.name]}
                      supportsAudio={
                        supportsAudioOutputStates[streamName]?.supportsAudio ??
@ -566,9 +580,13 @@ export default function LiveDashboardView({
                          windowVisible && visibleCameras.includes(camera.name)
                        }
                        cameraConfig={camera}
-                    preferredLiveMode={preferredLiveModes[camera.name] ?? "mse"}
+                        preferredLiveMode={
+                          preferredLiveModes[camera.name] ?? "mse"
+                        }
                        autoLive={autoLive ?? globalAutoLive}
-                    showStillWithoutActivity={showStillWithoutActivity ?? true}
+                        showStillWithoutActivity={
+                          showStillWithoutActivity ?? true
+                        }
                        alwaysShowCameraName={displayCameraNames}
                        useWebGL={useWebGL}
                        playInBackground={false}
@ -576,7 +594,9 @@ export default function LiveDashboardView({
                        streamName={streamName}
                        onClick={() => onSelectCamera(camera.name)}
                        onError={(e) => handleError(camera.name, e)}
-                    onResetLiveMode={() => resetPreferredLiveMode(camera.name)}
+                        onResetLiveMode={() =>
+                          resetPreferredLiveMode(camera.name)
+                        }
                        playAudio={audioStates[camera.name] ?? false}
                        volume={volumeStates[camera.name]}
                      />
@ -632,21 +652,34 @@ export default function LiveDashboardView({
              toggleFullscreen={toggleFullscreen}
            />
          )}
+        </>
+      )}
    </div>
  );
 }

 function NoCameraView() {
  const { t } = useTranslation(["views/live"]);
+  const { auth } = useContext(AuthContext);
+  const isCustomRole = useIsCustomRole();
+
+  // Check if this is a restricted user with no cameras in this group
+  const isRestricted = isCustomRole && auth.isAuthenticated;

  return (
    <div className="flex size-full items-center justify-center">
      <EmptyCard
        icon={<BsFillCameraVideoOffFill className="size-8" />}
-        title={t("noCameras.title")}
-        description={t("noCameras.description")}
-        buttonText={t("noCameras.buttonText")}
-        link="/settings?page=cameraManagement"
+        title={
+          isRestricted ? t("noCameras.restricted.title") : t("noCameras.title")
+        }
+        description={
+          isRestricted
+            ? t("noCameras.restricted.description")
+            : t("noCameras.description")
+        }
+        buttonText={!isRestricted ? t("noCameras.buttonText") : undefined}
+        link={!isRestricted ? "/settings?page=cameraManagement" : undefined}
      />
    </div>
  );
--- a/web/src/views/settings/TriggerView.tsx
+++ b/web/src/views/settings/TriggerView.tsx
@ -198,9 +198,9 @@ export default function TriggerView({

            return axios
              .put("config/set", configBody)
-              .then((configResponse) => {
+              .then(async (configResponse) => {
                if (configResponse.status === 200) {
-                  updateConfig();
+                  await updateConfig();
                  const displayName =
                    friendly_name && friendly_name !== ""
                      ? `${friendly_name} (${name})`
@ -353,9 +353,9 @@ export default function TriggerView({

            return axios
              .put("config/set", configBody)
-              .then((configResponse) => {
+              .then(async (configResponse) => {
                if (configResponse.status === 200) {
-                  updateConfig();
+                  await updateConfig();
                  const friendly =
                    config?.cameras?.[selectedCamera]?.semantic_search
                      ?.triggers?.[name]?.friendly_name;
--- a/web/src/views/system/EnrichmentMetrics.tsx
+++ b/web/src/views/system/EnrichmentMetrics.tsx
@ -67,13 +67,14 @@ export default function EnrichmentMetrics({

  // features stats

-  const embeddingInferenceTimeSeries = useMemo(() => {
+  const groupedEnrichmentMetrics = useMemo(() => {
    if (!statsHistory) {
      return [];
    }

    const series: {
      [key: string]: {
+        rawKey: string;
        name: string;
        metrics: Threshold;
        data: { x: number; y: number }[];
@ -90,6 +91,7 @@ export default function EnrichmentMetrics({

        if (!(key in series)) {
          series[key] = {
+            rawKey,
            name: t("enrichments.embeddings." + rawKey),
            metrics: getThreshold(rawKey),
            data: [],
@ -99,7 +101,57 @@ export default function EnrichmentMetrics({
        series[key].data.push({ x: statsIdx + 1, y: stat });
      });
    });
-    return Object.values(series);
+
+    // Group series by category (extract base name from raw key)
+    const grouped: {
+      [category: string]: {
+        categoryName: string;
+        speedSeries?: {
+          name: string;
+          metrics: Threshold;
+          data: { x: number; y: number }[];
+        };
+        eventsSeries?: {
+          name: string;
+          metrics: Threshold;
+          data: { x: number; y: number }[];
+        };
+      };
+    } = {};
+
+    Object.values(series).forEach((s) => {
+      // Extract base category name from raw key
+      // All metrics follow the pattern: {base}_speed and {base}_events_per_second
+      let categoryKey = s.rawKey;
+      let isSpeed = false;
+
+      if (s.rawKey.endsWith("_speed")) {
+        categoryKey = s.rawKey.replace("_speed", "");
+        isSpeed = true;
+      } else if (s.rawKey.endsWith("_events_per_second")) {
+        categoryKey = s.rawKey.replace("_events_per_second", "");
+        isSpeed = false;
+      }
+
+      // Get translated category name
+      const categoryName = t("enrichments.embeddings." + categoryKey);
+
+      if (!(categoryKey in grouped)) {
+        grouped[categoryKey] = {
+          categoryName,
+          speedSeries: undefined,
+          eventsSeries: undefined,
+        };
+      }
+
+      if (isSpeed) {
+        grouped[categoryKey].speedSeries = s;
+      } else {
+        grouped[categoryKey].eventsSeries = s;
+      }
+    });
+
+    return Object.values(grouped);
  }, [statsHistory, t, getThreshold]);

  return (
@ -110,36 +162,43 @@ export default function EnrichmentMetrics({
        </div>
        <div
          className={cn(
-            "mt-4 grid w-full grid-cols-1 gap-2 sm:grid-cols-3",
-            embeddingInferenceTimeSeries && "sm:grid-cols-4",
+            "mt-4 grid w-full grid-cols-1 gap-2 sm:grid-cols-2 md:grid-cols-4",
          )}
        >
          {statsHistory.length != 0 ? (
            <>
-              {embeddingInferenceTimeSeries.map((series) => (
-                <div className="rounded-lg bg-background_alt p-2.5 md:rounded-2xl">
-                  <div className="mb-5 smart-capitalize">{series.name}</div>
-                  {series.name.endsWith("Speed") ? (
+              {groupedEnrichmentMetrics.map((group) => (
+                <div
+                  key={group.categoryName}
+                  className="rounded-lg bg-background_alt p-2.5 md:rounded-2xl"
+                >
+                  <div className="mb-5 smart-capitalize">
+                    {group.categoryName}
+                  </div>
+                  <div className="space-y-4">
+                    {group.speedSeries && (
                      <ThresholdBarGraph
-                      key={series.name}
-                      graphId={`${series.name}-inference`}
-                      name={series.name}
+                        key={`${group.categoryName}-speed`}
+                        graphId={`${group.categoryName}-inference`}
+                        name={t("enrichments.averageInf")}
                        unit="ms"
-                      threshold={series.metrics}
+                        threshold={group.speedSeries.metrics}
                        updateTimes={updateTimes}
-                      data={[series]}
+                        data={[group.speedSeries]}
                      />
-                  ) : (
+                    )}
+                    {group.eventsSeries && (
                      <EventsPerSecondsLineGraph
-                      key={series.name}
-                      graphId={`${series.name}-fps`}
+                        key={`${group.categoryName}-events`}
+                        graphId={`${group.categoryName}-fps`}
                        unit=""
                        name={t("enrichments.infPerSecond")}
                        updateTimes={updateTimes}
-                      data={[series]}
+                        data={[group.eventsSeries]}
                      />
                    )}
                  </div>
+                </div>
              ))}
            </>
          ) : (
--- a/web/src/views/system/GeneralMetrics.tsx
+++ b/web/src/views/system/GeneralMetrics.tsx
@ -729,12 +729,9 @@ export default function GeneralMetrics({
                  ) : (
                    <Skeleton className="aspect-video w-full" />
                  )}
-                </>
-              )}
+
                  {statsHistory[0]?.npu_usages && (
-                <div
-                  className={cn("mt-4 grid grid-cols-1 gap-2 sm:grid-cols-2")}
-                >
+                    <>
                      {statsHistory.length != 0 ? (
                        <div className="rounded-lg bg-background_alt p-2.5 md:rounded-2xl">
                          <div className="mb-5">
@ -755,7 +752,9 @@ export default function GeneralMetrics({
                      ) : (
                        <Skeleton className="aspect-video w-full" />
                      )}
-                </div>
+                    </>
+                  )}
+                </>
              )}
            </div>
          </>
Author	SHA1	Message	Date
dependabot[bot]	5974e5c0fd	Merge `9044a61f47` into `8e8346099e`	2025-11-21 11:01:26 +00:00
Nicolas Mowen	8e8346099e	Miscellaneous Fixes (#20973 ) Some checks are pending CI / AMD64 Build (push) Waiting to run Details CI / ARM Build (push) Waiting to run Details CI / Jetson Jetpack 6 (push) Waiting to run Details CI / AMD64 Extra Build (push) Blocked by required conditions Details CI / ARM Extra Build (push) Blocked by required conditions Details CI / Synaptics Build (push) Blocked by required conditions Details CI / Assemble and push default build (push) Blocked by required conditions Details	2025-11-20 17:50:17 -06:00
Nicolas Mowen	b0527df3c7	HLS adjustments (#20983 ) * Revert "Fix HLS jumping to end of timeChunk (#20982)" This reverts commit `301e0a1a3a`. * Never use native HLS * Fix inverse operation	2025-11-20 15:58:58 -07:00
Nicolas Mowen	301e0a1a3a	Fix HLS jumping to end of timeChunk (#20982 ) * Fix HLS jumping to end * Undo	2025-11-20 15:50:00 -06:00
dependabot[bot]	9044a61f47	Bump @typescript-eslint/eslint-plugin from 7.12.0 to 8.46.2 in /web Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 7.12.0 to 8.46.2. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.46.2/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-version: 8.46.2 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2025-10-21 11:07:43 +00:00