Make reviewed optional and add null to API call

docker/main/rootfs/usr/local/go2rtc/create_config.py

@@ -23,8 +23,28 @@ sys.path.remove("/opt/frigate")
 yaml = YAML()
 
 # Check if arbitrary exec sources are allowed (defaults to False for security)
-ALLOW_ARBITRARY_EXEC = os.environ.get(
-    "GO2RTC_ALLOW_ARBITRARY_EXEC", "false"
+allow_arbitrary_exec = None
+if "GO2RTC_ALLOW_ARBITRARY_EXEC" in os.environ:
+    allow_arbitrary_exec = os.environ.get("GO2RTC_ALLOW_ARBITRARY_EXEC")
+elif (
+    os.path.isdir("/run/secrets")
+    and os.access("/run/secrets", os.R_OK)
+    and "GO2RTC_ALLOW_ARBITRARY_EXEC" in os.listdir("/run/secrets")
+):
+    allow_arbitrary_exec = (
+        Path(os.path.join("/run/secrets", "GO2RTC_ALLOW_ARBITRARY_EXEC"))
+        .read_text()
+        .strip()
+    )
+# check for the add-on options file
+elif os.path.isfile("/data/options.json"):
+    with open("/data/options.json") as f:
+        raw_options = f.read()
+    options = json.loads(raw_options)
+    allow_arbitrary_exec = options.get("go2rtc_allow_arbitrary_exec")
+
+ALLOW_ARBITRARY_EXEC = allow_arbitrary_exec is not None and str(
+    allow_arbitrary_exec
 ).lower() in ("true", "1", "yes")
 
 FRIGATE_ENV_VARS = {k: v for k, v in os.environ.items() if k.startswith("FRIGATE_")}

frigate/api/defs/query/review_query_parameters.py

@@ -10,7 +10,7 @@ class ReviewQueryParams(BaseModel):
     cameras: str = "all"
     labels: str = "all"
     zones: str = "all"
-    reviewed: int = 0
+    reviewed: Union[int, SkipJsonSchema[None]] = None
     limit: Union[int, SkipJsonSchema[None]] = None
     severity: Union[SeverityEnum, SkipJsonSchema[None]] = None
     before: Union[float, SkipJsonSchema[None]] = None

frigate/util/classification.py

@@ -43,6 +43,7 @@ def write_training_metadata(model_name: str, image_count: int) -> None:
         model_name: Name of the classification model
         image_count: Number of images used in training
     """
+    model_name = model_name.strip()
     clips_model_dir = os.path.join(CLIPS_DIR, model_name)
     os.makedirs(clips_model_dir, exist_ok=True)
 
@@ -70,6 +71,7 @@ def read_training_metadata(model_name: str) -> dict[str, any] | None:
     Returns:
         Dictionary with last_training_date and last_training_image_count, or None if not found
     """
+    model_name = model_name.strip()
     clips_model_dir = os.path.join(CLIPS_DIR, model_name)
     metadata_path = os.path.join(clips_model_dir, TRAINING_METADATA_FILE)
 
@@ -95,6 +97,7 @@ def get_dataset_image_count(model_name: str) -> int:
     Returns:
         Total count of images across all categories
     """
+    model_name = model_name.strip()
     dataset_dir = os.path.join(CLIPS_DIR, model_name, "dataset")
 
     if not os.path.exists(dataset_dir):
@@ -126,6 +129,7 @@ class ClassificationTrainingProcess(FrigateProcess):
             "TF_KERAS_MOBILENET_V2_WEIGHTS_URL",
             "",
         )
+        model_name = model_name.strip()
         super().__init__(
             stop_event=None,
             priority=PROCESS_PRIORITY_LOW,
@@ -292,6 +296,7 @@ class ClassificationTrainingProcess(FrigateProcess):
 def kickoff_model_training(
     embeddingRequestor: EmbeddingsRequestor, model_name: str
 ) -> None:
+    model_name = model_name.strip()
     requestor = InterProcessRequestor()
     requestor.send_data(
         UPDATE_MODEL_STATE,
@@ -359,6 +364,7 @@ def collect_state_classification_examples(
         model_name: Name of the classification model
         cameras: Dict mapping camera names to normalized crop coordinates [x1, y1, x2, y2] (0-1)
     """
+    model_name = model_name.strip()
     dataset_dir = os.path.join(CLIPS_DIR, model_name, "dataset")
 
     # Step 1: Get review items for the cameras
@@ -714,6 +720,7 @@ def collect_object_classification_examples(
         model_name: Name of the classification model
         label: Object label to collect (e.g., "person", "car")
     """
+    model_name = model_name.strip()
     dataset_dir = os.path.join(CLIPS_DIR, model_name, "dataset")
     temp_dir = os.path.join(dataset_dir, "temp")
     os.makedirs(temp_dir, exist_ok=True)

web/src/pages/Events.tsx

@@ -205,7 +205,7 @@ export default function Events() {
       cameras: reviewSearchParams["cameras"],
       labels: reviewSearchParams["labels"],
       zones: reviewSearchParams["zones"],
-      reviewed: 1,
+      reviewed: null, // We want both reviewed and unreviewed items as we filter in the UI
       before: reviewSearchParams["before"] || last24Hours.before,
       after: reviewSearchParams["after"] || last24Hours.after,
     };