mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-05-09 15:05:26 +03:00
Compare commits
No commits in common. "6a0e31dcf9e6f87b7a305f621d9b0808330acc98" and "ae009b98618f63f7ab0284c9ff35d6cb6da5990e" have entirely different histories.
6a0e31dcf9
...
ae009b9861
@ -3,7 +3,7 @@ id: object_classification
|
|||||||
title: Object Classification
|
title: Object Classification
|
||||||
---
|
---
|
||||||
|
|
||||||
Object classification allows you to train a custom MobileNetV2 classification model to run on tracked objects (persons, cars, animals, etc.) to identify a finer category or attribute for that object. Classification results are visible in the Tracked Object Details pane in Explore, through the `frigate/tracked_object_details` MQTT topic, in Home Assistant sensors via the official Frigate integration, or through the event endpoints in the HTTP API.
|
Object classification allows you to train a custom MobileNetV2 classification model to run on tracked objects (persons, cars, animals, etc.) to identify a finer category or attribute for that object.
|
||||||
|
|
||||||
## Minimum System Requirements
|
## Minimum System Requirements
|
||||||
|
|
||||||
|
|||||||
@ -3,7 +3,7 @@ id: state_classification
|
|||||||
title: State Classification
|
title: State Classification
|
||||||
---
|
---
|
||||||
|
|
||||||
State classification allows you to train a custom MobileNetV2 classification model on a fixed region of your camera frame(s) to determine a current state. The model can be configured to run on a schedule and/or when motion is detected in that region. Classification results are available through the `frigate/<camera_name>/classification/<model_name>` MQTT topic and in Home Assistant sensors via the official Frigate integration.
|
State classification allows you to train a custom MobileNetV2 classification model on a fixed region of your camera frame(s) to determine a current state. The model can be configured to run on a schedule and/or when motion is detected in that region.
|
||||||
|
|
||||||
## Minimum System Requirements
|
## Minimum System Requirements
|
||||||
|
|
||||||
|
|||||||
74
docs/static/frigate-api.yaml
vendored
74
docs/static/frigate-api.yaml
vendored
@ -616,32 +616,6 @@ paths:
|
|||||||
application/json:
|
application/json:
|
||||||
schema:
|
schema:
|
||||||
$ref: "#/components/schemas/HTTPValidationError"
|
$ref: "#/components/schemas/HTTPValidationError"
|
||||||
/classification/attributes:
|
|
||||||
get:
|
|
||||||
tags:
|
|
||||||
- Classification
|
|
||||||
summary: Get custom classification attributes
|
|
||||||
description: |-
|
|
||||||
Returns custom classification attributes for a given object type.
|
|
||||||
Only includes models with classification_type set to 'attribute'.
|
|
||||||
By default returns a flat sorted list of all attribute labels.
|
|
||||||
If group_by_model is true, returns attributes grouped by model name.
|
|
||||||
operationId: get_custom_attributes_classification_attributes_get
|
|
||||||
parameters:
|
|
||||||
- name: object_type
|
|
||||||
in: query
|
|
||||||
schema:
|
|
||||||
type: string
|
|
||||||
- name: group_by_model
|
|
||||||
in: query
|
|
||||||
schema:
|
|
||||||
type: boolean
|
|
||||||
default: false
|
|
||||||
responses:
|
|
||||||
"200":
|
|
||||||
description: Successful Response
|
|
||||||
"422":
|
|
||||||
description: Validation Error
|
|
||||||
/classification/{name}/dataset:
|
/classification/{name}/dataset:
|
||||||
get:
|
get:
|
||||||
tags:
|
tags:
|
||||||
@ -2938,42 +2912,6 @@ paths:
|
|||||||
application/json:
|
application/json:
|
||||||
schema:
|
schema:
|
||||||
$ref: "#/components/schemas/HTTPValidationError"
|
$ref: "#/components/schemas/HTTPValidationError"
|
||||||
/events/{event_id}/attributes:
|
|
||||||
post:
|
|
||||||
tags:
|
|
||||||
- Events
|
|
||||||
summary: Set custom classification attributes
|
|
||||||
description: |-
|
|
||||||
Sets an event's custom classification attributes for all attribute-type
|
|
||||||
models that apply to the event's object type.
|
|
||||||
Returns a success message or an error if the event is not found.
|
|
||||||
operationId: set_attributes_events__event_id__attributes_post
|
|
||||||
parameters:
|
|
||||||
- name: event_id
|
|
||||||
in: path
|
|
||||||
required: true
|
|
||||||
schema:
|
|
||||||
type: string
|
|
||||||
title: Event Id
|
|
||||||
requestBody:
|
|
||||||
required: true
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/EventsAttributesBody"
|
|
||||||
responses:
|
|
||||||
"200":
|
|
||||||
description: Successful Response
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/GenericResponse"
|
|
||||||
"422":
|
|
||||||
description: Validation Error
|
|
||||||
content:
|
|
||||||
application/json:
|
|
||||||
schema:
|
|
||||||
$ref: "#/components/schemas/HTTPValidationError"
|
|
||||||
/events/{event_id}/description:
|
/events/{event_id}/description:
|
||||||
post:
|
post:
|
||||||
tags:
|
tags:
|
||||||
@ -5021,18 +4959,6 @@ components:
|
|||||||
required:
|
required:
|
||||||
- subLabel
|
- subLabel
|
||||||
title: EventsSubLabelBody
|
title: EventsSubLabelBody
|
||||||
EventsAttributesBody:
|
|
||||||
properties:
|
|
||||||
attributes:
|
|
||||||
type: object
|
|
||||||
title: Attributes
|
|
||||||
description: Object with model names as keys and attribute values
|
|
||||||
additionalProperties:
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
required:
|
|
||||||
- attributes
|
|
||||||
title: EventsAttributesBody
|
|
||||||
ExportModel:
|
ExportModel:
|
||||||
properties:
|
properties:
|
||||||
id:
|
id:
|
||||||
|
|||||||
@ -31,7 +31,6 @@ from frigate.api.defs.response.generic_response import GenericResponse
|
|||||||
from frigate.api.defs.tags import Tags
|
from frigate.api.defs.tags import Tags
|
||||||
from frigate.config import FrigateConfig
|
from frigate.config import FrigateConfig
|
||||||
from frigate.config.camera import DetectConfig
|
from frigate.config.camera import DetectConfig
|
||||||
from frigate.config.classification import ObjectClassificationType
|
|
||||||
from frigate.const import CLIPS_DIR, FACE_DIR, MODEL_CACHE_DIR
|
from frigate.const import CLIPS_DIR, FACE_DIR, MODEL_CACHE_DIR
|
||||||
from frigate.embeddings import EmbeddingsContext
|
from frigate.embeddings import EmbeddingsContext
|
||||||
from frigate.models import Event
|
from frigate.models import Event
|
||||||
@ -623,59 +622,6 @@ def get_classification_dataset(name: str):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.get(
|
|
||||||
"/classification/attributes",
|
|
||||||
summary="Get custom classification attributes",
|
|
||||||
description="""Returns custom classification attributes for a given object type.
|
|
||||||
Only includes models with classification_type set to 'attribute'.
|
|
||||||
By default returns a flat sorted list of all attribute labels.
|
|
||||||
If group_by_model is true, returns attributes grouped by model name.""",
|
|
||||||
)
|
|
||||||
def get_custom_attributes(
|
|
||||||
request: Request, object_type: str = None, group_by_model: bool = False
|
|
||||||
):
|
|
||||||
models_with_attributes = {}
|
|
||||||
|
|
||||||
for (
|
|
||||||
model_key,
|
|
||||||
model_config,
|
|
||||||
) in request.app.frigate_config.classification.custom.items():
|
|
||||||
if (
|
|
||||||
not model_config.enabled
|
|
||||||
or not model_config.object_config
|
|
||||||
or model_config.object_config.classification_type
|
|
||||||
!= ObjectClassificationType.attribute
|
|
||||||
):
|
|
||||||
continue
|
|
||||||
|
|
||||||
model_objects = getattr(model_config.object_config, "objects", []) or []
|
|
||||||
if object_type is not None and object_type not in model_objects:
|
|
||||||
continue
|
|
||||||
|
|
||||||
dataset_dir = os.path.join(CLIPS_DIR, sanitize_filename(model_key), "dataset")
|
|
||||||
if not os.path.exists(dataset_dir):
|
|
||||||
continue
|
|
||||||
|
|
||||||
attributes = []
|
|
||||||
for category_name in os.listdir(dataset_dir):
|
|
||||||
category_dir = os.path.join(dataset_dir, category_name)
|
|
||||||
if os.path.isdir(category_dir) and category_name != "none":
|
|
||||||
attributes.append(category_name)
|
|
||||||
|
|
||||||
if attributes:
|
|
||||||
model_name = model_config.name or model_key
|
|
||||||
models_with_attributes[model_name] = sorted(attributes)
|
|
||||||
|
|
||||||
if group_by_model:
|
|
||||||
return JSONResponse(content=models_with_attributes)
|
|
||||||
else:
|
|
||||||
# Flatten to a unique sorted list
|
|
||||||
all_attributes = set()
|
|
||||||
for attributes in models_with_attributes.values():
|
|
||||||
all_attributes.update(attributes)
|
|
||||||
return JSONResponse(content=sorted(list(all_attributes)))
|
|
||||||
|
|
||||||
|
|
||||||
@router.get(
|
@router.get(
|
||||||
"/classification/{name}/train",
|
"/classification/{name}/train",
|
||||||
summary="Get classification train images",
|
summary="Get classification train images",
|
||||||
|
|||||||
@ -12,7 +12,6 @@ class EventsQueryParams(BaseModel):
|
|||||||
labels: Optional[str] = "all"
|
labels: Optional[str] = "all"
|
||||||
sub_label: Optional[str] = "all"
|
sub_label: Optional[str] = "all"
|
||||||
sub_labels: Optional[str] = "all"
|
sub_labels: Optional[str] = "all"
|
||||||
attributes: Optional[str] = "all"
|
|
||||||
zone: Optional[str] = "all"
|
zone: Optional[str] = "all"
|
||||||
zones: Optional[str] = "all"
|
zones: Optional[str] = "all"
|
||||||
limit: Optional[int] = 100
|
limit: Optional[int] = 100
|
||||||
@ -59,8 +58,6 @@ class EventsSearchQueryParams(BaseModel):
|
|||||||
limit: Optional[int] = 50
|
limit: Optional[int] = 50
|
||||||
cameras: Optional[str] = "all"
|
cameras: Optional[str] = "all"
|
||||||
labels: Optional[str] = "all"
|
labels: Optional[str] = "all"
|
||||||
sub_labels: Optional[str] = "all"
|
|
||||||
attributes: Optional[str] = "all"
|
|
||||||
zones: Optional[str] = "all"
|
zones: Optional[str] = "all"
|
||||||
after: Optional[float] = None
|
after: Optional[float] = None
|
||||||
before: Optional[float] = None
|
before: Optional[float] = None
|
||||||
|
|||||||
@ -24,13 +24,6 @@ class EventsLPRBody(BaseModel):
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class EventsAttributesBody(BaseModel):
|
|
||||||
attributes: List[str] = Field(
|
|
||||||
title="Selected classification attributes for the event",
|
|
||||||
default_factory=list,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class EventsDescriptionBody(BaseModel):
|
class EventsDescriptionBody(BaseModel):
|
||||||
description: Union[str, None] = Field(title="The description of the event")
|
description: Union[str, None] = Field(title="The description of the event")
|
||||||
|
|
||||||
|
|||||||
@ -37,7 +37,6 @@ from frigate.api.defs.query.regenerate_query_parameters import (
|
|||||||
RegenerateQueryParameters,
|
RegenerateQueryParameters,
|
||||||
)
|
)
|
||||||
from frigate.api.defs.request.events_body import (
|
from frigate.api.defs.request.events_body import (
|
||||||
EventsAttributesBody,
|
|
||||||
EventsCreateBody,
|
EventsCreateBody,
|
||||||
EventsDeleteBody,
|
EventsDeleteBody,
|
||||||
EventsDescriptionBody,
|
EventsDescriptionBody,
|
||||||
@ -56,7 +55,6 @@ from frigate.api.defs.response.event_response import (
|
|||||||
from frigate.api.defs.response.generic_response import GenericResponse
|
from frigate.api.defs.response.generic_response import GenericResponse
|
||||||
from frigate.api.defs.tags import Tags
|
from frigate.api.defs.tags import Tags
|
||||||
from frigate.comms.event_metadata_updater import EventMetadataTypeEnum
|
from frigate.comms.event_metadata_updater import EventMetadataTypeEnum
|
||||||
from frigate.config.classification import ObjectClassificationType
|
|
||||||
from frigate.const import CLIPS_DIR, TRIGGER_DIR
|
from frigate.const import CLIPS_DIR, TRIGGER_DIR
|
||||||
from frigate.embeddings import EmbeddingsContext
|
from frigate.embeddings import EmbeddingsContext
|
||||||
from frigate.models import Event, ReviewSegment, Timeline, Trigger
|
from frigate.models import Event, ReviewSegment, Timeline, Trigger
|
||||||
@ -101,8 +99,6 @@ def events(
|
|||||||
if sub_labels == "all" and sub_label != "all":
|
if sub_labels == "all" and sub_label != "all":
|
||||||
sub_labels = sub_label
|
sub_labels = sub_label
|
||||||
|
|
||||||
attributes = unquote(params.attributes)
|
|
||||||
|
|
||||||
zone = params.zone
|
zone = params.zone
|
||||||
zones = params.zones
|
zones = params.zones
|
||||||
|
|
||||||
@ -191,17 +187,6 @@ def events(
|
|||||||
sub_label_clause = reduce(operator.or_, sub_label_clauses)
|
sub_label_clause = reduce(operator.or_, sub_label_clauses)
|
||||||
clauses.append((sub_label_clause))
|
clauses.append((sub_label_clause))
|
||||||
|
|
||||||
if attributes != "all":
|
|
||||||
# Custom classification results are stored as data[model_name] = result_value
|
|
||||||
filtered_attributes = attributes.split(",")
|
|
||||||
attribute_clauses = []
|
|
||||||
|
|
||||||
for attr in filtered_attributes:
|
|
||||||
attribute_clauses.append(Event.data.cast("text") % f'*:"{attr}"*')
|
|
||||||
|
|
||||||
attribute_clause = reduce(operator.or_, attribute_clauses)
|
|
||||||
clauses.append(attribute_clause)
|
|
||||||
|
|
||||||
if recognized_license_plate != "all":
|
if recognized_license_plate != "all":
|
||||||
filtered_recognized_license_plates = recognized_license_plate.split(",")
|
filtered_recognized_license_plates = recognized_license_plate.split(",")
|
||||||
|
|
||||||
@ -507,8 +492,6 @@ def events_search(
|
|||||||
# Filters
|
# Filters
|
||||||
cameras = params.cameras
|
cameras = params.cameras
|
||||||
labels = params.labels
|
labels = params.labels
|
||||||
sub_labels = params.sub_labels
|
|
||||||
attributes = params.attributes
|
|
||||||
zones = params.zones
|
zones = params.zones
|
||||||
after = params.after
|
after = params.after
|
||||||
before = params.before
|
before = params.before
|
||||||
@ -583,38 +566,6 @@ def events_search(
|
|||||||
if labels != "all":
|
if labels != "all":
|
||||||
event_filters.append((Event.label << labels.split(",")))
|
event_filters.append((Event.label << labels.split(",")))
|
||||||
|
|
||||||
if sub_labels != "all":
|
|
||||||
# use matching so joined sub labels are included
|
|
||||||
# for example a sub label 'bob' would get events
|
|
||||||
# with sub labels 'bob' and 'bob, john'
|
|
||||||
sub_label_clauses = []
|
|
||||||
filtered_sub_labels = sub_labels.split(",")
|
|
||||||
|
|
||||||
if "None" in filtered_sub_labels:
|
|
||||||
filtered_sub_labels.remove("None")
|
|
||||||
sub_label_clauses.append((Event.sub_label.is_null()))
|
|
||||||
|
|
||||||
for label in filtered_sub_labels:
|
|
||||||
sub_label_clauses.append(
|
|
||||||
(Event.sub_label.cast("text") == label)
|
|
||||||
) # include exact matches
|
|
||||||
|
|
||||||
# include this label when part of a list
|
|
||||||
sub_label_clauses.append((Event.sub_label.cast("text") % f"*{label},*"))
|
|
||||||
sub_label_clauses.append((Event.sub_label.cast("text") % f"*, {label}*"))
|
|
||||||
|
|
||||||
event_filters.append((reduce(operator.or_, sub_label_clauses)))
|
|
||||||
|
|
||||||
if attributes != "all":
|
|
||||||
# Custom classification results are stored as data[model_name] = result_value
|
|
||||||
filtered_attributes = attributes.split(",")
|
|
||||||
attribute_clauses = []
|
|
||||||
|
|
||||||
for attr in filtered_attributes:
|
|
||||||
attribute_clauses.append(Event.data.cast("text") % f'*:"{attr}"*')
|
|
||||||
|
|
||||||
event_filters.append(reduce(operator.or_, attribute_clauses))
|
|
||||||
|
|
||||||
if zones != "all":
|
if zones != "all":
|
||||||
zone_clauses = []
|
zone_clauses = []
|
||||||
filtered_zones = zones.split(",")
|
filtered_zones = zones.split(",")
|
||||||
@ -1400,107 +1351,6 @@ async def set_plate(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
@router.post(
|
|
||||||
"/events/{event_id}/attributes",
|
|
||||||
response_model=GenericResponse,
|
|
||||||
dependencies=[Depends(require_role(["admin"]))],
|
|
||||||
summary="Set custom classification attributes",
|
|
||||||
description=(
|
|
||||||
"Sets an event's custom classification attributes for all attribute-type "
|
|
||||||
"models that apply to the event's object type."
|
|
||||||
),
|
|
||||||
)
|
|
||||||
async def set_attributes(
|
|
||||||
request: Request,
|
|
||||||
event_id: str,
|
|
||||||
body: EventsAttributesBody,
|
|
||||||
):
|
|
||||||
try:
|
|
||||||
event: Event = Event.get(Event.id == event_id)
|
|
||||||
await require_camera_access(event.camera, request=request)
|
|
||||||
except DoesNotExist:
|
|
||||||
return JSONResponse(
|
|
||||||
content=({"success": False, "message": f"Event {event_id} not found."}),
|
|
||||||
status_code=404,
|
|
||||||
)
|
|
||||||
|
|
||||||
object_type = event.label
|
|
||||||
selected_attributes = set(body.attributes or [])
|
|
||||||
applied_updates: list[dict[str, str | float | None]] = []
|
|
||||||
|
|
||||||
for (
|
|
||||||
model_key,
|
|
||||||
model_config,
|
|
||||||
) in request.app.frigate_config.classification.custom.items():
|
|
||||||
# Only apply to enabled attribute classifiers that target this object type
|
|
||||||
if (
|
|
||||||
not model_config.enabled
|
|
||||||
or not model_config.object_config
|
|
||||||
or model_config.object_config.classification_type
|
|
||||||
!= ObjectClassificationType.attribute
|
|
||||||
or object_type not in (model_config.object_config.objects or [])
|
|
||||||
):
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Get available labels from dataset directory
|
|
||||||
dataset_dir = os.path.join(CLIPS_DIR, sanitize_filename(model_key), "dataset")
|
|
||||||
available_labels = set()
|
|
||||||
|
|
||||||
if os.path.exists(dataset_dir):
|
|
||||||
for category_name in os.listdir(dataset_dir):
|
|
||||||
category_dir = os.path.join(dataset_dir, category_name)
|
|
||||||
if os.path.isdir(category_dir):
|
|
||||||
available_labels.add(category_name)
|
|
||||||
|
|
||||||
if not available_labels:
|
|
||||||
logger.warning(
|
|
||||||
"No dataset found for custom attribute model %s at %s",
|
|
||||||
model_key,
|
|
||||||
dataset_dir,
|
|
||||||
)
|
|
||||||
continue
|
|
||||||
|
|
||||||
# Find all selected attributes that apply to this model
|
|
||||||
model_name = model_config.name or model_key
|
|
||||||
matching_attrs = selected_attributes & available_labels
|
|
||||||
|
|
||||||
if matching_attrs:
|
|
||||||
# Publish updates for each selected attribute
|
|
||||||
for attr in matching_attrs:
|
|
||||||
request.app.event_metadata_updater.publish(
|
|
||||||
(event_id, model_name, attr, 1.0),
|
|
||||||
EventMetadataTypeEnum.attribute.value,
|
|
||||||
)
|
|
||||||
applied_updates.append(
|
|
||||||
{"model": model_name, "label": attr, "score": 1.0}
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
# Clear this model's attribute
|
|
||||||
request.app.event_metadata_updater.publish(
|
|
||||||
(event_id, model_name, None, None),
|
|
||||||
EventMetadataTypeEnum.attribute.value,
|
|
||||||
)
|
|
||||||
applied_updates.append({"model": model_name, "label": None, "score": None})
|
|
||||||
|
|
||||||
if len(applied_updates) == 0:
|
|
||||||
return JSONResponse(
|
|
||||||
content={
|
|
||||||
"success": False,
|
|
||||||
"message": "No matching attributes found for this object type.",
|
|
||||||
},
|
|
||||||
status_code=400,
|
|
||||||
)
|
|
||||||
|
|
||||||
return JSONResponse(
|
|
||||||
content={
|
|
||||||
"success": True,
|
|
||||||
"message": f"Updated {len(applied_updates)} attribute(s)",
|
|
||||||
"applied": applied_updates,
|
|
||||||
},
|
|
||||||
status_code=200,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@router.post(
|
@router.post(
|
||||||
"/events/{event_id}/description",
|
"/events/{event_id}/description",
|
||||||
response_model=GenericResponse,
|
response_model=GenericResponse,
|
||||||
|
|||||||
@ -355,6 +355,8 @@ def collect_state_classification_examples(
|
|||||||
cameras: Dict mapping camera names to normalized crop coordinates [x1, y1, x2, y2] (0-1)
|
cameras: Dict mapping camera names to normalized crop coordinates [x1, y1, x2, y2] (0-1)
|
||||||
"""
|
"""
|
||||||
dataset_dir = os.path.join(CLIPS_DIR, model_name, "dataset")
|
dataset_dir = os.path.join(CLIPS_DIR, model_name, "dataset")
|
||||||
|
temp_dir = os.path.join(dataset_dir, "temp")
|
||||||
|
os.makedirs(temp_dir, exist_ok=True)
|
||||||
|
|
||||||
# Step 1: Get review items for the cameras
|
# Step 1: Get review items for the cameras
|
||||||
camera_names = list(cameras.keys())
|
camera_names = list(cameras.keys())
|
||||||
@ -369,10 +371,6 @@ def collect_state_classification_examples(
|
|||||||
logger.warning(f"No review items found for cameras: {camera_names}")
|
logger.warning(f"No review items found for cameras: {camera_names}")
|
||||||
return
|
return
|
||||||
|
|
||||||
# The temp directory is only created when there are review_items.
|
|
||||||
temp_dir = os.path.join(dataset_dir, "temp")
|
|
||||||
os.makedirs(temp_dir, exist_ok=True)
|
|
||||||
|
|
||||||
# Step 2: Create balanced timestamp selection (100 samples)
|
# Step 2: Create balanced timestamp selection (100 samples)
|
||||||
timestamps = _select_balanced_timestamps(review_items, target_count=100)
|
timestamps = _select_balanced_timestamps(review_items, target_count=100)
|
||||||
|
|
||||||
|
|||||||
@ -38,10 +38,6 @@
|
|||||||
"label": "Sub Labels",
|
"label": "Sub Labels",
|
||||||
"all": "All Sub Labels"
|
"all": "All Sub Labels"
|
||||||
},
|
},
|
||||||
"attributes": {
|
|
||||||
"label": "Classification Attributes",
|
|
||||||
"all": "All Attributes"
|
|
||||||
},
|
|
||||||
"score": "Score",
|
"score": "Score",
|
||||||
"estimatedSpeed": "Estimated Speed ({{unit}})",
|
"estimatedSpeed": "Estimated Speed ({{unit}})",
|
||||||
"features": {
|
"features": {
|
||||||
|
|||||||
@ -104,14 +104,12 @@
|
|||||||
"regenerate": "A new description has been requested from {{provider}}. Depending on the speed of your provider, the new description may take some time to regenerate.",
|
"regenerate": "A new description has been requested from {{provider}}. Depending on the speed of your provider, the new description may take some time to regenerate.",
|
||||||
"updatedSublabel": "Successfully updated sub label.",
|
"updatedSublabel": "Successfully updated sub label.",
|
||||||
"updatedLPR": "Successfully updated license plate.",
|
"updatedLPR": "Successfully updated license plate.",
|
||||||
"updatedAttributes": "Successfully updated attributes.",
|
|
||||||
"audioTranscription": "Successfully requested audio transcription. Depending on the speed of your Frigate server, the transcription may take some time to complete."
|
"audioTranscription": "Successfully requested audio transcription. Depending on the speed of your Frigate server, the transcription may take some time to complete."
|
||||||
},
|
},
|
||||||
"error": {
|
"error": {
|
||||||
"regenerate": "Failed to call {{provider}} for a new description: {{errorMessage}}",
|
"regenerate": "Failed to call {{provider}} for a new description: {{errorMessage}}",
|
||||||
"updatedSublabelFailed": "Failed to update sub label: {{errorMessage}}",
|
"updatedSublabelFailed": "Failed to update sub label: {{errorMessage}}",
|
||||||
"updatedLPRFailed": "Failed to update license plate: {{errorMessage}}",
|
"updatedLPRFailed": "Failed to update license plate: {{errorMessage}}",
|
||||||
"updatedAttributesFailed": "Failed to update attributes: {{errorMessage}}",
|
|
||||||
"audioTranscription": "Failed to request audio transcription: {{errorMessage}}"
|
"audioTranscription": "Failed to request audio transcription: {{errorMessage}}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -127,10 +125,6 @@
|
|||||||
"desc": "Enter a new license plate value for this {{label}}",
|
"desc": "Enter a new license plate value for this {{label}}",
|
||||||
"descNoLabel": "Enter a new license plate value for this tracked object"
|
"descNoLabel": "Enter a new license plate value for this tracked object"
|
||||||
},
|
},
|
||||||
"editAttributes": {
|
|
||||||
"title": "Edit attributes",
|
|
||||||
"desc": "Select classification attributes for this {{label}}"
|
|
||||||
},
|
|
||||||
"snapshotScore": {
|
"snapshotScore": {
|
||||||
"label": "Snapshot Score"
|
"label": "Snapshot Score"
|
||||||
},
|
},
|
||||||
@ -142,7 +136,6 @@
|
|||||||
"label": "Score"
|
"label": "Score"
|
||||||
},
|
},
|
||||||
"recognizedLicensePlate": "Recognized License Plate",
|
"recognizedLicensePlate": "Recognized License Plate",
|
||||||
"attributes": "Classification Attributes",
|
|
||||||
"estimatedSpeed": "Estimated Speed",
|
"estimatedSpeed": "Estimated Speed",
|
||||||
"objects": "Objects",
|
"objects": "Objects",
|
||||||
"camera": "Camera",
|
"camera": "Camera",
|
||||||
|
|||||||
@ -16,7 +16,6 @@
|
|||||||
"labels": "Labels",
|
"labels": "Labels",
|
||||||
"zones": "Zones",
|
"zones": "Zones",
|
||||||
"sub_labels": "Sub Labels",
|
"sub_labels": "Sub Labels",
|
||||||
"attributes": "Attributes",
|
|
||||||
"search_type": "Search Type",
|
"search_type": "Search Type",
|
||||||
"time_range": "Time Range",
|
"time_range": "Time Range",
|
||||||
"before": "Before",
|
"before": "Before",
|
||||||
|
|||||||
@ -399,7 +399,7 @@ export default function InputWithTags({
|
|||||||
newFilters.sort = value as SearchSortType;
|
newFilters.sort = value as SearchSortType;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
// Handle array types (cameras, labels, sub_labels, attributes, zones)
|
// Handle array types (cameras, labels, subLabels, zones)
|
||||||
if (!newFilters[type]) newFilters[type] = [];
|
if (!newFilters[type]) newFilters[type] = [];
|
||||||
if (Array.isArray(newFilters[type])) {
|
if (Array.isArray(newFilters[type])) {
|
||||||
if (!(newFilters[type] as string[]).includes(value)) {
|
if (!(newFilters[type] as string[]).includes(value)) {
|
||||||
|
|||||||
@ -84,7 +84,6 @@ import { LuInfo } from "react-icons/lu";
|
|||||||
import { TooltipPortal } from "@radix-ui/react-tooltip";
|
import { TooltipPortal } from "@radix-ui/react-tooltip";
|
||||||
import { FaPencilAlt } from "react-icons/fa";
|
import { FaPencilAlt } from "react-icons/fa";
|
||||||
import TextEntryDialog from "@/components/overlay/dialog/TextEntryDialog";
|
import TextEntryDialog from "@/components/overlay/dialog/TextEntryDialog";
|
||||||
import AttributeSelectDialog from "@/components/overlay/dialog/AttributeSelectDialog";
|
|
||||||
import { Trans, useTranslation } from "react-i18next";
|
import { Trans, useTranslation } from "react-i18next";
|
||||||
import { useIsAdmin } from "@/hooks/use-is-admin";
|
import { useIsAdmin } from "@/hooks/use-is-admin";
|
||||||
import { getTranslatedLabel } from "@/utils/i18n";
|
import { getTranslatedLabel } from "@/utils/i18n";
|
||||||
@ -298,7 +297,6 @@ type DialogContentComponentProps = {
|
|||||||
isPopoverOpen: boolean;
|
isPopoverOpen: boolean;
|
||||||
setIsPopoverOpen: (open: boolean) => void;
|
setIsPopoverOpen: (open: boolean) => void;
|
||||||
dialogContainer: HTMLDivElement | null;
|
dialogContainer: HTMLDivElement | null;
|
||||||
setShowNavigationButtons: React.Dispatch<React.SetStateAction<boolean>>;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
function DialogContentComponent({
|
function DialogContentComponent({
|
||||||
@ -316,7 +314,6 @@ function DialogContentComponent({
|
|||||||
isPopoverOpen,
|
isPopoverOpen,
|
||||||
setIsPopoverOpen,
|
setIsPopoverOpen,
|
||||||
dialogContainer,
|
dialogContainer,
|
||||||
setShowNavigationButtons,
|
|
||||||
}: DialogContentComponentProps) {
|
}: DialogContentComponentProps) {
|
||||||
if (page === "tracking_details") {
|
if (page === "tracking_details") {
|
||||||
return (
|
return (
|
||||||
@ -402,7 +399,6 @@ function DialogContentComponent({
|
|||||||
config={config}
|
config={config}
|
||||||
setSearch={setSearch}
|
setSearch={setSearch}
|
||||||
setInputFocused={setInputFocused}
|
setInputFocused={setInputFocused}
|
||||||
setShowNavigationButtons={setShowNavigationButtons}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -419,7 +415,6 @@ function DialogContentComponent({
|
|||||||
config={config}
|
config={config}
|
||||||
setSearch={setSearch}
|
setSearch={setSearch}
|
||||||
setInputFocused={setInputFocused}
|
setInputFocused={setInputFocused}
|
||||||
setShowNavigationButtons={setShowNavigationButtons}
|
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
@ -464,7 +459,6 @@ export default function SearchDetailDialog({
|
|||||||
|
|
||||||
const [isOpen, setIsOpen] = useState(search != undefined);
|
const [isOpen, setIsOpen] = useState(search != undefined);
|
||||||
const [isPopoverOpen, setIsPopoverOpen] = useState(false);
|
const [isPopoverOpen, setIsPopoverOpen] = useState(false);
|
||||||
const [showNavigationButtons, setShowNavigationButtons] = useState(false);
|
|
||||||
const dialogContentRef = useRef<HTMLDivElement | null>(null);
|
const dialogContentRef = useRef<HTMLDivElement | null>(null);
|
||||||
const [dialogContainer, setDialogContainer] = useState<HTMLDivElement | null>(
|
const [dialogContainer, setDialogContainer] = useState<HTMLDivElement | null>(
|
||||||
null,
|
null,
|
||||||
@ -546,9 +540,9 @@ export default function SearchDetailDialog({
|
|||||||
onOpenChange={handleOpenChange}
|
onOpenChange={handleOpenChange}
|
||||||
enableHistoryBack={true}
|
enableHistoryBack={true}
|
||||||
>
|
>
|
||||||
{isDesktop && onPrevious && onNext && showNavigationButtons && (
|
{isDesktop && onPrevious && onNext && (
|
||||||
<DialogPortal>
|
<DialogPortal>
|
||||||
<div className="pointer-events-none fixed inset-0 z-[51] flex items-center justify-center">
|
<div className="pointer-events-none fixed inset-0 z-[200] flex items-center justify-center">
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
"relative flex items-center justify-between",
|
"relative flex items-center justify-between",
|
||||||
@ -658,7 +652,6 @@ export default function SearchDetailDialog({
|
|||||||
isPopoverOpen={isPopoverOpen}
|
isPopoverOpen={isPopoverOpen}
|
||||||
setIsPopoverOpen={setIsPopoverOpen}
|
setIsPopoverOpen={setIsPopoverOpen}
|
||||||
dialogContainer={dialogContainer}
|
dialogContainer={dialogContainer}
|
||||||
setShowNavigationButtons={setShowNavigationButtons}
|
|
||||||
/>
|
/>
|
||||||
</Content>
|
</Content>
|
||||||
</Overlay>
|
</Overlay>
|
||||||
@ -671,14 +664,12 @@ type ObjectDetailsTabProps = {
|
|||||||
config?: FrigateConfig;
|
config?: FrigateConfig;
|
||||||
setSearch: (search: SearchResult | undefined) => void;
|
setSearch: (search: SearchResult | undefined) => void;
|
||||||
setInputFocused: React.Dispatch<React.SetStateAction<boolean>>;
|
setInputFocused: React.Dispatch<React.SetStateAction<boolean>>;
|
||||||
setShowNavigationButtons?: React.Dispatch<React.SetStateAction<boolean>>;
|
|
||||||
};
|
};
|
||||||
function ObjectDetailsTab({
|
function ObjectDetailsTab({
|
||||||
search,
|
search,
|
||||||
config,
|
config,
|
||||||
setSearch,
|
setSearch,
|
||||||
setInputFocused,
|
setInputFocused,
|
||||||
setShowNavigationButtons,
|
|
||||||
}: ObjectDetailsTabProps) {
|
}: ObjectDetailsTabProps) {
|
||||||
const { t, i18n } = useTranslation([
|
const { t, i18n } = useTranslation([
|
||||||
"views/explore",
|
"views/explore",
|
||||||
@ -687,15 +678,6 @@ function ObjectDetailsTab({
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
const apiHost = useApiHost();
|
const apiHost = useApiHost();
|
||||||
const hasCustomClassificationModels = useMemo(
|
|
||||||
() => Object.keys(config?.classification?.custom ?? {}).length > 0,
|
|
||||||
[config],
|
|
||||||
);
|
|
||||||
const { data: modelAttributes } = useSWR<Record<string, string[]>>(
|
|
||||||
hasCustomClassificationModels && search
|
|
||||||
? `classification/attributes?object_type=${encodeURIComponent(search.label)}&group_by_model=true`
|
|
||||||
: null,
|
|
||||||
);
|
|
||||||
|
|
||||||
// mutation / revalidation
|
// mutation / revalidation
|
||||||
|
|
||||||
@ -726,7 +708,6 @@ function ObjectDetailsTab({
|
|||||||
const [desc, setDesc] = useState(search?.data.description);
|
const [desc, setDesc] = useState(search?.data.description);
|
||||||
const [isSubLabelDialogOpen, setIsSubLabelDialogOpen] = useState(false);
|
const [isSubLabelDialogOpen, setIsSubLabelDialogOpen] = useState(false);
|
||||||
const [isLPRDialogOpen, setIsLPRDialogOpen] = useState(false);
|
const [isLPRDialogOpen, setIsLPRDialogOpen] = useState(false);
|
||||||
const [isAttributesDialogOpen, setIsAttributesDialogOpen] = useState(false);
|
|
||||||
const [isEditingDesc, setIsEditingDesc] = useState(false);
|
const [isEditingDesc, setIsEditingDesc] = useState(false);
|
||||||
const originalDescRef = useRef<string | null>(null);
|
const originalDescRef = useRef<string | null>(null);
|
||||||
|
|
||||||
@ -741,19 +722,6 @@ function ObjectDetailsTab({
|
|||||||
// we have to make sure the current selected search item stays in sync
|
// we have to make sure the current selected search item stays in sync
|
||||||
useEffect(() => setDesc(search?.data.description ?? ""), [search]);
|
useEffect(() => setDesc(search?.data.description ?? ""), [search]);
|
||||||
|
|
||||||
useEffect(() => setIsAttributesDialogOpen(false), [search?.id]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const anyDialogOpen =
|
|
||||||
isSubLabelDialogOpen || isLPRDialogOpen || isAttributesDialogOpen;
|
|
||||||
setShowNavigationButtons?.(!anyDialogOpen);
|
|
||||||
}, [
|
|
||||||
isSubLabelDialogOpen,
|
|
||||||
isLPRDialogOpen,
|
|
||||||
isAttributesDialogOpen,
|
|
||||||
setShowNavigationButtons,
|
|
||||||
]);
|
|
||||||
|
|
||||||
const formattedDate = useFormattedTimestamp(
|
const formattedDate = useFormattedTimestamp(
|
||||||
search?.start_time ?? 0,
|
search?.start_time ?? 0,
|
||||||
config?.ui.time_format == "24hour"
|
config?.ui.time_format == "24hour"
|
||||||
@ -839,41 +807,6 @@ function ObjectDetailsTab({
|
|||||||
}
|
}
|
||||||
}, [search]);
|
}, [search]);
|
||||||
|
|
||||||
// Extract current attribute selections grouped by model
|
|
||||||
const selectedAttributesByModel = useMemo(() => {
|
|
||||||
if (!search || !modelAttributes) {
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
|
|
||||||
const dataAny = search.data as Record<string, unknown>;
|
|
||||||
const selections: Record<string, string | null> = {};
|
|
||||||
|
|
||||||
// Initialize all models with null
|
|
||||||
Object.keys(modelAttributes).forEach((modelName) => {
|
|
||||||
selections[modelName] = null;
|
|
||||||
});
|
|
||||||
|
|
||||||
// Find which attribute is selected for each model
|
|
||||||
Object.keys(modelAttributes).forEach((modelName) => {
|
|
||||||
const value = dataAny[modelName];
|
|
||||||
if (
|
|
||||||
typeof value === "string" &&
|
|
||||||
modelAttributes[modelName].includes(value)
|
|
||||||
) {
|
|
||||||
selections[modelName] = value;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return selections;
|
|
||||||
}, [search, modelAttributes]);
|
|
||||||
|
|
||||||
// Get flat list of selected attributes for display
|
|
||||||
const eventAttributes = useMemo(() => {
|
|
||||||
return Object.values(selectedAttributesByModel)
|
|
||||||
.filter((attr): attr is string => attr !== null)
|
|
||||||
.sort((a, b) => a.localeCompare(b));
|
|
||||||
}, [selectedAttributesByModel]);
|
|
||||||
|
|
||||||
const isEventsKey = useCallback((key: unknown): boolean => {
|
const isEventsKey = useCallback((key: unknown): boolean => {
|
||||||
const candidate = Array.isArray(key) ? key[0] : key;
|
const candidate = Array.isArray(key) ? key[0] : key;
|
||||||
const EVENTS_KEY_PATTERNS = ["events", "events/search", "events/explore"];
|
const EVENTS_KEY_PATTERNS = ["events", "events/search", "events/explore"];
|
||||||
@ -1115,74 +1048,6 @@ function ObjectDetailsTab({
|
|||||||
[search, apiHost, mutate, setSearch, t, mapSearchResults, isEventsKey],
|
[search, apiHost, mutate, setSearch, t, mapSearchResults, isEventsKey],
|
||||||
);
|
);
|
||||||
|
|
||||||
const handleAttributesSave = useCallback(
|
|
||||||
(selectedAttributes: string[]) => {
|
|
||||||
if (!search) return;
|
|
||||||
|
|
||||||
axios
|
|
||||||
.post(`${apiHost}api/events/${search.id}/attributes`, {
|
|
||||||
attributes: selectedAttributes,
|
|
||||||
})
|
|
||||||
.then((response) => {
|
|
||||||
const applied = Array.isArray(response.data?.applied)
|
|
||||||
? (response.data.applied as {
|
|
||||||
model?: string;
|
|
||||||
label?: string | null;
|
|
||||||
score?: number | null;
|
|
||||||
}[])
|
|
||||||
: [];
|
|
||||||
|
|
||||||
toast.success(t("details.item.toast.success.updatedAttributes"), {
|
|
||||||
position: "top-center",
|
|
||||||
});
|
|
||||||
|
|
||||||
const applyUpdatedAttributes = (event: SearchResult) => {
|
|
||||||
if (event.id !== search.id) return event;
|
|
||||||
|
|
||||||
const updatedData: Record<string, unknown> = { ...event.data };
|
|
||||||
|
|
||||||
applied.forEach(({ model, label, score }) => {
|
|
||||||
if (!model) return;
|
|
||||||
updatedData[model] = label ?? null;
|
|
||||||
updatedData[`${model}_score`] = score ?? null;
|
|
||||||
});
|
|
||||||
|
|
||||||
return { ...event, data: updatedData } as SearchResult;
|
|
||||||
};
|
|
||||||
|
|
||||||
mutate(
|
|
||||||
(key) => isEventsKey(key),
|
|
||||||
(currentData: SearchResult[][] | SearchResult[] | undefined) =>
|
|
||||||
mapSearchResults(currentData, applyUpdatedAttributes),
|
|
||||||
{
|
|
||||||
optimisticData: true,
|
|
||||||
rollbackOnError: true,
|
|
||||||
revalidate: false,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
setSearch(applyUpdatedAttributes(search));
|
|
||||||
setIsAttributesDialogOpen(false);
|
|
||||||
})
|
|
||||||
.catch((error) => {
|
|
||||||
const errorMessage =
|
|
||||||
error.response?.data?.message ||
|
|
||||||
error.response?.data?.detail ||
|
|
||||||
"Unknown error";
|
|
||||||
|
|
||||||
toast.error(
|
|
||||||
t("details.item.toast.error.updatedAttributesFailed", {
|
|
||||||
errorMessage,
|
|
||||||
}),
|
|
||||||
{
|
|
||||||
position: "top-center",
|
|
||||||
},
|
|
||||||
);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
[search, apiHost, mutate, t, mapSearchResults, isEventsKey, setSearch],
|
|
||||||
);
|
|
||||||
|
|
||||||
// speech transcription
|
// speech transcription
|
||||||
|
|
||||||
const onTranscribe = useCallback(() => {
|
const onTranscribe = useCallback(() => {
|
||||||
@ -1430,38 +1295,6 @@ function ObjectDetailsTab({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{hasCustomClassificationModels &&
|
|
||||||
modelAttributes &&
|
|
||||||
Object.keys(modelAttributes).length > 0 && (
|
|
||||||
<div className="flex flex-col gap-1.5">
|
|
||||||
<div className="flex items-center gap-2 text-sm text-primary/40">
|
|
||||||
{t("details.attributes")}
|
|
||||||
{isAdmin && (
|
|
||||||
<Tooltip>
|
|
||||||
<TooltipTrigger asChild>
|
|
||||||
<span>
|
|
||||||
<FaPencilAlt
|
|
||||||
className="size-4 cursor-pointer text-primary/40 hover:text-primary/80"
|
|
||||||
onClick={() => setIsAttributesDialogOpen(true)}
|
|
||||||
/>
|
|
||||||
</span>
|
|
||||||
</TooltipTrigger>
|
|
||||||
<TooltipPortal>
|
|
||||||
<TooltipContent>
|
|
||||||
{t("button.edit", { ns: "common" })}
|
|
||||||
</TooltipContent>
|
|
||||||
</TooltipPortal>
|
|
||||||
</Tooltip>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
<div className="text-sm">
|
|
||||||
{eventAttributes.length > 0
|
|
||||||
? eventAttributes.join(", ")
|
|
||||||
: t("label.none", { ns: "common" })}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -1762,17 +1595,6 @@ function ObjectDetailsTab({
|
|||||||
defaultValue={search?.data.recognized_license_plate || ""}
|
defaultValue={search?.data.recognized_license_plate || ""}
|
||||||
allowEmpty={true}
|
allowEmpty={true}
|
||||||
/>
|
/>
|
||||||
<AttributeSelectDialog
|
|
||||||
open={isAttributesDialogOpen}
|
|
||||||
setOpen={setIsAttributesDialogOpen}
|
|
||||||
title={t("details.editAttributes.title")}
|
|
||||||
description={t("details.editAttributes.desc", {
|
|
||||||
label: search.label,
|
|
||||||
})}
|
|
||||||
onSave={handleAttributesSave}
|
|
||||||
selectedAttributes={selectedAttributesByModel}
|
|
||||||
modelAttributes={modelAttributes ?? {}}
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -1,123 +0,0 @@
|
|||||||
import { Button } from "@/components/ui/button";
|
|
||||||
import {
|
|
||||||
Dialog,
|
|
||||||
DialogContent,
|
|
||||||
DialogDescription,
|
|
||||||
DialogFooter,
|
|
||||||
DialogHeader,
|
|
||||||
DialogTitle,
|
|
||||||
} from "@/components/ui/dialog";
|
|
||||||
import { Label } from "@/components/ui/label";
|
|
||||||
import { Switch } from "@/components/ui/switch";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { useCallback, useEffect, useState } from "react";
|
|
||||||
import { isDesktop } from "react-device-detect";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
|
|
||||||
type AttributeSelectDialogProps = {
|
|
||||||
open: boolean;
|
|
||||||
setOpen: (open: boolean) => void;
|
|
||||||
title: string;
|
|
||||||
description: string;
|
|
||||||
onSave: (selectedAttributes: string[]) => void;
|
|
||||||
selectedAttributes: Record<string, string | null>; // model -> selected attribute
|
|
||||||
modelAttributes: Record<string, string[]>; // model -> available attributes
|
|
||||||
className?: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function AttributeSelectDialog({
|
|
||||||
open,
|
|
||||||
setOpen,
|
|
||||||
title,
|
|
||||||
description,
|
|
||||||
onSave,
|
|
||||||
selectedAttributes,
|
|
||||||
modelAttributes,
|
|
||||||
className,
|
|
||||||
}: AttributeSelectDialogProps) {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const [internalSelection, setInternalSelection] = useState<
|
|
||||||
Record<string, string | null>
|
|
||||||
>({});
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (open) {
|
|
||||||
setInternalSelection({ ...selectedAttributes });
|
|
||||||
}
|
|
||||||
}, [open, selectedAttributes]);
|
|
||||||
|
|
||||||
const handleSave = useCallback(() => {
|
|
||||||
// Convert from model->attribute map to flat list of attributes
|
|
||||||
const attributes = Object.values(internalSelection).filter(
|
|
||||||
(attr): attr is string => attr !== null,
|
|
||||||
);
|
|
||||||
onSave(attributes);
|
|
||||||
}, [internalSelection, onSave]);
|
|
||||||
|
|
||||||
const handleToggle = useCallback((modelName: string, attribute: string) => {
|
|
||||||
setInternalSelection((prev) => {
|
|
||||||
const currentSelection = prev[modelName];
|
|
||||||
// If clicking the currently selected attribute, deselect it
|
|
||||||
if (currentSelection === attribute) {
|
|
||||||
return { ...prev, [modelName]: null };
|
|
||||||
}
|
|
||||||
// Otherwise, select this attribute for this model
|
|
||||||
return { ...prev, [modelName]: attribute };
|
|
||||||
});
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Dialog open={open} onOpenChange={setOpen}>
|
|
||||||
<DialogContent
|
|
||||||
className={cn(className, isDesktop ? "max-w-md" : "max-w-[90%]")}
|
|
||||||
onOpenAutoFocus={(e) => e.preventDefault()}
|
|
||||||
>
|
|
||||||
<DialogHeader>
|
|
||||||
<DialogTitle>{title}</DialogTitle>
|
|
||||||
<DialogDescription>{description}</DialogDescription>
|
|
||||||
</DialogHeader>
|
|
||||||
<div className="scrollbar-container overflow-y-auto">
|
|
||||||
<div className="max-h-[80dvh] space-y-6 py-2">
|
|
||||||
{Object.entries(modelAttributes).map(([modelName, attributes]) => (
|
|
||||||
<div key={modelName} className="space-y-3">
|
|
||||||
<div className="text-sm font-semibold text-primary-variant">
|
|
||||||
{modelName}
|
|
||||||
</div>
|
|
||||||
<div className="space-y-2 pl-2">
|
|
||||||
{attributes.map((attribute) => (
|
|
||||||
<div
|
|
||||||
key={attribute}
|
|
||||||
className="flex items-center justify-between gap-2"
|
|
||||||
>
|
|
||||||
<Label
|
|
||||||
htmlFor={`${modelName}-${attribute}`}
|
|
||||||
className="cursor-pointer text-sm text-primary"
|
|
||||||
>
|
|
||||||
{attribute}
|
|
||||||
</Label>
|
|
||||||
<Switch
|
|
||||||
id={`${modelName}-${attribute}`}
|
|
||||||
checked={internalSelection[modelName] === attribute}
|
|
||||||
onCheckedChange={() =>
|
|
||||||
handleToggle(modelName, attribute)
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<DialogFooter>
|
|
||||||
<Button type="button" onClick={() => setOpen(false)}>
|
|
||||||
{t("button.cancel")}
|
|
||||||
</Button>
|
|
||||||
<Button variant="select" onClick={handleSave}>
|
|
||||||
{t("button.save", { ns: "common" })}
|
|
||||||
</Button>
|
|
||||||
</DialogFooter>
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@ -1,96 +0,0 @@
|
|||||||
import { Button } from "@/components/ui/button";
|
|
||||||
import {
|
|
||||||
Dialog,
|
|
||||||
DialogContent,
|
|
||||||
DialogDescription,
|
|
||||||
DialogFooter,
|
|
||||||
DialogHeader,
|
|
||||||
DialogTitle,
|
|
||||||
} from "@/components/ui/dialog";
|
|
||||||
import { cn } from "@/lib/utils";
|
|
||||||
import { useState } from "react";
|
|
||||||
import { isMobile } from "react-device-detect";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import FilterSwitch from "@/components/filter/FilterSwitch";
|
|
||||||
|
|
||||||
type MultiSelectDialogProps = {
|
|
||||||
open: boolean;
|
|
||||||
title: string;
|
|
||||||
description?: string;
|
|
||||||
setOpen: (open: boolean) => void;
|
|
||||||
onSave: (selectedItems: string[]) => void;
|
|
||||||
selectedItems: string[];
|
|
||||||
availableItems: string[];
|
|
||||||
allowEmpty?: boolean;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function MultiSelectDialog({
|
|
||||||
open,
|
|
||||||
title,
|
|
||||||
description,
|
|
||||||
setOpen,
|
|
||||||
onSave,
|
|
||||||
selectedItems = [],
|
|
||||||
availableItems = [],
|
|
||||||
allowEmpty = false,
|
|
||||||
}: MultiSelectDialogProps) {
|
|
||||||
const { t } = useTranslation("common");
|
|
||||||
const [internalSelection, setInternalSelection] =
|
|
||||||
useState<string[]>(selectedItems);
|
|
||||||
|
|
||||||
// Reset internal selection when dialog opens
|
|
||||||
const handleOpenChange = (isOpen: boolean) => {
|
|
||||||
if (isOpen) {
|
|
||||||
setInternalSelection(selectedItems);
|
|
||||||
}
|
|
||||||
setOpen(isOpen);
|
|
||||||
};
|
|
||||||
|
|
||||||
const toggleItem = (item: string) => {
|
|
||||||
setInternalSelection((prev) =>
|
|
||||||
prev.includes(item) ? prev.filter((i) => i !== item) : [...prev, item],
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleSave = () => {
|
|
||||||
if (!allowEmpty && internalSelection.length === 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
onSave(internalSelection);
|
|
||||||
setOpen(false);
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Dialog open={open} defaultOpen={false} onOpenChange={handleOpenChange}>
|
|
||||||
<DialogContent>
|
|
||||||
<DialogHeader>
|
|
||||||
<DialogTitle>{title}</DialogTitle>
|
|
||||||
{description && <DialogDescription>{description}</DialogDescription>}
|
|
||||||
</DialogHeader>
|
|
||||||
<div className="max-h-[80dvh] space-y-3 overflow-y-auto py-4">
|
|
||||||
{availableItems.map((item) => (
|
|
||||||
<FilterSwitch
|
|
||||||
key={item}
|
|
||||||
label={item}
|
|
||||||
isChecked={internalSelection.includes(item)}
|
|
||||||
onCheckedChange={() => toggleItem(item)}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<DialogFooter className={cn("pt-4", isMobile && "gap-2")}>
|
|
||||||
<Button type="button" onClick={() => setOpen(false)}>
|
|
||||||
{t("button.cancel")}
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
variant="select"
|
|
||||||
type="button"
|
|
||||||
onClick={handleSave}
|
|
||||||
disabled={!allowEmpty && internalSelection.length === 0}
|
|
||||||
>
|
|
||||||
{t("button.save")}
|
|
||||||
</Button>
|
|
||||||
</DialogFooter>
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@ -65,13 +65,6 @@ export default function SearchFilterDialog({
|
|||||||
const { t } = useTranslation(["components/filter"]);
|
const { t } = useTranslation(["components/filter"]);
|
||||||
const [currentFilter, setCurrentFilter] = useState(filter ?? {});
|
const [currentFilter, setCurrentFilter] = useState(filter ?? {});
|
||||||
const { data: allSubLabels } = useSWR(["sub_labels", { split_joined: 1 }]);
|
const { data: allSubLabels } = useSWR(["sub_labels", { split_joined: 1 }]);
|
||||||
const hasCustomClassificationModels = useMemo(
|
|
||||||
() => Object.keys(config?.classification?.custom ?? {}).length > 0,
|
|
||||||
[config],
|
|
||||||
);
|
|
||||||
const { data: allAttributes } = useSWR(
|
|
||||||
hasCustomClassificationModels ? "classification/attributes" : null,
|
|
||||||
);
|
|
||||||
const { data: allRecognizedLicensePlates } = useSWR<string[]>(
|
const { data: allRecognizedLicensePlates } = useSWR<string[]>(
|
||||||
"recognized_license_plates",
|
"recognized_license_plates",
|
||||||
);
|
);
|
||||||
@ -98,10 +91,8 @@ export default function SearchFilterDialog({
|
|||||||
(currentFilter.max_speed ?? 150) < 150 ||
|
(currentFilter.max_speed ?? 150) < 150 ||
|
||||||
(currentFilter.zones?.length ?? 0) > 0 ||
|
(currentFilter.zones?.length ?? 0) > 0 ||
|
||||||
(currentFilter.sub_labels?.length ?? 0) > 0 ||
|
(currentFilter.sub_labels?.length ?? 0) > 0 ||
|
||||||
(hasCustomClassificationModels &&
|
|
||||||
(currentFilter.attributes?.length ?? 0) > 0) ||
|
|
||||||
(currentFilter.recognized_license_plate?.length ?? 0) > 0),
|
(currentFilter.recognized_license_plate?.length ?? 0) > 0),
|
||||||
[currentFilter, hasCustomClassificationModels],
|
[currentFilter],
|
||||||
);
|
);
|
||||||
|
|
||||||
const trigger = (
|
const trigger = (
|
||||||
@ -142,15 +133,6 @@ export default function SearchFilterDialog({
|
|||||||
setCurrentFilter({ ...currentFilter, sub_labels: newSubLabels })
|
setCurrentFilter({ ...currentFilter, sub_labels: newSubLabels })
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
{hasCustomClassificationModels && (
|
|
||||||
<AttributeFilterContent
|
|
||||||
allAttributes={allAttributes}
|
|
||||||
attributes={currentFilter.attributes}
|
|
||||||
setAttributes={(newAttributes) =>
|
|
||||||
setCurrentFilter({ ...currentFilter, attributes: newAttributes })
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<RecognizedLicensePlatesFilterContent
|
<RecognizedLicensePlatesFilterContent
|
||||||
allRecognizedLicensePlates={allRecognizedLicensePlates}
|
allRecognizedLicensePlates={allRecognizedLicensePlates}
|
||||||
recognizedLicensePlates={currentFilter.recognized_license_plate}
|
recognizedLicensePlates={currentFilter.recognized_license_plate}
|
||||||
@ -234,7 +216,6 @@ export default function SearchFilterDialog({
|
|||||||
max_speed: undefined,
|
max_speed: undefined,
|
||||||
has_snapshot: undefined,
|
has_snapshot: undefined,
|
||||||
has_clip: undefined,
|
has_clip: undefined,
|
||||||
...(hasCustomClassificationModels && { attributes: undefined }),
|
|
||||||
recognized_license_plate: undefined,
|
recognized_license_plate: undefined,
|
||||||
}));
|
}));
|
||||||
}}
|
}}
|
||||||
@ -1106,72 +1087,3 @@ export function RecognizedLicensePlatesFilterContent({
|
|||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
type AttributeFilterContentProps = {
|
|
||||||
allAttributes?: string[];
|
|
||||||
attributes: string[] | undefined;
|
|
||||||
setAttributes: (labels: string[] | undefined) => void;
|
|
||||||
};
|
|
||||||
export function AttributeFilterContent({
|
|
||||||
allAttributes,
|
|
||||||
attributes,
|
|
||||||
setAttributes,
|
|
||||||
}: AttributeFilterContentProps) {
|
|
||||||
const { t } = useTranslation(["components/filter"]);
|
|
||||||
const sortedAttributes = useMemo(
|
|
||||||
() =>
|
|
||||||
[...(allAttributes || [])].sort((a, b) =>
|
|
||||||
a.toLowerCase().localeCompare(b.toLowerCase()),
|
|
||||||
),
|
|
||||||
[allAttributes],
|
|
||||||
);
|
|
||||||
return (
|
|
||||||
<div className="overflow-x-hidden">
|
|
||||||
<DropdownMenuSeparator className="mb-3" />
|
|
||||||
<div className="text-lg">{t("attributes.label")}</div>
|
|
||||||
<div className="mb-5 mt-2.5 flex items-center justify-between">
|
|
||||||
<Label
|
|
||||||
className="mx-2 cursor-pointer text-primary"
|
|
||||||
htmlFor="allAttributes"
|
|
||||||
>
|
|
||||||
{t("attributes.all")}
|
|
||||||
</Label>
|
|
||||||
<Switch
|
|
||||||
className="ml-1"
|
|
||||||
id="allAttributes"
|
|
||||||
checked={attributes == undefined}
|
|
||||||
onCheckedChange={(isChecked) => {
|
|
||||||
if (isChecked) {
|
|
||||||
setAttributes(undefined);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div className="mt-2.5 flex flex-col gap-2.5">
|
|
||||||
{sortedAttributes.map((item) => (
|
|
||||||
<FilterSwitch
|
|
||||||
key={item}
|
|
||||||
label={item.replaceAll("_", " ")}
|
|
||||||
isChecked={attributes?.includes(item) ?? false}
|
|
||||||
onCheckedChange={(isChecked) => {
|
|
||||||
if (isChecked) {
|
|
||||||
const updatedAttributes = attributes ? [...attributes] : [];
|
|
||||||
|
|
||||||
updatedAttributes.push(item);
|
|
||||||
setAttributes(updatedAttributes);
|
|
||||||
} else {
|
|
||||||
const updatedAttributes = attributes ? [...attributes] : [];
|
|
||||||
|
|
||||||
// can not deselect the last item
|
|
||||||
if (updatedAttributes.length > 1) {
|
|
||||||
updatedAttributes.splice(updatedAttributes.indexOf(item), 1);
|
|
||||||
setAttributes(updatedAttributes);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|||||||
@ -31,7 +31,6 @@ const SEARCH_FILTER_ARRAY_KEYS = [
|
|||||||
"cameras",
|
"cameras",
|
||||||
"labels",
|
"labels",
|
||||||
"sub_labels",
|
"sub_labels",
|
||||||
"attributes",
|
|
||||||
"recognized_license_plate",
|
"recognized_license_plate",
|
||||||
"zones",
|
"zones",
|
||||||
];
|
];
|
||||||
@ -123,7 +122,6 @@ export default function Explore() {
|
|||||||
cameras: searchSearchParams["cameras"],
|
cameras: searchSearchParams["cameras"],
|
||||||
labels: searchSearchParams["labels"],
|
labels: searchSearchParams["labels"],
|
||||||
sub_labels: searchSearchParams["sub_labels"],
|
sub_labels: searchSearchParams["sub_labels"],
|
||||||
attributes: searchSearchParams["attributes"],
|
|
||||||
recognized_license_plate:
|
recognized_license_plate:
|
||||||
searchSearchParams["recognized_license_plate"],
|
searchSearchParams["recognized_license_plate"],
|
||||||
zones: searchSearchParams["zones"],
|
zones: searchSearchParams["zones"],
|
||||||
@ -160,7 +158,6 @@ export default function Explore() {
|
|||||||
cameras: searchSearchParams["cameras"],
|
cameras: searchSearchParams["cameras"],
|
||||||
labels: searchSearchParams["labels"],
|
labels: searchSearchParams["labels"],
|
||||||
sub_labels: searchSearchParams["sub_labels"],
|
sub_labels: searchSearchParams["sub_labels"],
|
||||||
attributes: searchSearchParams["attributes"],
|
|
||||||
recognized_license_plate:
|
recognized_license_plate:
|
||||||
searchSearchParams["recognized_license_plate"],
|
searchSearchParams["recognized_license_plate"],
|
||||||
zones: searchSearchParams["zones"],
|
zones: searchSearchParams["zones"],
|
||||||
|
|||||||
@ -5,7 +5,6 @@ const SEARCH_FILTERS = [
|
|||||||
"general",
|
"general",
|
||||||
"zone",
|
"zone",
|
||||||
"sub",
|
"sub",
|
||||||
"attribute",
|
|
||||||
"source",
|
"source",
|
||||||
"sort",
|
"sort",
|
||||||
] as const;
|
] as const;
|
||||||
@ -17,7 +16,6 @@ export const DEFAULT_SEARCH_FILTERS: SearchFilters[] = [
|
|||||||
"general",
|
"general",
|
||||||
"zone",
|
"zone",
|
||||||
"sub",
|
"sub",
|
||||||
"attribute",
|
|
||||||
"source",
|
"source",
|
||||||
"sort",
|
"sort",
|
||||||
];
|
];
|
||||||
@ -73,7 +71,6 @@ export type SearchFilter = {
|
|||||||
cameras?: string[];
|
cameras?: string[];
|
||||||
labels?: string[];
|
labels?: string[];
|
||||||
sub_labels?: string[];
|
sub_labels?: string[];
|
||||||
attributes?: string[];
|
|
||||||
recognized_license_plate?: string[];
|
recognized_license_plate?: string[];
|
||||||
zones?: string[];
|
zones?: string[];
|
||||||
before?: number;
|
before?: number;
|
||||||
@ -98,7 +95,6 @@ export type SearchQueryParams = {
|
|||||||
cameras?: string[];
|
cameras?: string[];
|
||||||
labels?: string[];
|
labels?: string[];
|
||||||
sub_labels?: string[];
|
sub_labels?: string[];
|
||||||
attributes?: string[];
|
|
||||||
recognized_license_plate?: string[];
|
recognized_license_plate?: string[];
|
||||||
zones?: string[];
|
zones?: string[];
|
||||||
before?: string;
|
before?: string;
|
||||||
|
|||||||
@ -143,13 +143,6 @@ export default function SearchView({
|
|||||||
}, [config, searchFilter, allowedCameras]);
|
}, [config, searchFilter, allowedCameras]);
|
||||||
|
|
||||||
const { data: allSubLabels } = useSWR("sub_labels");
|
const { data: allSubLabels } = useSWR("sub_labels");
|
||||||
const hasCustomClassificationModels = useMemo(
|
|
||||||
() => Object.keys(config?.classification?.custom ?? {}).length > 0,
|
|
||||||
[config],
|
|
||||||
);
|
|
||||||
const { data: allAttributes } = useSWR(
|
|
||||||
hasCustomClassificationModels ? "classification/attributes" : null,
|
|
||||||
);
|
|
||||||
const { data: allRecognizedLicensePlates } = useSWR(
|
const { data: allRecognizedLicensePlates } = useSWR(
|
||||||
"recognized_license_plates",
|
"recognized_license_plates",
|
||||||
);
|
);
|
||||||
@ -189,7 +182,6 @@ export default function SearchView({
|
|||||||
labels: Object.values(allLabels || {}),
|
labels: Object.values(allLabels || {}),
|
||||||
zones: Object.values(allZones || {}),
|
zones: Object.values(allZones || {}),
|
||||||
sub_labels: allSubLabels,
|
sub_labels: allSubLabels,
|
||||||
...(hasCustomClassificationModels && { attributes: allAttributes }),
|
|
||||||
search_type: ["thumbnail", "description"] as SearchSource[],
|
search_type: ["thumbnail", "description"] as SearchSource[],
|
||||||
time_range:
|
time_range:
|
||||||
config?.ui.time_format == "24hour"
|
config?.ui.time_format == "24hour"
|
||||||
@ -212,11 +204,9 @@ export default function SearchView({
|
|||||||
allLabels,
|
allLabels,
|
||||||
allZones,
|
allZones,
|
||||||
allSubLabels,
|
allSubLabels,
|
||||||
allAttributes,
|
|
||||||
allRecognizedLicensePlates,
|
allRecognizedLicensePlates,
|
||||||
searchFilter,
|
searchFilter,
|
||||||
allowedCameras,
|
allowedCameras,
|
||||||
hasCustomClassificationModels,
|
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user