Merge ef19332fe5c199378f133c96128f603722c99f11 into 5cf2ae0121b60a97fc66d6f77fef0c254f39d3e1

docs/docs/configuration/genai/review_summaries.md

@@ -68,6 +68,36 @@ The mere presence of an unidentified person in private areas during late night h
 
 </details>
 
+### Camera Spatial Context
+
+In addition to defining activity patterns, you can provide spatial context for specific cameras to help the LLM generate more accurate and descriptive titles and scene descriptions. The `camera_context` field allows you to describe physical features and locations that are outside the camera's field of view but are relevant for understanding the scene.
+
+**Important Guidelines:**
+
+- This context is used **only for descriptive purposes** to help the LLM write better titles and scene descriptions
+- It should describe **physical features and spatial relationships** (e.g., "front door is to the right", "driveway on the left")
+- It should **NOT** include subjective assessments or threat evaluations (e.g., "high-crime area")
+- Threat level determination remains based solely on observable actions defined in the activity patterns
+
+Example configuration:
+
+```yaml
+cameras:
+  front_door:
+    review:
+      genai:
+        enabled: true
+        camera_context: |
+          - Front door entrance is to the right of the frame
+          - Driveway and street are to the left
+          - Steps in the center lead from the sidewalk to the front door
+          - Garage is located beyond the left edge of the frame
+```
+
+This helps the LLM generate more natural descriptions like "Person approaching front door" instead of "Person walking toward right side of frame".
+
+The `camera_context` can be defined globally under `genai.review` and overridden per camera for specific spatial details.
+
 ### Image Source
 
 By default, review summaries use preview images (cached preview frames) which have a lower resolution but use fewer tokens per image. For better image quality and more detailed analysis, you can configure Frigate to extract frames directly from recordings at a higher resolution:

docs/docs/configuration/hardware_acceleration_enrichments.md

@@ -5,7 +5,7 @@ title: Enrichments
 
 # Enrichments
 
-Some of Frigate's enrichments can use a discrete GPU or integrated GPU for accelerated processing.
+Some of Frigate's enrichments can use a discrete GPU / NPU for accelerated processing.
 
 ## Requirements
 
@@ -18,10 +18,8 @@ Object detection and enrichments (like Semantic Search, Face Recognition, and Li
 - **Intel**
 
   - OpenVINO will automatically be detected and used for enrichments in the default Frigate image.
-  - **Note:** Intel NPUs have limited model support for enrichments. GPU is recommended for enrichments when available.
 
 - **Nvidia**
-
   - Nvidia GPUs will automatically be detected and used for enrichments in the `-tensorrt` Frigate image.
   - Jetson devices will automatically be detected and used for enrichments in the `-tensorrt-jp6` Frigate image.
 

docs/docs/configuration/object_detectors.md

@@ -261,8 +261,6 @@ OpenVINO is supported on 6th Gen Intel platforms (Skylake) and newer. It will al
 
 :::tip
 
-**NPU + GPU Systems:** If you have both NPU and GPU available (Intel Core Ultra processors), use NPU for object detection and GPU for enrichments (semantic search, face recognition, etc.) for best performance and compatibility.
-
 When using many cameras one detector may not be enough to keep up. Multiple detectors can be defined assuming GPU resources are available. An example configuration would be:
 
 ```yaml
@@ -285,7 +283,7 @@ detectors:
 | [RF-DETR](#rf-detr)                   | ✅  | ✅  | Requires XE iGPU or Arc                                      |
 | [YOLO-NAS](#yolo-nas)                 | ✅  | ✅  |                                                              |
 | [MobileNet v2](#ssdlite-mobilenet-v2) | ✅  | ✅  | Fast and lightweight model, less accurate than larger models |
-| [YOLOX](#yolox)                       | ✅  | ?   |                                                              |
+| [YOLOX](#yolox)                       | ✅  |  ?  |                                                              |
 | [D-FINE](#d-fine)                     | ❌  | ❌  |                                                              |
 
 #### SSDLite MobileNet v2

docs/docs/configuration/semantic_search.md

@@ -78,7 +78,7 @@ Switching between V1 and V2 requires reindexing your embeddings. The embeddings
 
 ### GPU Acceleration
 
-The CLIP models are downloaded in ONNX format, and the `large` model can be accelerated using GPU hardware, when available. This depends on the Docker build that is used. You can also target a specific device in a multi-GPU installation.
+The CLIP models are downloaded in ONNX format, and the `large` model can be accelerated using GPU / NPU hardware, when available. This depends on the Docker build that is used. You can also target a specific device in a multi-GPU installation.
 
 ```yaml
 semantic_search:
@@ -90,7 +90,7 @@ semantic_search:
 
 :::info
 
-If the correct build is used for your GPU / NPU and the `large` model is configured, then the GPU will be detected and used automatically.
+If the correct build is used for your GPU / NPU and the `large` model is configured, then the GPU / NPU will be detected and used automatically.
 Specify the `device` option to target a specific GPU in a multi-GPU system (see [onnxruntime's provider options](https://onnxruntime.ai/docs/execution-providers/)).
 If you do not specify a device, the first available GPU will be used.
 

docs/docs/frigate/installation.md

@@ -94,10 +94,6 @@ $ python -c 'print("{:.2f}MB".format(((1280 * 720 * 1.5 * 20 + 270480) / 1048576
 
 The shm size cannot be set per container for Home Assistant add-ons. However, this is probably not required since by default Home Assistant Supervisor allocates `/dev/shm` with half the size of your total memory. If your machine has 8GB of memory, chances are that Frigate will have access to up to 4GB without any additional configuration.
 
-## Extra Steps for Specific Hardware
-
-The following sections contain additional setup steps that are only required if you are using specific hardware. If you are not using any of these hardware types, you can skip to the [Docker](#docker) installation section.
-
 ### Raspberry Pi 3/4
 
 By default, the Raspberry Pi limits the amount of memory available to the GPU. In order to use ffmpeg hardware acceleration, you must increase the available memory by setting `gpu_mem` to the maximum recommended value in `config.txt` as described in the [official docs](https://www.raspberrypi.org/documentation/computers/config_txt.html#memory-options).
@@ -110,107 +106,14 @@ The Hailo-8 and Hailo-8L AI accelerators are available in both M.2 and HAT form
 
 #### Installation
 
-:::warning
+For Raspberry Pi 5 users with the AI Kit, installation is straightforward. Simply follow this [guide](https://www.raspberrypi.com/documentation/accessories/ai-kit.html#ai-kit-installation) to install the driver and software.
 
-The Raspberry Pi kernel includes an older version of the Hailo driver that is incompatible with Frigate. You **must** follow the installation steps below to install the correct driver version, and you **must** disable the built-in kernel driver as described in step 1.
+For other installations, follow these steps for installation:
 
-:::
-
-1. **Disable the built-in Hailo driver (Raspberry Pi only)**:
-
-   :::note
-
-   If you are **not** using a Raspberry Pi, skip this step and proceed directly to step 2.
-
-   :::
-
-   If you are using a Raspberry Pi, you need to blacklist the built-in kernel Hailo driver to prevent conflicts. First, check if the driver is currently loaded:
-
-   ```bash
-   lsmod | grep hailo
-   ```
-
-   If it shows `hailo_pci`, unload it:
-
-   ```bash
-   sudo rmmod hailo_pci
-   ```
-
-   Now blacklist the driver to prevent it from loading on boot:
-
-   ```bash
-   echo "blacklist hailo_pci" | sudo tee /etc/modprobe.d/blacklist-hailo_pci.conf
-   ```
-
-   Update initramfs to ensure the blacklist takes effect:
-
-   ```bash
-   sudo update-initramfs -u
-   ```
-
-   Reboot your Raspberry Pi:
-
-   ```bash
-   sudo reboot
-   ```
-
-   After rebooting, verify the built-in driver is not loaded:
-
-   ```bash
-   lsmod | grep hailo
-   ```
-
-   This command should return no results. If it still shows `hailo_pci`, the blacklist did not take effect properly and you may need to check for other Hailo packages installed via apt that are loading the driver.
-
-2. **Run the installation script**:
-
-   Download the installation script:
-
-   ```bash
-   wget https://raw.githubusercontent.com/blakeblackshear/frigate/dev/docker/hailo8l/user_installation.sh
-   ```
-
-   Make it executable:
-
-   ```bash
-   sudo chmod +x user_installation.sh
-   ```
-
-   Run the script:
-
-   ```bash
-   ./user_installation.sh
-   ```
-
-   The script will:
-
-   - Install necessary build dependencies
-   - Clone and build the Hailo driver from the official repository
-   - Install the driver
-   - Download and install the required firmware
-   - Set up udev rules
-
-3. **Reboot your system**:
-
-   After the script completes successfully, reboot to load the firmware:
-
-   ```bash
-   sudo reboot
-   ```
-
-4. **Verify the installation**:
-
-   After rebooting, verify that the Hailo device is available:
-
-   ```bash
-   ls -l /dev/hailo0
-   ```
-
-   You should see the device listed. You can also verify the driver is loaded:
-
-   ```bash
-   lsmod | grep hailo_pci
-   ```
+1. Install the driver from the [Hailo GitHub repository](https://github.com/hailo-ai/hailort-drivers). A convenient script for Linux is available to clone the repository, build the driver, and install it.
+2. Copy or download [this script](https://github.com/blakeblackshear/frigate/blob/dev/docker/hailo8l/user_installation.sh).
+3. Ensure it has execution permissions with `sudo chmod +x user_installation.sh`
+4. Run the script with `./user_installation.sh`
 
 #### Setup
 

frigate/api/classification.py

@@ -37,8 +37,6 @@ from frigate.models import Event
 from frigate.util.classification import (
     collect_object_classification_examples,
     collect_state_classification_examples,
-    get_dataset_image_count,
-    read_training_metadata,
 )
 from frigate.util.file import get_event_snapshot
 
@@ -114,18 +112,9 @@ def reclassify_face(request: Request, body: dict = None):
     context: EmbeddingsContext = request.app.embeddings
     response = context.reprocess_face(training_file)
 
-    if not isinstance(response, dict):
-        return JSONResponse(
-            status_code=500,
-            content={
-                "success": False,
-                "message": "Could not process request.",
-            },
-        )
-
     return JSONResponse(
-        status_code=200 if response.get("success", True) else 400,
         content=response,
+        status_code=200,
     )
 
 
@@ -566,54 +555,23 @@ def get_classification_dataset(name: str):
     dataset_dir = os.path.join(CLIPS_DIR, sanitize_filename(name), "dataset")
 
     if not os.path.exists(dataset_dir):
-        return JSONResponse(
-            status_code=200, content={"categories": {}, "training_metadata": None}
-        )
+        return JSONResponse(status_code=200, content={})
 
-    for category_name in os.listdir(dataset_dir):
-        category_dir = os.path.join(dataset_dir, category_name)
+    for name in os.listdir(dataset_dir):
+        category_dir = os.path.join(dataset_dir, name)
 
         if not os.path.isdir(category_dir):
             continue
 
-        dataset_dict[category_name] = []
+        dataset_dict[name] = []
 
         for file in filter(
             lambda f: (f.lower().endswith((".webp", ".png", ".jpg", ".jpeg"))),
             os.listdir(category_dir),
         ):
-            dataset_dict[category_name].append(file)
+            dataset_dict[name].append(file)
 
-    # Get training metadata
-    metadata = read_training_metadata(sanitize_filename(name))
-    current_image_count = get_dataset_image_count(sanitize_filename(name))
-
-    if metadata is None:
-        training_metadata = {
-            "has_trained": False,
-            "last_training_date": None,
-            "last_training_image_count": 0,
-            "current_image_count": current_image_count,
-            "new_images_count": current_image_count,
-        }
-    else:
-        last_training_count = metadata.get("last_training_image_count", 0)
-        new_images_count = max(0, current_image_count - last_training_count)
-        training_metadata = {
-            "has_trained": True,
-            "last_training_date": metadata.get("last_training_date"),
-            "last_training_image_count": last_training_count,
-            "current_image_count": current_image_count,
-            "new_images_count": new_images_count,
-        }
-
-    return JSONResponse(
-        status_code=200,
-        content={
-            "categories": dataset_dict,
-            "training_metadata": training_metadata,
-        },
-    )
+    return JSONResponse(status_code=200, content=dataset_dict)
 
 
 @router.get(
@@ -713,97 +671,6 @@ def delete_classification_dataset_images(
     )
 
 
-@router.put(
-    "/classification/{name}/dataset/{old_category}/rename",
-    response_model=GenericResponse,
-    dependencies=[Depends(require_role(["admin"]))],
-    summary="Rename a classification category",
-    description="""Renames a classification category for a given classification model.
-    The old category must exist and the new name must be valid. Returns a success message or an error if the name is invalid.""",
-)
-def rename_classification_category(
-    request: Request, name: str, old_category: str, body: dict = None
-):
-    config: FrigateConfig = request.app.frigate_config
-
-    if name not in config.classification.custom:
-        return JSONResponse(
-            content=(
-                {
-                    "success": False,
-                    "message": f"{name} is not a known classification model.",
-                }
-            ),
-            status_code=404,
-        )
-
-    json: dict[str, Any] = body or {}
-    new_category = sanitize_filename(json.get("new_category", ""))
-
-    if not new_category:
-        return JSONResponse(
-            content=(
-                {
-                    "success": False,
-                    "message": "New category name is required.",
-                }
-            ),
-            status_code=400,
-        )
-
-    old_folder = os.path.join(
-        CLIPS_DIR, sanitize_filename(name), "dataset", sanitize_filename(old_category)
-    )
-    new_folder = os.path.join(
-        CLIPS_DIR, sanitize_filename(name), "dataset", new_category
-    )
-
-    if not os.path.exists(old_folder):
-        return JSONResponse(
-            content=(
-                {
-                    "success": False,
-                    "message": f"Category {old_category} does not exist.",
-                }
-            ),
-            status_code=404,
-        )
-
-    if os.path.exists(new_folder):
-        return JSONResponse(
-            content=(
-                {
-                    "success": False,
-                    "message": f"Category {new_category} already exists.",
-                }
-            ),
-            status_code=400,
-        )
-
-    try:
-        os.rename(old_folder, new_folder)
-        return JSONResponse(
-            content=(
-                {
-                    "success": True,
-                    "message": f"Successfully renamed category to {new_category}.",
-                }
-            ),
-            status_code=200,
-        )
-    except Exception as e:
-        logger.error(f"Error renaming category: {e}")
-        return JSONResponse(
-            content=(
-                {
-                    "success": False,
-                    "message": "Failed to rename category",
-                }
-            ),
-            status_code=500,
-        )
-
-
 @router.post(
     "/classification/{name}/dataset/categorize",
     response_model=GenericResponse,

frigate/config/camera/review.py

@@ -140,6 +140,10 @@ Evaluate in this order:
 The mere presence of an unidentified person in private areas during late night hours is inherently suspicious and warrants human review, regardless of what activity they appear to be doing or how brief the sequence is.""",
         title="Custom activity context prompt defining normal and suspicious activity patterns for this property.",
     )
+    camera_context: str = Field(
+        default="",
+        title="Spatial context about the camera's field of view to help with descriptive accuracy. Should describe physical features and locations outside the frame.",
+    )
 
 
 class ReviewConfig(FrigateBaseModel):

frigate/data_processing/post/review_descriptions.py

@@ -90,8 +90,7 @@ class ReviewDescriptionProcessor(PostProcessorApi):
         pixels_per_image = width * height
         tokens_per_image = pixels_per_image / 1250
         prompt_tokens = 3500
-        response_tokens = 300
-        available_tokens = context_size - prompt_tokens - response_tokens
+        available_tokens = context_size * 0.98 - prompt_tokens
         max_frames = int(available_tokens / tokens_per_image)
 
         return min(max(max_frames, 3), 20)
@@ -459,6 +458,7 @@ def run_analysis(
         genai_config.preferred_language,
         genai_config.debug_save_thumbnails,
         genai_config.activity_context_prompt,
+        genai_config.camera_context,
     )
     review_inference_speed.update(datetime.datetime.now().timestamp() - start)
 

frigate/data_processing/real_time/custom_classification.py

@@ -227,9 +227,6 @@ class CustomStateClassificationProcessor(RealTimeProcessorApi):
             self.tensor_output_details[0]["index"]
         )[0]
         probs = res / res.sum(axis=0)
-        logger.debug(
-            f"{self.model_config.name} Ran state classification with probabilities: {probs}"
-        )
         best_id = np.argmax(probs)
         score = round(probs[best_id], 2)
         self.__update_metrics(datetime.datetime.now().timestamp() - now)
@@ -421,8 +418,8 @@ class CustomObjectClassificationProcessor(RealTimeProcessorApi):
             obj_data["box"][2],
             obj_data["box"][3],
             max(
-                obj_data["box"][2] - obj_data["box"][0],
-                obj_data["box"][3] - obj_data["box"][1],
+                obj_data["box"][1] - obj_data["box"][0],
+                obj_data["box"][3] - obj_data["box"][2],
             ),
             1.0,
         )
@@ -458,9 +455,6 @@ class CustomObjectClassificationProcessor(RealTimeProcessorApi):
             self.tensor_output_details[0]["index"]
         )[0]
         probs = res / res.sum(axis=0)
-        logger.debug(
-            f"{self.model_config.name} Ran object classification with probabilities: {probs}"
-        )
         best_id = np.argmax(probs)
         score = round(probs[best_id], 2)
         self.__update_metrics(datetime.datetime.now().timestamp() - now)
@@ -552,8 +546,5 @@ def write_classification_attempt(
     )
 
     # delete oldest face image if maximum is reached
-    try:
-        if len(files) > max_files:
-            os.unlink(os.path.join(folder, files[-1]))
-    except FileNotFoundError:
-        pass
+    if len(files) > max_files:
+        os.unlink(os.path.join(folder, files[-1]))

frigate/data_processing/real_time/face.py

@@ -423,10 +423,7 @@ class FaceRealTimeProcessor(RealTimeProcessorApi):
             res = self.recognizer.classify(img)
 
             if not res:
-                return {
-                    "message": "No face was recognized.",
-                    "success": False,
-                }
+                return
 
             sub_label, score = res
 
@@ -445,13 +442,6 @@ class FaceRealTimeProcessor(RealTimeProcessorApi):
                 )
                 shutil.move(current_file, new_file)
 
-            return {
-                "message": f"Successfully reprocessed face. Result: {sub_label} (score: {score:.2f})",
-                "success": True,
-                "face_name": sub_label,
-                "score": score,
-            }
-
     def expire_object(self, object_id: str, camera: str):
         if object_id in self.person_face_history:
             self.person_face_history.pop(object_id)

frigate/detectors/detection_runners.py

@@ -3,7 +3,6 @@
 import logging
 import os
 import platform
-import threading
 from abc import ABC, abstractmethod
 from typing import Any
 
@@ -162,12 +161,12 @@ class CudaGraphRunner(BaseModelRunner):
     """
 
     @staticmethod
-    def is_model_supported(model_type: str) -> bool:
+    def is_complex_model(model_type: str) -> bool:
         # Import here to avoid circular imports
         from frigate.detectors.detector_config import ModelTypeEnum
         from frigate.embeddings.types import EnrichmentModelTypeEnum
 
-        return model_type not in [
+        return model_type in [
             ModelTypeEnum.yolonas.value,
             EnrichmentModelTypeEnum.paddleocr.value,
             EnrichmentModelTypeEnum.jina_v1.value,
@@ -240,30 +239,9 @@ class OpenVINOModelRunner(BaseModelRunner):
             EnrichmentModelTypeEnum.jina_v2.value,
         ]
 
-    @staticmethod
-    def is_model_npu_supported(model_type: str) -> bool:
-        # Import here to avoid circular imports
-        from frigate.embeddings.types import EnrichmentModelTypeEnum
-
-        return model_type not in [
-            EnrichmentModelTypeEnum.paddleocr.value,
-            EnrichmentModelTypeEnum.jina_v1.value,
-            EnrichmentModelTypeEnum.jina_v2.value,
-            EnrichmentModelTypeEnum.arcface.value,
-        ]
-
     def __init__(self, model_path: str, device: str, model_type: str, **kwargs):
         self.model_path = model_path
         self.device = device
-
-        if device == "NPU" and not OpenVINOModelRunner.is_model_npu_supported(
-            model_type
-        ):
-            logger.warning(
-                f"OpenVINO model {model_type} is not supported on NPU, using GPU instead"
-            )
-            device = "GPU"
-
         self.complex_model = OpenVINOModelRunner.is_complex_model(model_type)
 
         if not os.path.isfile(model_path):
@@ -291,10 +269,6 @@ class OpenVINOModelRunner(BaseModelRunner):
         self.infer_request = self.compiled_model.create_infer_request()
         self.input_tensor: ov.Tensor | None = None
 
-        # Thread lock to prevent concurrent inference (needed for JinaV2 which shares
-        # one runner between text and vision embeddings called from different threads)
-        self._inference_lock = threading.Lock()
-
         if not self.complex_model:
             try:
                 input_shape = self.compiled_model.inputs[0].get_shape()
@@ -338,70 +312,67 @@ class OpenVINOModelRunner(BaseModelRunner):
         Returns:
             List of output tensors
         """
-        # Lock prevents concurrent access to infer_request
-        # Needed for JinaV2: genai thread (text) + embeddings thread (vision)
-        with self._inference_lock:
-            # Handle single input case for backward compatibility
-            if (
-                len(inputs) == 1
-                and len(self.compiled_model.inputs) == 1
-                and self.input_tensor is not None
-            ):
-                # Single input case - use the pre-allocated tensor for efficiency
-                input_data = list(inputs.values())[0]
-                np.copyto(self.input_tensor.data, input_data)
-                self.infer_request.infer(self.input_tensor)
-            else:
-                if self.complex_model:
-                    try:
-                        # This ensures the model starts with a clean state for each sequence
-                        # Important for RNN models like PaddleOCR recognition
-                        self.infer_request.reset_state()
-                    except Exception:
-                        # this will raise an exception for models with AUTO set as the device
-                        pass
+        # Handle single input case for backward compatibility
+        if (
+            len(inputs) == 1
+            and len(self.compiled_model.inputs) == 1
+            and self.input_tensor is not None
+        ):
+            # Single input case - use the pre-allocated tensor for efficiency
+            input_data = list(inputs.values())[0]
+            np.copyto(self.input_tensor.data, input_data)
+            self.infer_request.infer(self.input_tensor)
+        else:
+            if self.complex_model:
+                try:
+                    # This ensures the model starts with a clean state for each sequence
+                    # Important for RNN models like PaddleOCR recognition
+                    self.infer_request.reset_state()
+                except Exception:
+                    # this will raise an exception for models with AUTO set as the device
+                    pass
 
-                # Multiple inputs case - set each input by name
-                for input_name, input_data in inputs.items():
-                    # Find the input by name and its index
-                    input_port = None
-                    input_index = None
-                    for idx, port in enumerate(self.compiled_model.inputs):
-                        if port.get_any_name() == input_name:
-                            input_port = port
-                            input_index = idx
-                            break
+            # Multiple inputs case - set each input by name
+            for input_name, input_data in inputs.items():
+                # Find the input by name and its index
+                input_port = None
+                input_index = None
+                for idx, port in enumerate(self.compiled_model.inputs):
+                    if port.get_any_name() == input_name:
+                        input_port = port
+                        input_index = idx
+                        break
 
-                    if input_port is None:
-                        raise ValueError(f"Input '{input_name}' not found in model")
+                if input_port is None:
+                    raise ValueError(f"Input '{input_name}' not found in model")
 
-                    # Create tensor with the correct element type
-                    input_element_type = input_port.get_element_type()
+                # Create tensor with the correct element type
+                input_element_type = input_port.get_element_type()
 
-                    # Ensure input data matches the expected dtype to prevent type mismatches
-                    # that can occur with models like Jina-CLIP v2 running on OpenVINO
-                    expected_dtype = input_element_type.to_dtype()
-                    if input_data.dtype != expected_dtype:
-                        logger.debug(
-                            f"Converting input '{input_name}' from {input_data.dtype} to {expected_dtype}"
-                        )
-                        input_data = input_data.astype(expected_dtype)
+                # Ensure input data matches the expected dtype to prevent type mismatches
+                # that can occur with models like Jina-CLIP v2 running on OpenVINO
+                expected_dtype = input_element_type.to_dtype()
+                if input_data.dtype != expected_dtype:
+                    logger.debug(
+                        f"Converting input '{input_name}' from {input_data.dtype} to {expected_dtype}"
+                    )
+                    input_data = input_data.astype(expected_dtype)
 
-                    input_tensor = ov.Tensor(input_element_type, input_data.shape)
-                    np.copyto(input_tensor.data, input_data)
+                input_tensor = ov.Tensor(input_element_type, input_data.shape)
+                np.copyto(input_tensor.data, input_data)
 
-                    # Set the input tensor for the specific port index
-                    self.infer_request.set_input_tensor(input_index, input_tensor)
+                # Set the input tensor for the specific port index
+                self.infer_request.set_input_tensor(input_index, input_tensor)
 
-                # Run inference
-                self.infer_request.infer()
+            # Run inference
+            self.infer_request.infer()
 
-            # Get all output tensors
-            outputs = []
-            for i in range(len(self.compiled_model.outputs)):
-                outputs.append(self.infer_request.get_output_tensor(i).data)
+        # Get all output tensors
+        outputs = []
+        for i in range(len(self.compiled_model.outputs)):
+            outputs.append(self.infer_request.get_output_tensor(i).data)
 
-            return outputs
+        return outputs
 
 
 class RKNNModelRunner(BaseModelRunner):
@@ -529,7 +500,7 @@ def get_optimized_runner(
             return OpenVINOModelRunner(model_path, device, model_type, **kwargs)
 
     if (
-        CudaGraphRunner.is_model_supported(model_type)
+        not CudaGraphRunner.is_complex_model(model_type)
         and providers[0] == "CUDAExecutionProvider"
     ):
         options[0] = {

frigate/genai/__init__.py

@@ -45,6 +45,7 @@ class GenAIClient:
         preferred_language: str | None,
         debug_save: bool,
         activity_context_prompt: str,
+        camera_context: str = "",
     ) -> ReviewMetadata | None:
         """Generate a description for the review item activity."""
 
@@ -69,6 +70,16 @@ class GenAIClient:
             else:
                 return "\n- (No objects detected)"
 
+        def get_camera_context_section() -> str:
+            if camera_context:
+                return f"""## Camera Spatial Context
+
+Use this spatial information when writing the title and scene description to provide more accurate context about where activity is occurring or where people/objects are moving to/from.
+
+{camera_context}"""
+            return ""
+
+        camera_context_section = get_camera_context_section()
         context_prompt = f"""
 Your task is to analyze the sequence of images ({len(thumbnails)} total) taken in chronological order from the perspective of the {review_data["camera"].replace("_", " ")} security camera.
 
@@ -76,6 +87,8 @@ Your task is to analyze the sequence of images ({len(thumbnails)} total) taken i
 
 {activity_context_prompt}
 
+{camera_context_section}
+
 ## Task Instructions
 
 Your task is to provide a clear, accurate description of the scene that:
@@ -100,8 +113,8 @@ When forming your description:
 ## Response Format
 
 Your response MUST be a flat JSON object with:
-- `title` (string): A concise, direct title that describes the primary action or event in the sequence, not just what you literally see. Use spatial context when available to make titles more meaningful. When multiple objects/actions are present, prioritize whichever is most prominent or occurs first. Use names from "Objects in Scene" based on what you visually observe. If you see both a name and an unidentified object of the same type but visually observe only one person/object, use ONLY the name. Examples: "Joe walking dog", "Person taking out trash", "Vehicle arriving in driveway", "Joe accessing vehicle", "Person leaving porch for driveway".
-- `scene` (string): A narrative description of what happens across the sequence from start to finish, in chronological order. Start by describing how the sequence begins, then describe the progression of events. **Describe all significant movements and actions in the order they occur.** For example, if a vehicle arrives and then a person exits, describe both actions sequentially. **Only describe actions you can actually observe happening in the frames provided.** Do not infer or assume actions that aren't visible (e.g., if you see someone walking but never see them sit, don't say they sat down). Include setting, detected objects, and their observable actions. Avoid speculation or filling in assumed behaviors. Your description should align with and support the threat level you assign.
+- `title` (string): A concise, direct title that describes the purpose or overall action, not just what you literally see. {"Use spatial context when available to make titles more meaningful." if camera_context_section else ""} Use names from "Objects in Scene" based on what you visually observe. If you see both a name and an unidentified object of the same type but visually observe only one person/object, use ONLY the name. Examples: "Joe walking dog", "Person taking out trash", "Joe accessing vehicle", "Person leaving porch for driveway", "Joe and person on front porch".
+- `scene` (string): A narrative description of what happens across the sequence from start to finish. **Only describe actions you can actually observe happening in the frames provided.** Do not infer or assume actions that aren't visible (e.g., if you see someone walking but never see them sit, don't say they sat down). Include setting, detected objects, and their observable actions. Avoid speculation or filling in assumed behaviors. Your description should align with and support the threat level you assign.
 - `confidence` (float): 0-1 confidence in your analysis. Higher confidence when objects/actions are clearly visible and context is unambiguous. Lower confidence when the sequence is unclear, objects are partially obscured, or context is ambiguous.
 - `potential_threat_level` (integer): 0, 1, or 2 as defined in "Normal Activity Patterns for This Property" above. Your threat level must be consistent with your scene description and the guidance above.
 {get_concern_prompt()}

frigate/review/maintainer.py

@@ -407,19 +407,6 @@ class ReviewSegmentMaintainer(threading.Thread):
                 segment.last_detection_time = frame_time
 
             for object in activity.get_all_objects():
-                # Alert-level objects should always be added (they extend/upgrade the segment)
-                # Detection-level objects should only be added if:
-                #   - The segment is a detection segment (matching severity), OR
-                #   - The segment is an alert AND the object started before the alert ended
-                #     (objects starting after will be in the new detection segment)
-                is_alert_object = object in activity.categorized_objects["alerts"]
-
-                if not is_alert_object and segment.severity == SeverityEnum.alert:
-                    # This is a detection-level object
-                    # Only add if it started during the alert's active period
-                    if object["start_time"] > segment.last_alert_time:
-                        continue
-
                 if not object["sub_label"]:
                     segment.detections[object["id"]] = object["label"]
                 elif object["sub_label"][0] in self.config.model.all_attributes:

frigate/types.py

@@ -23,7 +23,6 @@ class ModelStatusTypesEnum(str, Enum):
     error = "error"
     training = "training"
     complete = "complete"
-    failed = "failed"
 
 
 class TrackedObjectUpdateTypesEnum(str, Enum):

frigate/util/classification.py

@@ -1,7 +1,5 @@
 """Util for classification models."""
 
-import datetime
-import json
 import logging
 import os
 import random
@@ -29,96 +27,10 @@ from frigate.util.process import FrigateProcess
 BATCH_SIZE = 16
 EPOCHS = 50
 LEARNING_RATE = 0.001
-TRAINING_METADATA_FILE = ".training_metadata.json"
 
 logger = logging.getLogger(__name__)
 
 
-def write_training_metadata(model_name: str, image_count: int) -> None:
-    """
-    Write training metadata to a hidden file in the model's clips directory.
-
-    Args:
-        model_name: Name of the classification model
-        image_count: Number of images used in training
-    """
-    clips_model_dir = os.path.join(CLIPS_DIR, model_name)
-    os.makedirs(clips_model_dir, exist_ok=True)
-
-    metadata_path = os.path.join(clips_model_dir, TRAINING_METADATA_FILE)
-    metadata = {
-        "last_training_date": datetime.datetime.now().isoformat(),
-        "last_training_image_count": image_count,
-    }
-
-    try:
-        with open(metadata_path, "w") as f:
-            json.dump(metadata, f, indent=2)
-        logger.info(f"Wrote training metadata for {model_name}: {image_count} images")
-    except Exception as e:
-        logger.error(f"Failed to write training metadata for {model_name}: {e}")
-
-
-def read_training_metadata(model_name: str) -> dict[str, any] | None:
-    """
-    Read training metadata from the hidden file in the model's clips directory.
-
-    Args:
-        model_name: Name of the classification model
-
-    Returns:
-        Dictionary with last_training_date and last_training_image_count, or None if not found
-    """
-    clips_model_dir = os.path.join(CLIPS_DIR, model_name)
-    metadata_path = os.path.join(clips_model_dir, TRAINING_METADATA_FILE)
-
-    if not os.path.exists(metadata_path):
-        return None
-
-    try:
-        with open(metadata_path, "r") as f:
-            metadata = json.load(f)
-        return metadata
-    except Exception as e:
-        logger.error(f"Failed to read training metadata for {model_name}: {e}")
-        return None
-
-
-def get_dataset_image_count(model_name: str) -> int:
-    """
-    Count the total number of images in the model's dataset directory.
-
-    Args:
-        model_name: Name of the classification model
-
-    Returns:
-        Total count of images across all categories
-    """
-    dataset_dir = os.path.join(CLIPS_DIR, model_name, "dataset")
-
-    if not os.path.exists(dataset_dir):
-        return 0
-
-    total_count = 0
-    try:
-        for category in os.listdir(dataset_dir):
-            category_dir = os.path.join(dataset_dir, category)
-            if not os.path.isdir(category_dir):
-                continue
-
-            image_files = [
-                f
-                for f in os.listdir(category_dir)
-                if f.lower().endswith((".webp", ".png", ".jpg", ".jpeg"))
-            ]
-            total_count += len(image_files)
-    except Exception as e:
-        logger.error(f"Failed to count dataset images for {model_name}: {e}")
-        return 0
-
-    return total_count
-
-
 class ClassificationTrainingProcess(FrigateProcess):
     def __init__(self, model_name: str) -> None:
         super().__init__(
@@ -130,8 +42,7 @@ class ClassificationTrainingProcess(FrigateProcess):
 
     def run(self) -> None:
         self.pre_run_setup()
-        success = self.__train_classification_model()
-        exit(0 if success else 1)
+        self.__train_classification_model()
 
     def __generate_representative_dataset_factory(self, dataset_dir: str):
         def generate_representative_dataset():
@@ -154,117 +65,85 @@ class ClassificationTrainingProcess(FrigateProcess):
     @redirect_output_to_logger(logger, logging.DEBUG)
     def __train_classification_model(self) -> bool:
         """Train a classification model."""
-        try:
-            # import in the function so that tensorflow is not initialized multiple times
-            import tensorflow as tf
-            from tensorflow.keras import layers, models, optimizers
-            from tensorflow.keras.applications import MobileNetV2
-            from tensorflow.keras.preprocessing.image import ImageDataGenerator
 
-            dataset_dir = os.path.join(CLIPS_DIR, self.model_name, "dataset")
-            model_dir = os.path.join(MODEL_CACHE_DIR, self.model_name)
-            os.makedirs(model_dir, exist_ok=True)
+        # import in the function so that tensorflow is not initialized multiple times
+        import tensorflow as tf
+        from tensorflow.keras import layers, models, optimizers
+        from tensorflow.keras.applications import MobileNetV2
+        from tensorflow.keras.preprocessing.image import ImageDataGenerator
 
-            num_classes = len(
-                [
-                    d
-                    for d in os.listdir(dataset_dir)
-                    if os.path.isdir(os.path.join(dataset_dir, d))
-                ]
-            )
+        logger.info(f"Kicking off classification training for {self.model_name}.")
+        dataset_dir = os.path.join(CLIPS_DIR, self.model_name, "dataset")
+        model_dir = os.path.join(MODEL_CACHE_DIR, self.model_name)
+        os.makedirs(model_dir, exist_ok=True)
+        num_classes = len(
+            [
+                d
+                for d in os.listdir(dataset_dir)
+                if os.path.isdir(os.path.join(dataset_dir, d))
+            ]
+        )
 
-            if num_classes < 2:
-                logger.error(
-                    f"Training failed for {self.model_name}: Need at least 2 classes, found {num_classes}"
-                )
-                return False
+        # Start with imagenet base model with 35% of channels in each layer
+        base_model = MobileNetV2(
+            input_shape=(224, 224, 3),
+            include_top=False,
+            weights="imagenet",
+            alpha=0.35,
+        )
+        base_model.trainable = False  # Freeze pre-trained layers
 
-            # Start with imagenet base model with 35% of channels in each layer
-            base_model = MobileNetV2(
-                input_shape=(224, 224, 3),
-                include_top=False,
-                weights="imagenet",
-                alpha=0.35,
-            )
-            base_model.trainable = False  # Freeze pre-trained layers
+        model = models.Sequential(
+            [
+                base_model,
+                layers.GlobalAveragePooling2D(),
+                layers.Dense(128, activation="relu"),
+                layers.Dropout(0.3),
+                layers.Dense(num_classes, activation="softmax"),
+            ]
+        )
 
-            model = models.Sequential(
-                [
-                    base_model,
-                    layers.GlobalAveragePooling2D(),
-                    layers.Dense(128, activation="relu"),
-                    layers.Dropout(0.3),
-                    layers.Dense(num_classes, activation="softmax"),
-                ]
-            )
+        model.compile(
+            optimizer=optimizers.Adam(learning_rate=LEARNING_RATE),
+            loss="categorical_crossentropy",
+            metrics=["accuracy"],
+        )
 
-            model.compile(
-                optimizer=optimizers.Adam(learning_rate=LEARNING_RATE),
-                loss="categorical_crossentropy",
-                metrics=["accuracy"],
-            )
+        # create training set
+        datagen = ImageDataGenerator(rescale=1.0 / 255, validation_split=0.2)
+        train_gen = datagen.flow_from_directory(
+            dataset_dir,
+            target_size=(224, 224),
+            batch_size=BATCH_SIZE,
+            class_mode="categorical",
+            subset="training",
+        )
 
-            # create training set
-            datagen = ImageDataGenerator(rescale=1.0 / 255, validation_split=0.2)
-            train_gen = datagen.flow_from_directory(
-                dataset_dir,
-                target_size=(224, 224),
-                batch_size=BATCH_SIZE,
-                class_mode="categorical",
-                subset="training",
-            )
+        # write labelmap
+        class_indices = train_gen.class_indices
+        index_to_class = {v: k for k, v in class_indices.items()}
+        sorted_classes = [index_to_class[i] for i in range(len(index_to_class))]
+        with open(os.path.join(model_dir, "labelmap.txt"), "w") as f:
+            for class_name in sorted_classes:
+                f.write(f"{class_name}\n")
 
-            total_images = train_gen.samples
-            logger.debug(
-                f"Training {self.model_name}: {total_images} images across {num_classes} classes"
-            )
+        # train the model
+        model.fit(train_gen, epochs=EPOCHS, verbose=0)
 
-            # write labelmap
-            class_indices = train_gen.class_indices
-            index_to_class = {v: k for k, v in class_indices.items()}
-            sorted_classes = [index_to_class[i] for i in range(len(index_to_class))]
-            with open(os.path.join(model_dir, "labelmap.txt"), "w") as f:
-                for class_name in sorted_classes:
-                    f.write(f"{class_name}\n")
+        # convert model to tflite
+        converter = tf.lite.TFLiteConverter.from_keras_model(model)
+        converter.optimizations = [tf.lite.Optimize.DEFAULT]
+        converter.representative_dataset = (
+            self.__generate_representative_dataset_factory(dataset_dir)
+        )
+        converter.target_spec.supported_ops = [tf.lite.OpsSet.TFLITE_BUILTINS_INT8]
+        converter.inference_input_type = tf.uint8
+        converter.inference_output_type = tf.uint8
+        tflite_model = converter.convert()
 
-            # train the model
-            logger.debug(f"Training {self.model_name} for {EPOCHS} epochs...")
-            model.fit(train_gen, epochs=EPOCHS, verbose=0)
-            logger.debug(f"Converting {self.model_name} to TFLite...")
-
-            # convert model to tflite
-            converter = tf.lite.TFLiteConverter.from_keras_model(model)
-            converter.optimizations = [tf.lite.Optimize.DEFAULT]
-            converter.representative_dataset = (
-                self.__generate_representative_dataset_factory(dataset_dir)
-            )
-            converter.target_spec.supported_ops = [tf.lite.OpsSet.TFLITE_BUILTINS_INT8]
-            converter.inference_input_type = tf.uint8
-            converter.inference_output_type = tf.uint8
-            tflite_model = converter.convert()
-
-            # write model
-            model_path = os.path.join(model_dir, "model.tflite")
-            with open(model_path, "wb") as f:
-                f.write(tflite_model)
-
-            # verify model file was written successfully
-            if not os.path.exists(model_path) or os.path.getsize(model_path) == 0:
-                logger.error(
-                    f"Training failed for {self.model_name}: Model file was not created or is empty"
-                )
-                return False
-
-            # write training metadata with image count
-            dataset_image_count = get_dataset_image_count(self.model_name)
-            write_training_metadata(self.model_name, dataset_image_count)
-
-            logger.info(f"Finished training {self.model_name}")
-            return True
-
-        except Exception as e:
-            logger.error(f"Training failed for {self.model_name}: {e}", exc_info=True)
-            return False
+        # write model
+        with open(os.path.join(model_dir, "model.tflite"), "wb") as f:
+            f.write(tflite_model)
 
 
 def kickoff_model_training(
@@ -286,36 +165,18 @@ def kickoff_model_training(
     training_process.start()
     training_process.join()
 
-    # check if training succeeded by examining the exit code
-    training_success = training_process.exitcode == 0
-
-    if training_success:
-        # reload model and mark training as complete
-        embeddingRequestor.send_data(
-            EmbeddingsRequestEnum.reload_classification_model.value,
-            {"model_name": model_name},
-        )
-        requestor.send_data(
-            UPDATE_MODEL_STATE,
-            {
-                "model": model_name,
-                "state": ModelStatusTypesEnum.complete,
-            },
-        )
-    else:
-        logger.error(
-            f"Training subprocess failed for {model_name} (exit code: {training_process.exitcode})"
-        )
-        # mark training as failed so UI shows error state
-        # don't reload the model since it failed
-        requestor.send_data(
-            UPDATE_MODEL_STATE,
-            {
-                "model": model_name,
-                "state": ModelStatusTypesEnum.failed,
-            },
-        )
-
+    # reload model and mark training as complete
+    embeddingRequestor.send_data(
+        EmbeddingsRequestEnum.reload_classification_model.value,
+        {"model_name": model_name},
+    )
+    requestor.send_data(
+        UPDATE_MODEL_STATE,
+        {
+            "model": model_name,
+            "state": ModelStatusTypesEnum.complete,
+        },
+    )
     requestor.stop()
 
 

web/public/locales/en/common.json

@@ -96,9 +96,7 @@
     "back": "Go back",
     "hide": "Hide {{item}}",
     "show": "Show {{item}}",
-    "ID": "ID",
-    "none": "None",
-    "all": "All"
+    "ID": "ID"
   },
   "list": {
     "two": "{{0}} and {{1}}",

web/public/locales/en/config/review.json

@@ -67,6 +67,9 @@
         },
         "activity_context_prompt": {
           "label": "Custom activity context prompt defining normal activity patterns for this property."
+        },
+        "camera_context": {
+          "label": "Spatial context about the camera's field of view to help with descriptive accuracy. Should describe physical features and locations outside the frame. This is for spatial reference only and should NOT include subjective assessments."
         }
       }
     }

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

@@ -13,11 +13,6 @@
     "deleteModels": "Delete Models",
     "editModel": "Edit Model"
   },
-  "tooltip": {
-    "trainingInProgress": "Model is currently training",
-    "noNewImages": "No new images to train. Classify more images in the dataset first.",
-    "modelNotReady": "Model is not ready for training"
-  },
   "toast": {
     "success": {
       "deletedCategory": "Deleted Class",
@@ -27,18 +22,15 @@
       "categorizedImage": "Successfully Classified Image",
       "trainedModel": "Successfully trained model.",
       "trainingModel": "Successfully started model training.",
-      "updatedModel": "Successfully updated model configuration",
-      "renamedCategory": "Successfully renamed class to {{name}}"
+      "updatedModel": "Successfully updated model configuration"
     },
     "error": {
       "deleteImageFailed": "Failed to delete: {{errorMessage}}",
       "deleteCategoryFailed": "Failed to delete class: {{errorMessage}}",
       "deleteModelFailed": "Failed to delete model: {{errorMessage}}",
       "categorizeFailed": "Failed to categorize image: {{errorMessage}}",
-      "trainingFailed": "Model training failed. Check Frigate logs for details.",
-      "trainingFailedToStart": "Failed to start model training: {{errorMessage}}",
-      "updateModelFailed": "Failed to update model: {{errorMessage}}",
-      "renameCategoryFailed": "Failed to rename class: {{errorMessage}}"
+      "trainingFailed": "Failed to start model training: {{errorMessage}}",
+      "updateModelFailed": "Failed to update model: {{errorMessage}}"
     }
   },
   "deleteCategory": {
@@ -149,8 +141,6 @@
     "step3": {
       "selectImagesPrompt": "Select all images with: {{className}}",
       "selectImagesDescription": "Click on images to select them. Click Continue when you're done with this class.",
-      "allImagesRequired_one": "Please classify all images. {{count}} image remaining.",
-      "allImagesRequired_other": "Please classify all images. {{count}} images remaining.",
       "generating": {
         "title": "Generating Sample Images",
         "description": "Frigate is pulling representative images from your recordings. This may take a moment..."

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

@@ -75,7 +75,7 @@
       "deletedName_other": "{{count}} faces have been successfully deleted.",
       "renamedFace": "Successfully renamed face to {{name}}",
       "trainedFace": "Successfully trained face.",
-      "updatedFaceScore": "Successfully updated face score to {{name}} ({{score}})."
+      "updatedFaceScore": "Successfully updated face score."
     },
     "error": {
       "uploadingImageFailed": "Failed to upload image: {{errorMessage}}",

web/src/components/card/ClassificationCard.tsx

@@ -148,13 +148,13 @@ export const ClassificationCard = forwardRef<
         <div
           className={cn(
             "flex flex-col items-start text-white",
-            data.score != undefined ? "text-xs" : "text-sm",
+            data.score ? "text-xs" : "text-sm",
           )}
         >
           <div className="smart-capitalize">
             {data.name == "unknown" ? t("details.unknown") : data.name}
           </div>
-          {data.score != undefined && (
+          {data.score && (
             <div
               className={cn(
                 "",

web/src/components/classification/wizard/Step3ChooseExamples.tsx

@@ -10,12 +10,6 @@ import useSWR from "swr";
 import { baseUrl } from "@/api/baseUrl";
 import { isMobile } from "react-device-detect";
 import { cn } from "@/lib/utils";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-import { TooltipPortal } from "@radix-ui/react-tooltip";
 
 export type Step3FormData = {
   examplesGenerated: boolean;
@@ -323,19 +317,6 @@ export default function Step3ChooseExamples({
     return unclassifiedImages.length === 0;
   }, [unclassifiedImages]);
 
-  // For state models on the last class, require all images to be classified
-  const isLastClass = currentClassIndex === allClasses.length - 1;
-  const canProceed = useMemo(() => {
-    if (
-      step1Data.modelType === "state" &&
-      isLastClass &&
-      !allImagesClassified
-    ) {
-      return false;
-    }
-    return true;
-  }, [step1Data.modelType, isLastClass, allImagesClassified]);
-
   const handleBack = useCallback(() => {
     if (currentClassIndex > 0) {
       const previousClass = allClasses[currentClassIndex - 1];
@@ -457,35 +438,20 @@ export default function Step3ChooseExamples({
           <Button type="button" onClick={handleBack} className="sm:flex-1">
             {t("button.back", { ns: "common" })}
           </Button>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <Button
-                type="button"
-                onClick={
-                  allImagesClassified
-                    ? handleContinue
-                    : handleContinueClassification
-                }
-                variant="select"
-                className="flex items-center justify-center gap-2 sm:flex-1"
-                disabled={
-                  !hasGenerated || isGenerating || isProcessing || !canProceed
-                }
-              >
-                {isProcessing && <ActivityIndicator className="size-4" />}
-                {t("button.continue", { ns: "common" })}
-              </Button>
-            </TooltipTrigger>
-            {!canProceed && (
-              <TooltipPortal>
-                <TooltipContent>
-                  {t("wizard.step3.allImagesRequired", {
-                    count: unclassifiedImages.length,
-                  })}
-                </TooltipContent>
-              </TooltipPortal>
-            )}
-          </Tooltip>
+          <Button
+            type="button"
+            onClick={
+              allImagesClassified
+                ? handleContinue
+                : handleContinueClassification
+            }
+            variant="select"
+            className="flex items-center justify-center gap-2 sm:flex-1"
+            disabled={!hasGenerated || isGenerating || isProcessing}
+          >
+            {isProcessing && <ActivityIndicator className="size-4" />}
+            {t("button.continue", { ns: "common" })}
+          </Button>
         </div>
       )}
     </div>

web/src/components/overlay/CreateTriggerDialog.tsx

@@ -159,7 +159,7 @@ export default function CreateTriggerDialog({
   });
 
   const onSubmit = async (values: z.infer<typeof formSchema>) => {
-    if (trigger && existingTriggerNames.includes(trigger.name)) {
+    if (trigger) {
       onEdit({ ...values });
     } else {
       onCreate(

web/src/components/overlay/detail/DetailActionsMenu.tsx

@@ -55,32 +55,29 @@ export default function DetailActionsMenu({
       </DropdownMenuTrigger>
       <DropdownMenuPortal>
         <DropdownMenuContent align="end">
-          {search.has_snapshot && (
-            <DropdownMenuItem>
-              <a
-                className="w-full"
-                href={`${baseUrl}api/events/${search.id}/snapshot.jpg?bbox=1`}
-                download={`${search.camera}_${search.label}.jpg`}
-              >
-                <div className="flex cursor-pointer items-center gap-2">
-                  <span>{t("itemMenu.downloadSnapshot.label")}</span>
-                </div>
-              </a>
-            </DropdownMenuItem>
-          )}
-          {search.has_clip && (
-            <DropdownMenuItem>
-              <a
-                className="w-full"
-                href={`${baseUrl}api/${search.camera}/${clipTimeRange}/clip.mp4`}
-                download
-              >
-                <div className="flex cursor-pointer items-center gap-2">
-                  <span>{t("itemMenu.downloadVideo.label")}</span>
-                </div>
-              </a>
-            </DropdownMenuItem>
-          )}
+          <DropdownMenuItem>
+            <a
+              className="w-full"
+              href={`${baseUrl}api/events/${search.id}/snapshot.jpg?bbox=1`}
+              download={`${search.camera}_${search.label}.jpg`}
+            >
+              <div className="flex cursor-pointer items-center gap-2">
+                <span>{t("itemMenu.downloadSnapshot.label")}</span>
+              </div>
+            </a>
+          </DropdownMenuItem>
+
+          <DropdownMenuItem>
+            <a
+              className="w-full"
+              href={`${baseUrl}api/${search.camera}/${clipTimeRange}/clip.mp4`}
+              download
+            >
+              <div className="flex cursor-pointer items-center gap-2">
+                <span>{t("itemMenu.downloadVideo.label")}</span>
+              </div>
+            </a>
+          </DropdownMenuItem>
 
           {config?.semantic_search.enabled &&
             setSimilarity != undefined &&

web/src/components/overlay/detail/SearchDetailDialog.tsx

@@ -34,11 +34,9 @@ import ActivityIndicator from "@/components/indicators/activity-indicator";
 import {
   FaArrowRight,
   FaCheckCircle,
+  FaChevronDown,
   FaChevronLeft,
   FaChevronRight,
-  FaMicrophone,
-  FaCheck,
-  FaTimes,
 } from "react-icons/fa";
 import { TrackingDetails } from "./TrackingDetails";
 import { AnnotationSettingsPane } from "./AnnotationSettingsPane";
@@ -74,12 +72,7 @@ import {
   PopoverContent,
   PopoverTrigger,
 } from "@/components/ui/popover";
-import {
-  Drawer,
-  DrawerContent,
-  DrawerTitle,
-  DrawerTrigger,
-} from "@/components/ui/drawer";
+import { Drawer, DrawerContent, DrawerTrigger } from "@/components/ui/drawer";
 import { LuInfo } from "react-icons/lu";
 import { TooltipPortal } from "@radix-ui/react-tooltip";
 import { FaPencilAlt } from "react-icons/fa";
@@ -91,7 +84,6 @@ import { CameraNameLabel } from "@/components/camera/FriendlyNameLabel";
 import { DialogPortal } from "@radix-ui/react-dialog";
 import { useDetailStream } from "@/context/detail-stream-context";
 import { PiSlidersHorizontalBold } from "react-icons/pi";
-import { HiSparkles } from "react-icons/hi";
 
 const SEARCH_TABS = ["snapshot", "tracking_details"] as const;
 export type SearchTab = (typeof SEARCH_TABS)[number];
@@ -134,7 +126,7 @@ function TabsWithActions({
   return (
     <div className="flex items-center justify-between gap-1">
       <ScrollArea className="flex-1 whitespace-nowrap">
-        <div className="mb-2 flex flex-row">
+        <div className="mb-2 flex flex-row md:mb-0">
           <ToggleGroup
             className="*:rounded-md *:px-3 *:py-4"
             type="single"
@@ -232,7 +224,6 @@ function AnnotationSettings({
   const Overlay = isDesktop ? Popover : Drawer;
   const Trigger = isDesktop ? PopoverTrigger : DrawerTrigger;
   const Content = isDesktop ? PopoverContent : DrawerContent;
-  const Title = isDesktop ? "div" : DrawerTitle;
   const contentProps = isDesktop
     ? { align: "end" as const, container: container ?? undefined }
     : {};
@@ -257,9 +248,7 @@ function AnnotationSettings({
             <PiSlidersHorizontalBold className="size-5" />
           </Button>
         </Trigger>
-        <Title className="sr-only">
-          {t("trackingDetails.adjustAnnotationSettings")}
-        </Title>
+
         <Content
           className={
             isDesktop
@@ -317,7 +306,7 @@ function DialogContentComponent({
   if (page === "tracking_details") {
     return (
       <TrackingDetails
-        className={cn(isDesktop ? "size-full" : "flex flex-col gap-4")}
+        className={cn("size-full", !isDesktop && "flex flex-col gap-4")}
         event={search as unknown as Event}
         tabs={
           isDesktop ? (
@@ -351,12 +340,7 @@ function DialogContentComponent({
       }
     />
   ) : (
-    <div
-      className={cn(
-        "max-w-lg",
-        !isDesktop ? "mb-4 w-full" : "mx-auto size-full",
-      )}
-    >
+    <div className={cn(!isDesktop ? "mb-4 w-full" : "size-full")}>
       <img
         className="w-full select-none rounded-lg object-contain transition-opacity"
         style={
@@ -375,11 +359,16 @@ function DialogContentComponent({
 
   if (isDesktop) {
     return (
-      <div className="grid h-full w-full grid-cols-[60%_40%] gap-4">
-        <div className="scrollbar-container min-w-0 overflow-y-auto overflow-x-hidden">
+      <div className="flex h-full gap-4 overflow-hidden">
+        <div
+          className={cn(
+            "scrollbar-container flex-[3] overflow-y-hidden",
+            !search.has_snapshot && "flex-[2]",
+          )}
+        >
           {snapshotElement}
         </div>
-        <div className="flex min-w-0 flex-col gap-4 pr-2">
+        <div className="flex flex-col gap-4 overflow-hidden md:basis-2/5">
           <TabsWithActions
             search={search}
             searchTabs={searchTabs}
@@ -392,7 +381,7 @@ function DialogContentComponent({
             setIsPopoverOpen={setIsPopoverOpen}
             dialogContainer={dialogContainer}
           />
-          <div className="scrollbar-container min-w-0 flex-1 overflow-y-auto overflow-x-hidden px-4">
+          <div className="scrollbar-container flex-1 overflow-y-auto">
             <ObjectDetailsTab
               search={search}
               config={config}
@@ -595,13 +584,8 @@ export default function SearchDetailDialog({
             "scrollbar-container overflow-y-auto",
             isDesktop &&
               "max-h-[95dvh] sm:max-w-xl md:max-w-4xl lg:max-w-[70%]",
-            isMobile && "flex h-full flex-col px-4",
+            isMobile && "px-4",
           )}
-          onEscapeKeyDown={(event) => {
-            if (isPopoverOpen) {
-              event.preventDefault();
-            }
-          }}
           onInteractOutside={(e) => {
             if (isPopoverOpen) {
               e.preventDefault();
@@ -612,7 +596,7 @@ export default function SearchDetailDialog({
             }
           }}
         >
-          <Header className={cn(!isDesktop && "top-0 z-[60] mb-0")}>
+          <Header>
             <Title>{t("trackedObjectDetails")}</Title>
             <Description className="sr-only">
               {t("trackedObjectDetails")}
@@ -692,8 +676,6 @@ function ObjectDetailsTab({
   const [desc, setDesc] = useState(search?.data.description);
   const [isSubLabelDialogOpen, setIsSubLabelDialogOpen] = useState(false);
   const [isLPRDialogOpen, setIsLPRDialogOpen] = useState(false);
-  const [isEditingDesc, setIsEditingDesc] = useState(false);
-  const originalDescRef = useRef<string | null>(null);
 
   const handleDescriptionFocus = useCallback(() => {
     setInputFocused(true);
@@ -1096,51 +1078,15 @@ function ObjectDetailsTab({
           });
 
       setState("submitted");
-      mutate(
-        (key) =>
-          typeof key === "string" &&
-          (key.includes("events") ||
-            key.includes("events/search") ||
-            key.includes("events/explore")),
-        (currentData: SearchResult[][] | SearchResult[] | undefined) => {
-          if (!currentData) return currentData;
-          // optimistic update
-          return currentData
-            .flat()
-            .map((event) =>
-              event.id === search.id
-                ? { ...event, plus_id: "new_upload" }
-                : event,
-            );
-        },
-        {
-          optimisticData: true,
-          rollbackOnError: true,
-          revalidate: false,
-        },
-      );
+      setSearch({
+        ...search,
+        plus_id: "new_upload",
+      });
     },
-    [search, mutate],
+    [search, setSearch],
   );
 
   const popoverContainerRef = useRef<HTMLDivElement | null>(null);
-  const canRegenerate = !!(
-    config?.cameras[search.camera].objects.genai.enabled && search.end_time
-  );
-  const showGenAIPlaceholder = !!(
-    config?.cameras[search.camera].objects.genai.enabled &&
-    !search.end_time &&
-    (config.cameras[search.camera].objects.genai.required_zones.length === 0 ||
-      search.zones.some((zone) =>
-        config.cameras[search.camera].objects.genai.required_zones.includes(
-          zone,
-        ),
-      )) &&
-    (config.cameras[search.camera].objects.genai.objects.length === 0 ||
-      config.cameras[search.camera].objects.genai.objects.includes(
-        search.label,
-      ))
-  );
   return (
     <div ref={popoverContainerRef} className="flex flex-col gap-5">
       <div className="flex w-full flex-row">
@@ -1297,8 +1243,8 @@ function ObjectDetailsTab({
       </div>
 
       {search.data.type === "object" &&
-        config?.plus?.enabled &&
-        search.has_snapshot && (
+        !search.plus_id &&
+        config?.plus?.enabled && (
           <div
             className={cn(
               "my-2 flex w-full flex-col justify-between gap-1.5",
@@ -1401,68 +1347,75 @@ function ObjectDetailsTab({
           </div>
         )}
       <div className="flex flex-col gap-1.5">
-        <div className="flex items-center justify-start gap-3">
-          <div className="text-sm text-primary/40">
-            {t("details.description.label")}
-          </div>
-          <div className="flex items-center gap-3">
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <button
-                  aria-label={t("button.edit", { ns: "common" })}
-                  className="text-primary/40 hover:text-primary/80"
-                  onClick={() => {
-                    originalDescRef.current = desc ?? "";
-                    setIsEditingDesc(true);
-                  }}
+        {config?.cameras[search.camera].objects.genai.enabled &&
+        !search.end_time &&
+        (config.cameras[search.camera].objects.genai.required_zones.length ===
+          0 ||
+          search.zones.some((zone) =>
+            config.cameras[search.camera].objects.genai.required_zones.includes(
+              zone,
+            ),
+          )) &&
+        (config.cameras[search.camera].objects.genai.objects.length === 0 ||
+          config.cameras[search.camera].objects.genai.objects.includes(
+            search.label,
+          )) ? (
+          <>
+            <div className="text-sm text-primary/40">
+              {t("details.description.label")}
+            </div>
+            <div className="flex h-64 flex-col items-center justify-center gap-3 border p-4 text-sm text-primary/40">
+              <div className="flex">
+                <ActivityIndicator />
+              </div>
+              <div className="flex">{t("details.description.aiTips")}</div>
+            </div>
+          </>
+        ) : (
+          <>
+            <div className="text-sm text-primary/40"></div>
+            <Textarea
+              className="text-md h-64"
+              placeholder={t("details.description.placeholder")}
+              value={desc}
+              onChange={(e) => setDesc(e.target.value)}
+              onFocus={handleDescriptionFocus}
+              onBlur={handleDescriptionBlur}
+            />
+          </>
+        )}
+
+        <div className="flex w-full flex-row justify-end gap-2">
+          {config?.cameras[search?.camera].audio_transcription.enabled &&
+            search?.label == "speech" &&
+            search?.end_time && (
+              <Button onClick={onTranscribe}>
+                <div className="flex gap-1">
+                  {t("itemMenu.audioTranscription.label")}
+                </div>
+              </Button>
+            )}
+          {config?.cameras[search.camera].objects.genai.enabled &&
+            search.end_time && (
+              <div className="flex items-start">
+                <Button
+                  className="rounded-r-none border-r-0"
+                  aria-label={t("details.button.regenerate.label")}
+                  onClick={() => regenerateDescription("thumbnails")}
                 >
-                  <FaPencilAlt className="size-4" />
-                </button>
-              </TooltipTrigger>
-              <TooltipContent>
-                {t("button.edit", { ns: "common" })}
-              </TooltipContent>
-            </Tooltip>
-
-            {config?.cameras[search?.camera].audio_transcription.enabled &&
-              search?.label == "speech" &&
-              search?.end_time && (
-                <Tooltip>
-                  <TooltipTrigger asChild>
-                    <button
-                      aria-label={t("itemMenu.audioTranscription.label")}
-                      className="text-primary/40 hover:text-primary/80"
-                      onClick={onTranscribe}
-                    >
-                      <FaMicrophone className="size-4" />
-                    </button>
-                  </TooltipTrigger>
-                  <TooltipContent>
-                    {t("itemMenu.audioTranscription.label")}
-                  </TooltipContent>
-                </Tooltip>
-              )}
-
-            {canRegenerate && (
-              <div className="relative">
-                <DropdownMenu>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <DropdownMenuTrigger asChild>
-                        <button
-                          aria-label={t("details.button.regenerate.label")}
-                          className="text-primary/40 hover:text-primary/80"
-                        >
-                          <HiSparkles className="size-4" />
-                        </button>
-                      </DropdownMenuTrigger>
-                    </TooltipTrigger>
-                    <TooltipContent>
-                      {t("details.button.regenerate.title")}
-                    </TooltipContent>
-                  </Tooltip>
-                  <DropdownMenuContent>
-                    {search.has_snapshot && (
+                  {t("details.button.regenerate.title")}
+                </Button>
+                {search.has_snapshot && (
+                  <DropdownMenu>
+                    <DropdownMenuTrigger asChild>
+                      <Button
+                        className="rounded-l-none border-l-0 px-2"
+                        aria-label={t("details.expandRegenerationMenu")}
+                      >
+                        <FaChevronDown className="size-3" />
+                      </Button>
+                    </DropdownMenuTrigger>
+                    <DropdownMenuContent>
                       <DropdownMenuItem
                         className="cursor-pointer"
                         aria-label={t("details.regenerateFromSnapshot")}
@@ -1470,115 +1423,61 @@ function ObjectDetailsTab({
                       >
                         {t("details.regenerateFromSnapshot")}
                       </DropdownMenuItem>
-                    )}
-                    <DropdownMenuItem
-                      className="cursor-pointer"
-                      aria-label={t("details.regenerateFromThumbnails")}
-                      onClick={() => regenerateDescription("thumbnails")}
-                    >
-                      {t("details.regenerateFromThumbnails")}
-                    </DropdownMenuItem>
-                  </DropdownMenuContent>
-                </DropdownMenu>
+                      <DropdownMenuItem
+                        className="cursor-pointer"
+                        aria-label={t("details.regenerateFromThumbnails")}
+                        onClick={() => regenerateDescription("thumbnails")}
+                      >
+                        {t("details.regenerateFromThumbnails")}
+                      </DropdownMenuItem>
+                    </DropdownMenuContent>
+                  </DropdownMenu>
+                )}
               </div>
             )}
-          </div>
+          {((config?.cameras[search.camera].objects.genai.enabled &&
+            search.end_time) ||
+            !config?.cameras[search.camera].objects.genai.enabled) && (
+            <Button
+              variant="select"
+              aria-label={t("button.save", { ns: "common" })}
+              onClick={updateDescription}
+            >
+              {t("button.save", { ns: "common" })}
+            </Button>
+          )}
+
+          <TextEntryDialog
+            open={isSubLabelDialogOpen}
+            setOpen={setIsSubLabelDialogOpen}
+            title={t("details.editSubLabel.title")}
+            description={
+              search.label
+                ? t("details.editSubLabel.desc", {
+                    label: search.label,
+                  })
+                : t("details.editSubLabel.descNoLabel")
+            }
+            onSave={handleSubLabelSave}
+            defaultValue={search?.sub_label || ""}
+            allowEmpty={true}
+          />
+          <TextEntryDialog
+            open={isLPRDialogOpen}
+            setOpen={setIsLPRDialogOpen}
+            title={t("details.editLPR.title")}
+            description={
+              search.label
+                ? t("details.editLPR.desc", {
+                    label: search.label,
+                  })
+                : t("details.editLPR.descNoLabel")
+            }
+            onSave={handleLPRSave}
+            defaultValue={search?.data.recognized_license_plate || ""}
+            allowEmpty={true}
+          />
         </div>
-
-        {!isEditingDesc ? (
-          showGenAIPlaceholder ? (
-            <div className="flex h-32 flex-col items-center justify-center gap-3 border p-4 text-sm text-primary/40">
-              <div className="flex">
-                <ActivityIndicator />
-              </div>
-              <div className="flex">{t("details.description.aiTips")}</div>
-            </div>
-          ) : (
-            <div className="overflow-auto text-sm text-primary">
-              {desc || t("label.none", { ns: "common" })}
-            </div>
-          )
-        ) : (
-          <div className="flex flex-col gap-2">
-            <Textarea
-              className="text-md h-32"
-              placeholder={t("details.description.placeholder")}
-              value={desc}
-              onChange={(e) => setDesc(e.target.value)}
-              onFocus={handleDescriptionFocus}
-              onBlur={handleDescriptionBlur}
-              autoFocus
-            />
-            <div className="flex flex-row justify-end gap-4">
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    aria-label={t("button.save", { ns: "common" })}
-                    className="text-primary/40 hover:text-primary/80"
-                    onClick={() => {
-                      setIsEditingDesc(false);
-                      updateDescription();
-                    }}
-                  >
-                    <FaCheck className="size-4" />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent>
-                  {t("button.save", { ns: "common" })}
-                </TooltipContent>
-              </Tooltip>
-
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    aria-label={t("button.cancel", { ns: "common" })}
-                    className="text-primary/40 hover:text-primary"
-                    onClick={() => {
-                      setIsEditingDesc(false);
-                      setDesc(originalDescRef.current ?? "");
-                    }}
-                  >
-                    <FaTimes className="size-4" />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent>
-                  {t("button.cancel", { ns: "common" })}
-                </TooltipContent>
-              </Tooltip>
-            </div>
-          </div>
-        )}
-
-        <TextEntryDialog
-          open={isSubLabelDialogOpen}
-          setOpen={setIsSubLabelDialogOpen}
-          title={t("details.editSubLabel.title")}
-          description={
-            search.label
-              ? t("details.editSubLabel.desc", {
-                  label: search.label,
-                })
-              : t("details.editSubLabel.descNoLabel")
-          }
-          onSave={handleSubLabelSave}
-          defaultValue={search?.sub_label || ""}
-          allowEmpty={true}
-        />
-        <TextEntryDialog
-          open={isLPRDialogOpen}
-          setOpen={setIsLPRDialogOpen}
-          title={t("details.editLPR.title")}
-          description={
-            search.label
-              ? t("details.editLPR.desc", {
-                  label: search.label,
-                })
-              : t("details.editLPR.descNoLabel")
-          }
-          onSave={handleLPRSave}
-          defaultValue={search?.data.recognized_license_plate || ""}
-          allowEmpty={true}
-        />
       </div>
     </div>
   );

web/src/components/overlay/detail/TrackingDetails.tsx

@@ -352,8 +352,7 @@ export function TrackingDetails({
       className={cn(
         isDesktop
           ? "flex size-full justify-evenly gap-4 overflow-hidden"
-          : "flex flex-col gap-2",
-        !isDesktop && cameraAspect === "tall" && "size-full",
+          : "flex size-full flex-col gap-2",
         className,
       )}
     >
@@ -454,7 +453,7 @@ export function TrackingDetails({
         )}
       >
         {isDesktop && tabs && (
-          <div className="mb-2 flex items-center justify-between">
+          <div className="mb-4 flex items-center justify-between">
             <div className="flex-1">{tabs}</div>
           </div>
         )}
@@ -720,13 +719,9 @@ function LifecycleIconRow({
                             backgroundColor: `rgb(${color})`,
                           }}
                         />
-                        <span
-                          className={cn(
-                            item.data?.zones_friendly_names?.[zidx] === zone &&
-                              "smart-capitalize",
-                          )}
-                        >
-                          {item.data?.zones_friendly_names?.[zidx]}
+                        <span className="smart-capitalize">
+                          {item.data?.zones_friendly_names?.[zidx] ??
+                            zone.replaceAll("_", " ")}
                         </span>
                       </Badge>
                     );

web/src/components/settings/ZoneEditPane.tsx

@@ -576,7 +576,6 @@ export default function ZoneEditPane({
             control={form.control}
             nameField="friendly_name"
             idField="name"
-            idVisible={(polygon && polygon.name.length > 0) ?? false}
             nameLabel={t("masksAndZones.zones.name.title")}
             nameDescription={t("masksAndZones.zones.name.tips")}
             placeholderName={t("masksAndZones.zones.name.inputPlaceHolder")}

web/src/components/timeline/DetailStream.tsx

@@ -15,7 +15,7 @@ import useSWR from "swr";
 import ActivityIndicator from "../indicators/activity-indicator";
 import { Event } from "@/types/event";
 import { getIconForLabel } from "@/utils/iconUtil";
-import { REVIEW_PADDING, ReviewSegment } from "@/types/review";
+import { ReviewSegment } from "@/types/review";
 import { LuChevronDown, LuCircle, LuChevronRight } from "react-icons/lu";
 import { getTranslatedLabel } from "@/utils/i18n";
 import EventMenu from "@/components/timeline/EventMenu";
@@ -391,8 +391,8 @@ function ReviewGroup({
             )}
           />
         </div>
-        <div className="mr-3 grid w-full grid-cols-[1fr_auto] gap-2">
-          <div className="ml-1 flex min-w-0 flex-col gap-1.5">
+        <div className="mr-3 flex w-full justify-between">
+          <div className="ml-1 flex flex-col items-start gap-1.5">
             <div className="flex flex-row gap-3">
               <div className="text-sm font-medium">{displayTime}</div>
               <div className="relative flex items-center gap-2 text-white">
@@ -408,7 +408,7 @@ function ReviewGroup({
             </div>
             <div className="flex flex-col gap-0.5">
               {review.data.metadata?.title && (
-                <div className="mb-1 flex min-w-0 items-center gap-1 text-sm text-primary-variant">
+                <div className="mb-1 flex items-center gap-1 text-sm text-primary-variant">
                   <MdAutoAwesome className="size-3 shrink-0" />
                   <span className="truncate">{review.data.metadata.title}</span>
                 </div>
@@ -432,7 +432,7 @@ function ReviewGroup({
               e.stopPropagation();
               setOpen((v) => !v);
             }}
-            className="inline-flex items-center justify-center self-center rounded p-1 hover:bg-secondary/10"
+            className="ml-2 inline-flex items-center justify-center rounded p-1 hover:bg-secondary/10"
           >
             {open ? (
               <LuChevronDown className="size-4 text-primary-variant" />
@@ -803,9 +803,8 @@ function ObjectTimeline({
     return fullTimeline
       .filter(
         (t) =>
-          t.timestamp >= review.start_time - REVIEW_PADDING &&
-          (review.end_time == undefined ||
-            t.timestamp <= review.end_time + REVIEW_PADDING),
+          t.timestamp >= review.start_time &&
+          (review.end_time == undefined || t.timestamp <= review.end_time),
       )
       .map((event) => ({
         ...event,

web/src/components/timeline/ReviewTimeline.tsx

@@ -515,7 +515,7 @@ export function ReviewTimeline({
         <div
           className={`absolute z-30 flex gap-2 ${
             isMobile
-              ? "bottom-4 right-1 flex-col-reverse gap-3"
+              ? "bottom-4 right-1 flex-col gap-3"
               : "bottom-2 left-1/2 -translate-x-1/2"
           }`}
         >

web/src/pages/FaceLibrary.tsx

@@ -622,15 +622,7 @@ type TrainingGridProps = {
   faceNames: string[];
   selectedFaces: string[];
   onClickFaces: (images: string[], ctrl: boolean) => void;
-  onRefresh: (
-    data?:
-      | FaceLibraryData
-      | Promise<FaceLibraryData>
-      | ((
-          currentData: FaceLibraryData | undefined,
-        ) => FaceLibraryData | undefined),
-    opts?: boolean | { revalidate?: boolean },
-  ) => Promise<FaceLibraryData | undefined>;
+  onRefresh: () => void;
 };
 function TrainingGrid({
   config,
@@ -734,15 +726,7 @@ type FaceAttemptGroupProps = {
   faceNames: string[];
   selectedFaces: string[];
   onClickFaces: (image: string[], ctrl: boolean) => void;
-  onRefresh: (
-    data?:
-      | FaceLibraryData
-      | Promise<FaceLibraryData>
-      | ((
-          currentData: FaceLibraryData | undefined,
-        ) => FaceLibraryData | undefined),
-    opts?: boolean | { revalidate?: boolean },
-  ) => Promise<FaceLibraryData | undefined>;
+  onRefresh: () => void;
 };
 function FaceAttemptGroup({
   config,
@@ -830,44 +814,11 @@ function FaceAttemptGroup({
       axios
         .post(`/faces/reprocess`, { training_file: data.filename })
         .then((resp) => {
-          if (resp.status == 200 && resp.data?.success) {
-            const { face_name, score } = resp.data;
-            const oldFilename = data.filename;
-            const parts = oldFilename.split("-");
-            const newFilename = `${parts[0]}-${parts[1]}-${parts[2]}-${face_name}-${score}.webp`;
-
-            onRefresh(
-              (currentData: FaceLibraryData | undefined) => {
-                if (!currentData?.train) return currentData;
-
-                return {
-                  ...currentData,
-                  train: currentData.train.map((filename: string) =>
-                    filename === oldFilename ? newFilename : filename,
-                  ),
-                };
-              },
-              { revalidate: true },
-            );
-
-            toast.success(
-              t("toast.success.updatedFaceScore", {
-                name: face_name,
-                score: score.toFixed(2),
-              }),
-              {
-                position: "top-center",
-              },
-            );
-          } else if (resp.data?.success === false) {
-            // Handle case where API returns success: false
-            const errorMessage = resp.data?.message || "Unknown error";
-            toast.error(
-              t("toast.error.updateFaceScoreFailed", { errorMessage }),
-              {
-                position: "top-center",
-              },
-            );
+          if (resp.status == 200) {
+            toast.success(t("toast.success.updatedFaceScore"), {
+              position: "top-center",
+            });
+            onRefresh();
           }
         })
         .catch((error) => {

web/src/types/ws.ts

@@ -87,8 +87,7 @@ export type ModelState =
   | "downloaded"
   | "error"
   | "training"
-  | "complete"
-  | "failed";
+  | "complete";
 
 export type EmbeddingsReindexProgressType = {
   thumbnails: number;

web/src/utils/stringUtil.ts

@@ -21,30 +21,20 @@ export const capitalizeAll = (text: string): string => {
  * @returns A valid camera identifier (lowercase, alphanumeric, max 8 chars)
  */
 export function generateFixedHash(name: string, prefix: string = "id"): string {
-  // Use the full UTF-8 bytes of the name and compute an FNV-1a 32-bit hash.
-  // This is deterministic, fast, works with Unicode and avoids collisions from
-  // simple truncation of base64 output.
+  // Safely encode Unicode as UTF-8 bytes
   const utf8Bytes = new TextEncoder().encode(name);
 
-  // FNV-1a 32-bit hash algorithm
-  let hash = 0x811c9dc5; // FNV offset basis
-  for (let i = 0; i < utf8Bytes.length; i++) {
-    hash ^= utf8Bytes[i];
-    // Multiply by FNV prime (0x01000193) with 32-bit overflow
-    hash = (hash >>> 0) * 0x01000193;
-    // Ensure 32-bit unsigned integer
-    hash >>>= 0;
+  // Convert to base64 manually
+  let binary = "";
+  for (const byte of utf8Bytes) {
+    binary += String.fromCharCode(byte);
   }
+  const base64 = btoa(binary);
 
-  // Convert to an 8-character lowercase hex string
-  const hashHex = (hash >>> 0).toString(16).padStart(8, "0").toLowerCase();
+  // Strip out non-alphanumeric characters and truncate
+  const cleanHash = base64.replace(/[^a-zA-Z0-9]/g, "").substring(0, 8);
 
-  // Ensure the first character is a letter to avoid an identifier that's purely
-  // numeric (isValidId forbids all-digit IDs). If it starts with a digit,
-  // replace with 'a'. This is extremely unlikely but a simple safeguard.
-  const safeHash = /^[0-9]/.test(hashHex[0]) ? `a${hashHex.slice(1)}` : hashHex;
-
-  return `${prefix}_${safeHash}`;
+  return `${prefix}_${cleanHash.toLowerCase()}`;
 }
 
 /**

web/src/views/classification/ModelTrainingView.tsx

@@ -102,12 +102,6 @@ export default function ModelTrainingView({ model }: ModelTrainingViewProps) {
         position: "top-center",
       });
       setWasTraining(false);
-      refreshDataset();
-    } else if (modelState == "failed") {
-      toast.error(t("toast.error.trainingFailed"), {
-        position: "top-center",
-      });
-      setWasTraining(false);
     }
     // only refresh when modelState changes
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -118,20 +112,10 @@ export default function ModelTrainingView({ model }: ModelTrainingViewProps) {
   const { data: trainImages, mutate: refreshTrain } = useSWR<string[]>(
     `classification/${model.name}/train`,
   );
-  const { data: datasetResponse, mutate: refreshDataset } = useSWR<{
-    categories: { [id: string]: string[] };
-    training_metadata: {
-      has_trained: boolean;
-      last_training_date: string | null;
-      last_training_image_count: number;
-      current_image_count: number;
-      new_images_count: number;
-    } | null;
+  const { data: dataset, mutate: refreshDataset } = useSWR<{
+    [id: string]: string[];
   }>(`classification/${model.name}/dataset`);
 
-  const dataset = datasetResponse?.categories || {};
-  const trainingMetadata = datasetResponse?.training_metadata;
-
   const [trainFilter, setTrainFilter] = useApiFilter<TrainFilter>();
 
   const refreshAll = useCallback(() => {
@@ -193,7 +177,7 @@ export default function ModelTrainingView({ model }: ModelTrainingViewProps) {
           error.response?.data?.detail ||
           "Unknown error";
 
-        toast.error(t("toast.error.trainingFailedToStart", { errorMessage }), {
+        toast.error(t("toast.error.trainingFailed", { errorMessage }), {
           position: "top-center",
         });
       });
@@ -203,37 +187,6 @@ export default function ModelTrainingView({ model }: ModelTrainingViewProps) {
     null,
   );
 
-  const onRename = useCallback(
-    (old_name: string, new_name: string) => {
-      axios
-        .put(`/classification/${model.name}/dataset/${old_name}/rename`, {
-          new_category: new_name,
-        })
-        .then((resp) => {
-          if (resp.status == 200) {
-            toast.success(
-              t("toast.success.renamedCategory", { name: new_name }),
-              {
-                position: "top-center",
-              },
-            );
-            setPageToggle(new_name);
-            refreshDataset();
-          }
-        })
-        .catch((error) => {
-          const errorMessage =
-            error.response?.data?.message ||
-            error.response?.data?.detail ||
-            "Unknown error";
-          toast.error(t("toast.error.renameCategoryFailed", { errorMessage }), {
-            position: "top-center",
-          });
-        });
-    },
-    [model, setPageToggle, refreshDataset, t],
-  );
-
   const onDelete = useCallback(
     (ids: string[], isName: boolean = false, category?: string) => {
       const targetCategory = category || pageToggle;
@@ -401,7 +354,7 @@ export default function ModelTrainingView({ model }: ModelTrainingViewProps) {
               trainImages={trainImages || []}
               setPageToggle={setPageToggle}
               onDelete={onDelete}
-              onRename={onRename}
+              onRename={() => {}}
             />
           </div>
         )}
@@ -437,48 +390,19 @@ export default function ModelTrainingView({ model }: ModelTrainingViewProps) {
               filterValues={{ classes: Object.keys(dataset || {}) }}
               onUpdateFilter={setTrainFilter}
             />
-            <Tooltip>
-              <TooltipTrigger asChild>
-                <Button
-                  className="flex justify-center gap-2"
-                  onClick={trainModel}
-                  variant={modelState == "failed" ? "destructive" : "select"}
-                  disabled={
-                    (modelState != "complete" && modelState != "failed") ||
-                    (trainingMetadata?.new_images_count ?? 0) === 0
-                  }
-                >
-                  {modelState == "training" ? (
-                    <ActivityIndicator size={20} />
-                  ) : (
-                    <HiSparkles className="text-white" />
-                  )}
-                  {isDesktop && (
-                    <>
-                      {t("button.trainModel")}
-                      {trainingMetadata?.new_images_count !== undefined &&
-                        trainingMetadata.new_images_count > 0 && (
-                          <span className="text-sm text-selected-foreground">
-                            ({trainingMetadata.new_images_count})
-                          </span>
-                        )}
-                    </>
-                  )}
-                </Button>
-              </TooltipTrigger>
-              {((trainingMetadata?.new_images_count ?? 0) === 0 ||
-                (modelState != "complete" && modelState != "failed")) && (
-                <TooltipPortal>
-                  <TooltipContent>
-                    {modelState == "training"
-                      ? t("tooltip.trainingInProgress")
-                      : trainingMetadata?.new_images_count === 0
-                        ? t("tooltip.noNewImages")
-                        : t("tooltip.modelNotReady")}
-                  </TooltipContent>
-                </TooltipPortal>
+            <Button
+              className="flex justify-center gap-2"
+              onClick={trainModel}
+              variant="select"
+              disabled={modelState != "complete"}
+            >
+              {modelState == "training" ? (
+                <ActivityIndicator size={20} />
+              ) : (
+                <HiSparkles className="text-white" />
               )}
-            </Tooltip>
+              {isDesktop && t("button.trainModel")}
+            </Button>
           </div>
         )}
       </div>
@@ -610,7 +534,7 @@ function LibrarySelector({
         regexErrorMessage={t("description.invalidName")}
       />
 
-      <DropdownMenu modal={false}>
+      <DropdownMenu>
         <DropdownMenuTrigger asChild>
           <Button className="flex justify-between smart-capitalize">
             {pageTitle}
@@ -661,50 +585,48 @@ function LibrarySelector({
                   ({dataset?.[id].length})
                 </span>
               </div>
-              {id != "none" && (
-                <div className="flex gap-0.5">
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <Button
-                        variant="ghost"
-                        size="icon"
-                        className="size-7 lg:opacity-0 lg:transition-opacity lg:group-hover:opacity-100"
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          setRenameClass(id);
-                        }}
-                      >
-                        <LuPencil className="size-4 text-primary" />
-                      </Button>
-                    </TooltipTrigger>
-                    <TooltipPortal>
-                      <TooltipContent>
-                        {t("button.renameCategory")}
-                      </TooltipContent>
-                    </TooltipPortal>
-                  </Tooltip>
-                  <Tooltip>
-                    <TooltipTrigger asChild>
-                      <Button
-                        variant="ghost"
-                        size="icon"
-                        className="size-7 lg:opacity-0 lg:transition-opacity lg:group-hover:opacity-100"
-                        onClick={(e) => {
-                          e.stopPropagation();
-                          setConfirmDelete(id);
-                        }}
-                      >
-                        <LuTrash2 className="size-4 text-destructive" />
-                      </Button>
-                    </TooltipTrigger>
-                    <TooltipPortal>
-                      <TooltipContent>
-                        {t("button.deleteCategory")}
-                      </TooltipContent>
-                    </TooltipPortal>
-                  </Tooltip>
-                </div>
-              )}
+              <div className="flex gap-0.5">
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      className="size-7 lg:opacity-0 lg:transition-opacity lg:group-hover:opacity-100"
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        setRenameClass(id);
+                      }}
+                    >
+                      <LuPencil className="size-4 text-primary" />
+                    </Button>
+                  </TooltipTrigger>
+                  <TooltipPortal>
+                    <TooltipContent>
+                      {t("button.renameCategory")}
+                    </TooltipContent>
+                  </TooltipPortal>
+                </Tooltip>
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      className="size-7 lg:opacity-0 lg:transition-opacity lg:group-hover:opacity-100"
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        setConfirmDelete(id);
+                      }}
+                    >
+                      <LuTrash2 className="size-4 text-destructive" />
+                    </Button>
+                  </TooltipTrigger>
+                  <TooltipPortal>
+                    <TooltipContent>
+                      {t("button.deleteCategory")}
+                    </TooltipContent>
+                  </TooltipPortal>
+                </Tooltip>
+              </div>
             </DropdownMenuItem>
           ))}
         </DropdownMenuContent>
@@ -823,11 +745,17 @@ function TrainGrid({
             return false;
           }
 
-          if (trainFilter.min_score && trainFilter.min_score > data.score) {
+          if (
+            trainFilter.min_score &&
+            trainFilter.min_score > data.score / 100.0
+          ) {
             return false;
           }
 
-          if (trainFilter.max_score && trainFilter.max_score < data.score) {
+          if (
+            trainFilter.max_score &&
+            trainFilter.max_score < data.score / 100.0
+          ) {
             return false;
           }
 

web/src/views/settings/CameraSettingsView.tsx

@@ -98,12 +98,12 @@ export default function CameraSettingsView({
       return Object.entries(cameraConfig.zones).map(([name, zoneData]) => ({
         camera: cameraConfig.name,
         name,
-        friendly_name: cameraConfig.zones[name].friendly_name,
+        friendly_name: getZoneName(name, cameraConfig.name),
         objects: zoneData.objects,
         color: zoneData.color,
       }));
     }
-  }, [cameraConfig]);
+  }, [cameraConfig, getZoneName]);
 
   const alertsLabels = useMemo(() => {
     return cameraConfig?.review.alerts.labels
@@ -533,14 +533,8 @@ export default function CameraSettingsView({
                                             }}
                                           />
                                         </FormControl>
-                                        <FormLabel
-                                          className={cn(
-                                            "font-normal",
-                                            !zone.friendly_name &&
-                                              "smart-capitalize",
-                                          )}
-                                        >
-                                          {zone.friendly_name || zone.name}
+                                        <FormLabel className="font-normal smart-capitalize">
+                                          {zone.friendly_name}
                                         </FormLabel>
                                       </FormItem>
                                     )}
@@ -638,14 +632,8 @@ export default function CameraSettingsView({
                                               }}
                                             />
                                           </FormControl>
-                                          <FormLabel
-                                            className={cn(
-                                              "font-normal",
-                                              !zone.friendly_name &&
-                                                "smart-capitalize",
-                                            )}
-                                          >
-                                            {zone.friendly_name || zone.name}
+                                          <FormLabel className="font-normal smart-capitalize">
+                                            {zone.friendly_name}
                                           </FormLabel>
                                         </FormItem>
                                       )}