Merge f63938a90a into f3c09ae169

Updates the requirements on [joserfc](https://github.com/authlib/joserfc) to permit the latest version.
- [Release notes](https://github.com/authlib/joserfc/releases)
- [Changelog](https://github.com/authlib/joserfc/blob/main/docs/changelog.rst)
- [Commits](https://github.com/authlib/joserfc/compare/1.2.0...1.6.4)

---
updated-dependencies:
- dependency-name: joserfc
  dependency-version: 1.6.4
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

docker/main/requirements-wheels.txt

@@ -7,7 +7,7 @@ starlette-context == 0.4.*
 fastapi[standard-no-fastapi-cloud-cli] == 0.116.*
 uvicorn == 0.35.*
 slowapi == 0.1.*
-joserfc == 1.2.*
+joserfc == 1.6.*
 cryptography == 44.0.*
 pathvalidate == 3.3.*
 markupsafe == 3.0.*

docs/docs/configuration/advanced/system.md

@@ -72,10 +72,10 @@ Variables prefixed with `FRIGATE_` can be referenced in config fields that suppo
 
 Navigate to <NavPath path="Settings > System > Environment variables" /> to add or edit environment variables.
 
-| Field             | Description                                               |
+| Field     | Description                                               |
-| ----------------- | --------------------------------------------------------- |
+| --------- | --------------------------------------------------------- |
-| **Variable name** | The environment variable name (e.g., `FRIGATE_MQTT_USER`) |
+| **Key**   | The environment variable name (e.g., `FRIGATE_MQTT_USER`) |
-| **Value**         | The value for the variable                                |
+| **Value** | The value for the variable                                |
 
 Variables defined here can be referenced elsewhere in your configuration using the `{FRIGATE_VARIABLE_NAME}` syntax.
 

frigate/embeddings/maintainer.py

@@ -200,9 +200,6 @@ class EmbeddingMaintainer(threading.Thread):
             )
 
         for model_config in self.config.classification.custom.values():
-            if not model_config.enabled:
-                continue
-
             self.realtime_processors.append(
                 CustomStateClassificationProcessor(
                     self.config, model_config, self.requestor, self.metrics
@@ -335,25 +332,6 @@ class EmbeddingMaintainer(threading.Thread):
         for processor in self.post_processors:
             processor.update_config(topic, payload)
 
-    def _remove_custom_classification_processor(self, model_name: str) -> None:
-        """Shut down and drop any running processor for a custom model."""
-        remaining = []
-        for processor in self.realtime_processors:
-            if (
-                isinstance(
-                    processor,
-                    (
-                        CustomStateClassificationProcessor,
-                        CustomObjectClassificationProcessor,
-                    ),
-                )
-                and processor.model_config.name == model_name
-            ):
-                processor.shutdown()
-            else:
-                remaining.append(processor)
-        self.realtime_processors = remaining
-
     def _handle_custom_classification_update(
         self, topic: str, model_config: Any
     ) -> None:
@@ -361,7 +339,23 @@ class EmbeddingMaintainer(threading.Thread):
         model_name = topic.split("/")[-1]
 
         if model_config is None:
-            self._remove_custom_classification_processor(model_name)
+            remaining = []
+            for processor in self.realtime_processors:
+                if (
+                    isinstance(
+                        processor,
+                        (
+                            CustomStateClassificationProcessor,
+                            CustomObjectClassificationProcessor,
+                        ),
+                    )
+                    and processor.model_config.name == model_name
+                ):
+                    processor.shutdown()
+                else:
+                    remaining.append(processor)
+            self.realtime_processors = remaining
+
             logger.info(
                 f"Successfully removed classification processor for model: {model_name}"
             )
@@ -369,13 +363,6 @@ class EmbeddingMaintainer(threading.Thread):
 
         self.config.classification.custom[model_name] = model_config
 
-        # A disabled model must not run; tear down any existing processor and
-        # do not register a new one.
-        if not model_config.enabled:
-            self._remove_custom_classification_processor(model_name)
-            logger.info(f"Disabled classification processor for model: {model_name}")
-            return
-
         # Check if processor already exists
         for processor in self.realtime_processors:
             if isinstance(
@@ -715,11 +702,7 @@ class EmbeddingMaintainer(threading.Thread):
             and "license_plate" not in camera_config.objects.track
         )
 
-        has_enabled_custom = any(
+        if not dedicated_lpr_enabled and len(self.config.classification.custom) == 0:
-            c.enabled for c in self.config.classification.custom.values()
-        )
-
-        if not dedicated_lpr_enabled and not has_enabled_custom:
             # no active features that use this data
             return
 

frigate/test/test_classification_enabled.py

@@ -1,106 +0,0 @@
-"""Tests that disabled custom classification models are not registered or run."""
-
-import sys
-import unittest
-from unittest.mock import MagicMock
-
-# Mock TFLite before importing the maintainer / classification modules
-_MOCK_MODULES = [
-    "tflite_runtime",
-    "tflite_runtime.interpreter",
-    "ai_edge_litert",
-    "ai_edge_litert.interpreter",
-]
-for mod in _MOCK_MODULES:
-    if mod not in sys.modules:
-        sys.modules[mod] = MagicMock()
-
-from frigate.data_processing.real_time.custom_classification import (  # noqa: E402
-    CustomObjectClassificationProcessor,
-)
-from frigate.embeddings.maintainer import EmbeddingMaintainer  # noqa: E402
-
-
-class TestCustomClassificationEnabledGating(unittest.TestCase):
-    """A model with enabled: false must not keep a processor registered."""
-
-    def _make_maintainer(self) -> EmbeddingMaintainer:
-        # Bypass the heavy __init__; only the attributes touched by the
-        # config update path are needed for these tests.
-        maintainer = EmbeddingMaintainer.__new__(EmbeddingMaintainer)
-        maintainer.realtime_processors = []
-        maintainer.config = MagicMock()
-        maintainer.config.classification.custom = {}
-        maintainer.requestor = MagicMock()
-        maintainer.metrics = MagicMock()
-        maintainer.event_metadata_publisher = MagicMock()
-        return maintainer
-
-    def _make_model_config(self, name: str, enabled: bool) -> MagicMock:
-        model_config = MagicMock()
-        model_config.name = name
-        model_config.enabled = enabled
-        model_config.state_config = None
-        return model_config
-
-    def _make_processor(self, name: str) -> MagicMock:
-        processor = MagicMock(spec=CustomObjectClassificationProcessor)
-        processor.model_config = MagicMock()
-        processor.model_config.name = name
-        return processor
-
-    def test_disabled_update_tears_down_existing_processor(self):
-        """Toggling a running model to disabled shuts down and drops its processor."""
-        maintainer = self._make_maintainer()
-        processor = self._make_processor("atli")
-        maintainer.realtime_processors = [processor]
-
-        maintainer._handle_custom_classification_update(
-            "config/classification/custom/atli",
-            self._make_model_config("atli", enabled=False),
-        )
-
-        processor.shutdown.assert_called_once()
-        self.assertEqual(maintainer.realtime_processors, [])
-
-    def test_disabled_update_does_not_register_processor(self):
-        """A disabled model that has no processor is never registered."""
-        maintainer = self._make_maintainer()
-
-        maintainer._handle_custom_classification_update(
-            "config/classification/custom/atli",
-            self._make_model_config("atli", enabled=False),
-        )
-
-        self.assertEqual(maintainer.realtime_processors, [])
-
-    def test_disabled_update_leaves_other_processors_untouched(self):
-        """Disabling one model must not affect other running processors."""
-        maintainer = self._make_maintainer()
-        other = self._make_processor("simbi")
-        maintainer.realtime_processors = [other]
-
-        maintainer._handle_custom_classification_update(
-            "config/classification/custom/atli",
-            self._make_model_config("atli", enabled=False),
-        )
-
-        other.shutdown.assert_not_called()
-        self.assertEqual(maintainer.realtime_processors, [other])
-
-    def test_removed_model_tears_down_processor(self):
-        """A None payload (model deleted) still shuts down its processor."""
-        maintainer = self._make_maintainer()
-        processor = self._make_processor("atli")
-        maintainer.realtime_processors = [processor]
-
-        maintainer._handle_custom_classification_update(
-            "config/classification/custom/atli", None
-        )
-
-        processor.shutdown.assert_called_once()
-        self.assertEqual(maintainer.realtime_processors, [])
-
-
-if __name__ == "__main__":
-    unittest.main()

web/public/locales/en/views/settings.json

@@ -1490,14 +1490,7 @@
       "keyLabel": "Key",
       "valueLabel": "Value",
       "keyPlaceholder": "New key",
-      "remove": "Remove",
+      "remove": "Remove"
-      "providerNameLabel": "Provider name",
-      "providerNamePlaceholder": "e.g., openai",
-      "variableNameLabel": "Variable name",
-      "variableNamePlaceholder": "e.g., MY_VARIABLE",
-      "loggerNameLabel": "Logger name",
-      "loggerNamePlaceholder": "e.g., frigate.record",
-      "keyPatternError": "Use only letters, numbers, hyphens, and underscores (no spaces)"
     },
     "knownPlates": {
       "namePlaceholder": "e.g., Wife's Car",

web/src/components/config-form/section-configs/environment_vars.ts

@@ -7,13 +7,7 @@ const environmentVars: SectionConfigOverrides = {
     advancedFields: [],
     uiSchema: {
       additionalProperties: {
-        "ui:options": {
+        "ui:options": { size: "lg" },
-          size: "lg",
-          additionalPropertyKeyLabel:
-            "configForm.additionalProperties.variableNameLabel",
-          additionalPropertyKeyPlaceholder:
-            "configForm.additionalProperties.variableNamePlaceholder",
-        },
       },
     },
   },

web/src/components/config-form/section-configs/genai.ts

@@ -9,15 +9,7 @@ const genai: SectionConfigOverrides = {
     uiSchema: {
       "ui:options": { disableNestedCard: true },
       "*": {
-        "ui:options": {
+        "ui:options": { disableNestedCard: true },
-          disableNestedCard: true,
-          additionalPropertyKeyLabel:
-            "configForm.additionalProperties.providerNameLabel",
-          additionalPropertyKeyPlaceholder:
-            "configForm.additionalProperties.providerNamePlaceholder",
-          additionalPropertyKeyPattern: "^[a-zA-Z0-9_-]+$",
-          preventKeyRename: true,
-        },
         "ui:order": [
           "provider",
           "api_key",

web/src/components/config-form/section-configs/logger.ts

@@ -12,13 +12,7 @@ const logger: SectionConfigOverrides = {
       },
       logs: {
         additionalProperties: {
-          "ui:options": {
+          "ui:options": { enumI18nPrefix: "logger.logLevel" },
-            enumI18nPrefix: "logger.logLevel",
-            additionalPropertyKeyLabel:
-              "configForm.additionalProperties.loggerNameLabel",
-            additionalPropertyKeyPlaceholder:
-              "configForm.additionalProperties.loggerNamePlaceholder",
-          },
         },
       },
     },

web/src/components/config-form/theme/templates/WrapIfAdditionalTemplate.tsx

@@ -6,14 +6,12 @@ import {
   StrictRJSFSchema,
   WrapIfAdditionalTemplateProps,
 } from "@rjsf/utils";
-import { useEffect, useMemo, useState, type FocusEvent } from "react";
 import { Input } from "@/components/ui/input";
 import { Button } from "@/components/ui/button";
 import { Label } from "@/components/ui/label";
 import { cn } from "@/lib/utils";
 import { useTranslation } from "react-i18next";
 import { LuTrash2 } from "react-icons/lu";
-import type { ConfigFormContext } from "@/types/configForm";
 
 export function WrapIfAdditionalTemplate<
   T = unknown,
@@ -32,7 +30,6 @@ export function WrapIfAdditionalTemplate<
     onKeyRenameBlur,
     readonly,
     required,
-    registry,
     schema,
     uiSchema,
   } = props;
@@ -41,55 +38,6 @@ export function WrapIfAdditionalTemplate<
 
   const additional = ADDITIONAL_PROPERTY_FLAG in schema;
 
-  const uiOptions = getUiOptions(uiSchema);
-  const keyIsReadonly = uiOptions.additionalPropertyKeyReadonly === true;
-
-  const keyLabelKey =
-    typeof uiOptions.additionalPropertyKeyLabel === "string"
-      ? uiOptions.additionalPropertyKeyLabel
-      : undefined;
-  const keyPlaceholderKey =
-    typeof uiOptions.additionalPropertyKeyPlaceholder === "string"
-      ? uiOptions.additionalPropertyKeyPlaceholder
-      : undefined;
-  const keyPattern =
-    typeof uiOptions.additionalPropertyKeyPattern === "string"
-      ? uiOptions.additionalPropertyKeyPattern
-      : undefined;
-  const preventKeyRename = uiOptions.preventKeyRename === true;
-
-  const formContext = registry?.formContext as ConfigFormContext | undefined;
-
-  // optionally, lock the key once it's been saved
-  const baseline = formContext?.baselineFormData;
-  const keyLocked =
-    preventKeyRename &&
-    typeof label === "string" &&
-    !!baseline &&
-    Object.prototype.hasOwnProperty.call(baseline, label);
-
-  // controlled key value so we can validate live and block invalid renames.
-  const [keyValue, setKeyValue] = useState<string>(label ?? "");
-  useEffect(() => {
-    setKeyValue(label ?? "");
-  }, [label]);
-
-  const keyRegex = useMemo(
-    () => (keyPattern ? new RegExp(keyPattern) : undefined),
-    [keyPattern],
-  );
-  const keyError = useMemo(() => {
-    if (!keyRegex || keyLocked) return null;
-    if (!keyRegex.test(keyValue)) {
-      return t("configForm.additionalProperties.keyPatternError", {
-        ns: "views/settings",
-        defaultValue:
-          "Use only letters, numbers, hyphens, and underscores (no spaces)",
-      });
-    }
-    return null;
-  }, [keyRegex, keyLocked, keyValue, t]);
-
   if (!additional) {
     return (
       <div className={classNames} style={style}>
@@ -99,26 +47,20 @@ export function WrapIfAdditionalTemplate<
   }
 
   const keyId = `${id}-key`;
-  const keyLabel = keyLabelKey
+  const keyLabel = t("configForm.additionalProperties.keyLabel", {
-    ? t(keyLabelKey, { ns: "views/settings" })
+    ns: "views/settings",
-    : t("configForm.additionalProperties.keyLabel", { ns: "views/settings" });
+  });
   const valueLabel = t("configForm.additionalProperties.valueLabel", {
     ns: "views/settings",
   });
-  const keyPlaceholder = keyPlaceholderKey
+  const keyPlaceholder = t("configForm.additionalProperties.keyPlaceholder", {
-    ? t(keyPlaceholderKey, { ns: "views/settings" })
+    ns: "views/settings",
-    : t("configForm.additionalProperties.keyPlaceholder", {
+  });
-        ns: "views/settings",
-      });
   const removeLabel = t("configForm.additionalProperties.remove", {
     ns: "views/settings",
   });
-
+  const uiOptions = getUiOptions(uiSchema);
-  const commitKeyRename = (e: FocusEvent<HTMLInputElement>) => {
+  const keyIsReadonly = uiOptions.additionalPropertyKeyReadonly === true;
-    if (readonly) return;
-    if (keyError) return;
-    onKeyRenameBlur?.(e);
-  };
 
   return (
     <div
@@ -128,30 +70,23 @@ export function WrapIfAdditionalTemplate<
       {!keyIsReadonly && (
         <div className="col-span-12 space-y-2 md:col-span-2">
           {displayLabel && <Label htmlFor={keyId}>{keyLabel}</Label>}
-          {keyLocked ? (
+          {keyIsReadonly ? (
             <div
               id={keyId}
-              className="flex items-center break-all text-sm text-primary-variant"
+              className="flex items-center text-sm text-muted-foreground"
             >
               {label}
             </div>
           ) : (
-            <>
+            <Input
-              <Input
+              id={keyId}
-                id={keyId}
+              name={keyId}
-                name={keyId}
+              required={required}
-                required={required}
+              defaultValue={label}
-                value={keyValue}
+              placeholder={keyPlaceholder}
-                placeholder={keyPlaceholder}
+              disabled={disabled || readonly}
-                disabled={disabled || readonly}
+              onBlur={!readonly ? onKeyRenameBlur : undefined}
-                onChange={(e) => setKeyValue(e.target.value)}
+            />
-                onBlur={!readonly ? commitKeyRename : undefined}
-                aria-invalid={keyError ? true : undefined}
-              />
-              {keyError && (
-                <p className="text-xs text-destructive">{keyError}</p>
-              )}
-            </>
           )}
         </div>
       )}