Merge 22005154da into f1028d0c36

docs/docs/configuration/authentication.md

@@ -262,19 +262,6 @@ In this example:
 
 - Admin precedence: if the `admin` mapping matches, Frigate resolves the session to `admin` to avoid accidental downgrade when a user belongs to multiple groups (for example both `admin` and `viewer` groups).
 
-:::note
-
-If a user isn't getting the role you expect, enable debug logging to see exactly what headers Frigate is receiving from your proxy:
-
-```yaml
-logger:
-  default: info
-  logs:
-    frigate.api.auth: debug
-```
-
-:::
-
 #### Port Considerations
 
 **Authenticated Port (8971)**

frigate/api/config_util.py

@@ -30,6 +30,4 @@ def swap_runtime_config(app: FastAPI, config: FrigateConfig) -> None:
         for comm in app.dispatcher.comms:
             comm.config = config
 
-        # workers still hold the live toggle values, so correct only the
-        # config object here rather than re-broadcasting every override
-        app.dispatcher.reapply_runtime_state_to_config()
+        app.dispatcher.apply_runtime_state()

frigate/comms/dispatcher.py

@@ -492,48 +492,6 @@ class Dispatcher:
         """
         self._runtime_state.clear_camera(camera)
 
-    def reapply_runtime_state_to_config(self) -> None:
-        """Re-apply persisted runtime overrides to the swapped-in config object.
-
-        After config/set (or a camera delete) parses fresh yaml and swaps the
-        config, the worker processes still hold the live toggle values and the
-        overrides are already on disk, so only the in-process config object is
-        out of date. Unlike apply_runtime_state (used at startup, where workers
-        must be told), this makes no ZMQ, MQTT, or disk writes, it just corrects
-        the config the API and dispatcher read.
-
-        The field mutations and gates mirror the _on_*_command handlers; keep
-        the two in sync if a tracked toggle is added or its gate changes.
-        """
-        state = self._runtime_state.load()
-
-        for camera_name, features in state.items():
-            camera = self.config.cameras.get(camera_name)
-
-            if camera is None:
-                continue
-
-            for topic, value in features.items():
-                if topic == "enabled":
-                    if value and not camera.enabled_in_config:
-                        continue
-                    camera.enabled = value
-                elif topic == "detect":
-                    camera.detect.enabled = value
-                    # detection requires motion, mirror the handler coupling
-                    if value and not camera.motion.enabled:
-                        camera.motion.enabled = True
-                elif topic == "snapshots":
-                    camera.snapshots.enabled = value
-                elif topic == "recordings":
-                    if value and not camera.record.enabled_in_config:
-                        continue
-                    camera.record.enabled = value
-                elif topic == "audio":
-                    if value and not camera.audio.enabled_in_config:
-                        continue
-                    camera.audio.enabled = value
-
     def _on_detect_command(self, camera_name: str, payload: str) -> None:
         """Callback for detect topic."""
         detect_settings = self.config.cameras[camera_name].detect

frigate/comms/ws.py

@@ -23,6 +23,7 @@ from frigate.const import (
     EXPIRE_AUDIO_ACTIVITY,
     INSERT_MANY_RECORDINGS,
     INSERT_PREVIEW,
+    NOTIFICATION_TEST,
     REQUEST_REGION_GRID,
     UPDATE_AUDIO_ACTIVITY,
     UPDATE_AUDIO_TRANSCRIPTION_STATE,
@@ -56,6 +57,7 @@ _WS_BLOCKED_TOPICS = frozenset(
         UPDATE_EMBEDDINGS_REINDEX_PROGRESS,
         UPDATE_BIRDSEYE_LAYOUT,
         UPDATE_AUDIO_TRANSCRIPTION_STATE,
+        NOTIFICATION_TEST,
     }
 )
 

frigate/data_processing/real_time/face.py

@@ -288,10 +288,6 @@ class FaceRealTimeProcessor(RealTimeProcessorApi):
                 max(0, face_box[0]) : min(frame.shape[1], face_box[2]),
             ]
 
-        if face_frame.size == 0:
-            logger.debug(f"Empty face crop for {id}")
-            return
-
         res = self.recognizer.classify(face_frame)
 
         if not res:

frigate/test/http_api/test_http_camera.py

@@ -118,7 +118,7 @@ class TestDeleteCameraRuntimeConfig(BaseTestHttp):
                 self.assertIn("back_yard", dispatcher.config.cameras)
 
                 # surviving cameras' overrides are re-layered onto the new object
-                dispatcher.reapply_runtime_state_to_config.assert_called_once_with()
+                dispatcher.apply_runtime_state.assert_called_once_with()
 
                 # the deleted camera's persisted overrides are pruned
                 dispatcher.clear_runtime_state_for_camera.assert_called_once_with(

frigate/test/http_api/test_http_config_set.py

@@ -143,10 +143,11 @@ class TestConfigSetWildcardPropagation(BaseTestHttp):
         # front_door was turned off via the UI: the override is on disk, and
         # yaml still says enabled: true. Stand in for the real replay, which
         # reads dispatcher.config - the object the endpoint just swapped in.
-        def fake_reapply():
+        def fake_apply():
             dispatcher.config.cameras["front_door"].enabled = False
+            return {"front_door": {"enabled": False}}
 
-        dispatcher.reapply_runtime_state_to_config.side_effect = fake_reapply
+        dispatcher.apply_runtime_state.side_effect = fake_apply
 
         try:
             app, _ = self._create_app_with_dispatcher(dispatcher)
@@ -167,7 +168,7 @@ class TestConfigSetWildcardPropagation(BaseTestHttp):
 
                 # the swap must be repaired: the new config object the API and
                 # dispatcher now share has to still show front_door as off
-                dispatcher.reapply_runtime_state_to_config.assert_called_once_with()
+                dispatcher.apply_runtime_state.assert_called_once_with()
                 self.assertFalse(app.frigate_config.cameras["front_door"].enabled)
                 self.assertIs(dispatcher.config, app.frigate_config)
 
@@ -177,7 +178,7 @@ class TestConfigSetWildcardPropagation(BaseTestHttp):
                 call_names = [name for name, _, _ in dispatcher.mock_calls]
                 self.assertLess(
                     call_names.index("clear_runtime_state_for_yaml_keys"),
-                    call_names.index("reapply_runtime_state_to_config"),
+                    call_names.index("apply_runtime_state"),
                 )
         finally:
             os.unlink(config_path)
@@ -204,7 +205,7 @@ class TestConfigSetWildcardPropagation(BaseTestHttp):
                 )
 
                 self.assertEqual(resp.status_code, 200)
-                dispatcher.reapply_runtime_state_to_config.assert_not_called()
+                dispatcher.apply_runtime_state.assert_not_called()
         finally:
             os.unlink(config_path)
 

frigate/test/test_camera_pw.py

@@ -8,7 +8,9 @@ from frigate.util.builtin import clean_camera_user_pass, escape_special_characte
 class TestUserPassCleanup(unittest.TestCase):
     def setUp(self) -> None:
         self.rtsp_with_pass = "rtsp://user:password@192.168.0.2:554/live"
-        self.rtsp_with_special_pass = "rtsp://user:password`~!@#$%^&*()-_;',.<>:\"\\{\\}\\[\\]@@192.168.0.2:554/live"
+        self.rtsp_with_special_pass = (
+            "rtsp://user:password`~!@#$%^&*()-_;',.<>:\"\{\}\[\]@@192.168.0.2:554/live"
+        )
         self.rtsp_no_pass = "rtsp://192.168.0.3:554/live"
 
     def test_cleanup(self):

frigate/test/test_config_util.py

@@ -35,7 +35,7 @@ class TestSwapRuntimeConfig(unittest.TestCase):
         swap_runtime_config(app, config)
 
         # the swap rebuilds cameras from yaml, so overrides must be re-layered
-        app.dispatcher.reapply_runtime_state_to_config.assert_called_once_with()
+        app.dispatcher.apply_runtime_state.assert_called_once_with()
 
     def test_tolerates_missing_optional_collaborators(self) -> None:
         app = MagicMock()

frigate/test/test_dispatcher_runtime_state.py

@@ -253,115 +253,5 @@ class TestClearPassthrough(unittest.TestCase):
         dispatcher._runtime_state.clear_camera.assert_called_once_with("front_door")
 
 
-class TestReapplyRuntimeStateToConfig(unittest.TestCase):
-    """The silent re-apply corrects the config object with no side effects."""
-
-    def _dispatcher_with(
-        self, cameras: dict[str, MagicMock], state: dict
-    ) -> Dispatcher:
-        dispatcher = _build_dispatcher(cameras)
-        dispatcher._runtime_state = MagicMock(spec=RuntimeStatePersistence)
-        dispatcher._runtime_state.load.return_value = state
-        dispatcher.publish = MagicMock()
-        return dispatcher
-
-    def test_mutates_every_tracked_field(self) -> None:
-        cameras = {"front_door": _make_camera_mock()}
-        dispatcher = self._dispatcher_with(
-            cameras,
-            {
-                "front_door": {
-                    "enabled": False,
-                    "detect": False,
-                    "snapshots": False,
-                    "recordings": False,
-                    "audio": False,
-                }
-            },
-        )
-
-        dispatcher.reapply_runtime_state_to_config()
-
-        cam = cameras["front_door"]
-        self.assertFalse(cam.enabled)
-        self.assertFalse(cam.detect.enabled)
-        self.assertFalse(cam.snapshots.enabled)
-        self.assertFalse(cam.record.enabled)
-        self.assertFalse(cam.audio.enabled)
-
-    def test_makes_no_zmq_mqtt_or_disk_writes(self) -> None:
-        dispatcher = self._dispatcher_with(
-            {"front_door": _make_camera_mock()},
-            {"front_door": {"enabled": False}},
-        )
-
-        dispatcher.reapply_runtime_state_to_config()
-
-        dispatcher.config_updater.publish_update.assert_not_called()
-        dispatcher._runtime_state.set.assert_not_called()
-        dispatcher.publish.assert_not_called()
-
-    def test_respects_enabled_in_config_gate(self) -> None:
-        # an ON override for a camera disabled in yaml must not enable it
-        cameras = {
-            "front_door": _make_camera_mock(enabled=False, enabled_in_config=False)
-        }
-        dispatcher = self._dispatcher_with(cameras, {"front_door": {"enabled": True}})
-
-        dispatcher.reapply_runtime_state_to_config()
-
-        self.assertFalse(cameras["front_door"].enabled)
-
-    def test_respects_recordings_and_audio_gates(self) -> None:
-        # ON overrides for recordings/audio not enabled in yaml must be ignored
-        cameras = {
-            "front_door": _make_camera_mock(
-                record_enabled=False,
-                record_enabled_in_config=False,
-                audio_enabled=False,
-                audio_enabled_in_config=False,
-            )
-        }
-        dispatcher = self._dispatcher_with(
-            cameras, {"front_door": {"recordings": True, "audio": True}}
-        )
-
-        dispatcher.reapply_runtime_state_to_config()
-
-        self.assertFalse(cameras["front_door"].record.enabled)
-        self.assertFalse(cameras["front_door"].audio.enabled)
-
-    def test_applies_on_override_when_gate_passes(self) -> None:
-        # a camera off in yaml but enabled_in_config keeps its runtime-on state
-        cameras = {
-            "front_door": _make_camera_mock(enabled=False, enabled_in_config=True)
-        }
-        dispatcher = self._dispatcher_with(cameras, {"front_door": {"enabled": True}})
-
-        dispatcher.reapply_runtime_state_to_config()
-
-        self.assertTrue(cameras["front_door"].enabled)
-
-    def test_detect_on_couples_motion(self) -> None:
-        cam = _make_camera_mock(detect_enabled=False)
-        cam.motion.enabled = False
-        dispatcher = self._dispatcher_with(
-            {"front_door": cam}, {"front_door": {"detect": True}}
-        )
-
-        dispatcher.reapply_runtime_state_to_config()
-
-        self.assertTrue(cam.detect.enabled)
-        self.assertTrue(cam.motion.enabled)
-
-    def test_skips_camera_not_in_config(self) -> None:
-        dispatcher = self._dispatcher_with(
-            {"front_door": _make_camera_mock()}, {"ghost": {"enabled": False}}
-        )
-
-        # a stale entry for a deleted camera must be ignored, not raise
-        dispatcher.reapply_runtime_state_to_config()
-
-
 if __name__ == "__main__":
     unittest.main()

frigate/test/test_ws_auth.py

@@ -115,13 +115,6 @@ class TestCheckWsAuthorization(unittest.TestCase):
             )
         )
 
-    def test_viewer_blocked_from_notification_test(self):
-        self.assertFalse(
-            _check_ws_authorization(
-                "notification_test", "viewer", self.DEFAULT_SEPARATOR
-            )
-        )
-
     # --- Admin access ---
 
     def test_admin_can_send_restart(self):
@@ -141,13 +134,6 @@ class TestCheckWsAuthorization(unittest.TestCase):
             _check_ws_authorization("front_door/ptz", "admin", self.DEFAULT_SEPARATOR)
         )
 
-    def test_admin_can_send_notification_test(self):
-        self.assertTrue(
-            _check_ws_authorization(
-                "notification_test", "admin", self.DEFAULT_SEPARATOR
-            )
-        )
-
     # --- Comma-separated roles ---
 
     def test_comma_separated_admin_viewer_grants_admin(self):

frigate/track/object_processing.py

@@ -684,21 +684,22 @@ class TrackedObjectProcessor(threading.Thread):
             # check for config updates
             updated_topics = self.camera_config_subscriber.check_for_updates()
 
-            # a single drain can carry several topics at once, so add and
-            # remove are handled independently rather than as exclusive branches
-            for camera in updated_topics.get("add", []):
-                self.config.cameras[camera] = (
-                    self.camera_config_subscriber.camera_configs[camera]
-                )
-                self.create_camera_state(camera)
-
-            if "remove" in updated_topics:
+            if "enabled" in updated_topics:
+                for camera in updated_topics["enabled"]:
+                    if self.camera_states[camera].prev_enabled is None:
+                        self.camera_states[camera].prev_enabled = self.config.cameras[
+                            camera
+                        ].enabled
+            elif "add" in updated_topics:
+                for camera in updated_topics["add"]:
+                    self.config.cameras[camera] = (
+                        self.camera_config_subscriber.camera_configs[camera]
+                    )
+                    self.create_camera_state(camera)
+            elif "remove" in updated_topics:
                 for camera in updated_topics["remove"]:
-                    camera_state = self.camera_states.get(camera)
-                    if camera_state is None:
-                        continue
-
-                    camera_state.shutdown()
+                    removed_camera_state = self.camera_states[camera]
+                    removed_camera_state.shutdown()
                     self.camera_states.pop(camera)
                     self.camera_activity.pop(camera, None)
                     self.last_motion_detected.pop(camera, None)

web/src/components/config-form/theme/widgets/GenAIModelWidget.tsx

@@ -227,18 +227,16 @@ export function GenAIModelWidget(props: WidgetProps) {
               aria-expanded={open}
               disabled={disabled || readonly}
               className={cn(
-                "min-w-0 justify-between font-normal",
+                "justify-between font-normal",
                 !currentLabel && "text-muted-foreground",
                 fieldClassName,
               )}
             >
-              <span className="truncate">
-                {currentLabel ??
-                  t("configForm.genaiModel.placeholder", {
-                    ns: "views/settings",
-                    defaultValue: "Select or enter a model…",
-                  })}
-              </span>
+              {currentLabel ??
+                t("configForm.genaiModel.placeholder", {
+                  ns: "views/settings",
+                  defaultValue: "Select or enter a model…",
+                })}
               <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
             </Button>
           </PopoverTrigger>
@@ -265,14 +263,12 @@ export function GenAIModelWidget(props: WidgetProps) {
                       value={trimmedSearch}
                       onSelect={() => commit(trimmedSearch)}
                     >
-                      <Plus className="mr-2 h-4 w-4 shrink-0" />
-                      <span className="truncate">
-                        {t("configForm.genaiModel.useCustom", {
-                          ns: "views/settings",
-                          value: trimmedSearch,
-                          defaultValue: 'Use "{{value}}"',
-                        })}
-                      </span>
+                      <Plus className="mr-2 h-4 w-4" />
+                      {t("configForm.genaiModel.useCustom", {
+                        ns: "views/settings",
+                        value: trimmedSearch,
+                        defaultValue: 'Use "{{value}}"',
+                      })}
                     </CommandItem>
                   </CommandGroup>
                 )}
@@ -291,11 +287,11 @@ export function GenAIModelWidget(props: WidgetProps) {
                       >
                         <Check
                           className={cn(
-                            "mr-2 h-4 w-4 shrink-0",
+                            "mr-2 h-4 w-4",
                             value === model ? "opacity-100" : "opacity-0",
                           )}
                         />
-                        <span className="truncate">{model}</span>
+                        {model}
                       </CommandItem>
                     ))}
                   </CommandGroup>

web/src/components/filter/LogSettingsButton.tsx

@@ -129,7 +129,7 @@ export function GeneralFilterContent({
                 className="mx-2 w-full cursor-pointer text-primary smart-capitalize"
                 htmlFor={item}
               >
-                {t(`logger.logLevel.${item}`, { ns: "views/settings" })}
+                {item.replaceAll("_", " ")}
               </Label>
               <Switch
                 key={item}

web/src/components/indicators/Chip.tsx

@@ -3,7 +3,6 @@ import { LogSeverity } from "@/types/log";
 import { ReactNode, useMemo } from "react";
 import { isIOS } from "react-device-detect";
 import { AnimatePresence, motion } from "framer-motion";
-import { useTranslation } from "react-i18next";
 
 type ChipProps = {
   className?: string;
@@ -51,7 +50,6 @@ type LogChipProps = {
   onClickSeverity?: () => void;
 };
 export function LogChip({ severity, onClickSeverity }: LogChipProps) {
-  const { t } = useTranslation(["views/settings"]);
   const severityClassName = useMemo(() => {
     switch (severity) {
       case "info":
@@ -75,7 +73,7 @@ export function LogChip({ severity, onClickSeverity }: LogChipProps) {
           }
         }}
       >
-        {t(`logger.logLevel.${severity}`, { ns: "views/settings" })}
+        {severity}
       </span>
     </div>
   );

web/src/components/ui/command.tsx

@@ -60,10 +60,7 @@ const CommandList = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <CommandPrimitive.List
     ref={ref}
-    className={cn(
-      "scrollbar-container max-h-[300px] overflow-y-auto overflow-x-hidden",
-      className,
-    )}
+    className={cn("max-h-[300px] overflow-y-auto overflow-x-hidden", className)}
     {...props}
   />
 ));

web/src/views/motion-search/MotionSearchView.tsx

@@ -770,34 +770,6 @@ export default function MotionSearchView({
     };
   }, [cancelMotionSearchJobViaBeacon]);
 
-  const handleBack = useCallback(() => {
-    if (onBack) {
-      onBack();
-    } else {
-      navigate(-1);
-    }
-  }, [navigate, onBack]);
-
-  // Dismissing the entry dialog (escape / click outside) before a search has
-  // run leaves nothing behind it, so cancel the flow instead of revealing an
-  // empty page.
-  const handleSearchDialogOpenChange = useCallback(
-    (nextOpen: boolean) => {
-      if (
-        !nextOpen &&
-        !isSearching &&
-        !hasSearched &&
-        searchResults.length === 0
-      ) {
-        handleBack();
-        return;
-      }
-
-      setIsSearchDialogOpen(nextOpen);
-    },
-    [handleBack, hasSearched, isSearching, searchResults.length],
-  );
-
   const handleNewSearch = useCallback(() => {
     if (jobId && jobCamera) {
       void cancelMotionSearchJob(jobId, jobCamera);
@@ -1266,7 +1238,7 @@ export default function MotionSearchView({
         <Toaster closeButton={true} position="top-center" />
         <MotionSearchDialog
           open={isSearchDialogOpen}
-          onOpenChange={handleSearchDialogOpenChange}
+          onOpenChange={setIsSearchDialogOpen}
           config={config}
           cameras={cameras}
           selectedCamera={selectedCamera}
@@ -1304,7 +1276,7 @@ export default function MotionSearchView({
                 className="flex items-center gap-2.5 rounded-lg"
                 aria-label={t("label.back", { ns: "common" })}
                 size="sm"
-                onClick={handleBack}
+                onClick={() => (onBack ? onBack() : navigate(-1))}
               >
                 <IoMdArrowRoundBack className="size-5 text-secondary-foreground" />
                 {isDesktop && (