mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-07-26 13:47:03 +02:00
Rename identifier field (#17128)
* backend rename * frontend * docs * fix api path
This commit is contained in:
parent
b7333557a1
commit
124cc4c9cc
@ -3,16 +3,16 @@ id: license_plate_recognition
|
||||
title: License Plate Recognition (LPR)
|
||||
---
|
||||
|
||||
Frigate can recognize license plates on vehicles and automatically add the detected characters to the `identifier` field or a known name as a `sub_label` to objects that are of type `car`. A common use case may be to read the license plates of cars pulling into a driveway or cars passing by on a street.
|
||||
Frigate can recognize license plates on vehicles and automatically add the detected characters to the `recognized_license_plate` field or a known name as a `sub_label` to objects that are of type `car`. A common use case may be to read the license plates of cars pulling into a driveway or cars passing by on a street.
|
||||
|
||||
LPR works best when the license plate is clearly visible to the camera. For moving vehicles, Frigate continuously refines the recognition process, keeping the most confident result. However, LPR does not run on stationary vehicles.
|
||||
|
||||
When a plate is recognized, the recognized name is:
|
||||
|
||||
- Added to the `car` tracked object as a `sub_label` (if known) or the `identifier` field (if unknown)
|
||||
- Added to the `car` tracked object as a `sub_label` (if known) or the `recognized_license_plate` field (if unknown)
|
||||
- Viewable in the Review Item Details pane in Review and the Tracked Object Details pane in Explore.
|
||||
- Filterable through the More Filters menu in Explore.
|
||||
- Published via the `frigate/events` MQTT topic as a `sub_label` (known) or `identifier` (unknown) for the tracked object.
|
||||
- Published via the `frigate/events` MQTT topic as a `sub_label` (known) or `recognized_license_plate` (unknown) for the tracked object.
|
||||
|
||||
## Model Requirements
|
||||
|
||||
@ -71,7 +71,7 @@ Fine-tune the LPR feature using these optional parameters:
|
||||
|
||||
- **`known_plates`**: List of strings or regular expressions that assign custom a `sub_label` to `car` objects when a recognized plate matches a known value.
|
||||
- These labels appear in the UI, filters, and notifications.
|
||||
- Unknown plates are still saved but are added to the `identifier` field rather than the `sub_label`.
|
||||
- Unknown plates are still saved but are added to the `recognized_license_plate` field rather than the `sub_label`.
|
||||
- **`match_distance`**: Allows for minor variations (missing/incorrect characters) when matching a detected plate to a known plate.
|
||||
- For example, setting `match_distance: 1` allows a plate `ABCDE` to match `ABCBE` or `ABCD`.
|
||||
- This parameter will _not_ operate on known plates that are defined as regular expressions. You should define the full string of your plate in `known_plates` in order to use `match_distance`.
|
||||
|
@ -55,8 +55,8 @@ Message published for each changed tracked object. The first message is publishe
|
||||
"current_attributes": [], // detailed data about the current attributes in this frame
|
||||
"current_estimated_speed": 0.71, // current estimated speed (mph or kph) for objects moving through zones with speed estimation enabled
|
||||
"velocity_angle": 180, // direction of travel relative to the frame for objects moving through zones with speed estimation enabled
|
||||
"identifier": "ABC12345", // an identifier for this object - in this case, an unrecognized license plate
|
||||
"identifier_score": 0.933451
|
||||
"recognized_license_plate": "ABC12345", // a recognized license plate for car objects
|
||||
"recognized_license_plate_score": 0.933451
|
||||
},
|
||||
"after": {
|
||||
"id": "1607123955.475377-mxklsc",
|
||||
@ -96,8 +96,8 @@ Message published for each changed tracked object. The first message is publishe
|
||||
],
|
||||
"current_estimated_speed": 0.77, // current estimated speed (mph or kph) for objects moving through zones with speed estimation enabled
|
||||
"velocity_angle": 180, // direction of travel relative to the frame for objects moving through zones with speed estimation enabled
|
||||
"identifier": "ABC12345", // an identifier for this object - in this case, an unrecognized license plate
|
||||
"identifier_score": 0.933451
|
||||
"recognized_license_plate": "ABC12345", // a recognized license plate for car objects
|
||||
"recognized_license_plate_score": 0.933451
|
||||
}
|
||||
}
|
||||
```
|
||||
|
@ -619,37 +619,39 @@ def get_sub_labels(split_joined: Optional[int] = None):
|
||||
return JSONResponse(content=sub_labels)
|
||||
|
||||
|
||||
@router.get("/identifiers")
|
||||
def get_identifiers(split_joined: Optional[int] = None):
|
||||
@router.get("/recognized_license_plates")
|
||||
def get_recognized_license_plates(split_joined: Optional[int] = None):
|
||||
try:
|
||||
events = Event.select(Event.data).distinct()
|
||||
except Exception:
|
||||
return JSONResponse(
|
||||
content=({"success": False, "message": "Failed to get identifiers"}),
|
||||
content=(
|
||||
{"success": False, "message": "Failed to get recognized license plates"}
|
||||
),
|
||||
status_code=404,
|
||||
)
|
||||
|
||||
identifiers = []
|
||||
recognized_license_plates = []
|
||||
for e in events:
|
||||
if e.data is not None and "identifier" in e.data:
|
||||
identifiers.append(e.data["identifier"])
|
||||
if e.data is not None and "recognized_license_plate" in e.data:
|
||||
recognized_license_plates.append(e.data["recognized_license_plate"])
|
||||
|
||||
while None in identifiers:
|
||||
identifiers.remove(None)
|
||||
while None in recognized_license_plates:
|
||||
recognized_license_plates.remove(None)
|
||||
|
||||
if split_joined:
|
||||
original_identifiers = identifiers.copy()
|
||||
for identifier in original_identifiers:
|
||||
if identifier and "," in identifier:
|
||||
identifiers.remove(identifier)
|
||||
parts = identifier.split(",")
|
||||
original_recognized_license_plates = recognized_license_plates.copy()
|
||||
for recognized_license_plate in original_recognized_license_plates:
|
||||
if recognized_license_plate and "," in recognized_license_plate:
|
||||
recognized_license_plates.remove(recognized_license_plate)
|
||||
parts = recognized_license_plate.split(",")
|
||||
for part in parts:
|
||||
if part.strip() not in identifiers:
|
||||
identifiers.append(part.strip())
|
||||
if part.strip() not in recognized_license_plates:
|
||||
recognized_license_plates.append(part.strip())
|
||||
|
||||
identifiers = list(set(identifiers))
|
||||
identifiers.sort()
|
||||
return JSONResponse(content=identifiers)
|
||||
recognized_license_plates = list(set(recognized_license_plates))
|
||||
recognized_license_plates.sort()
|
||||
return JSONResponse(content=recognized_license_plates)
|
||||
|
||||
|
||||
@router.get("/timeline")
|
||||
|
@ -27,7 +27,7 @@ class EventsQueryParams(BaseModel):
|
||||
max_score: Optional[float] = None
|
||||
min_speed: Optional[float] = None
|
||||
max_speed: Optional[float] = None
|
||||
identifier: Optional[str] = "all"
|
||||
recognized_license_plate: Optional[str] = "all"
|
||||
is_submitted: Optional[int] = None
|
||||
min_length: Optional[float] = None
|
||||
max_length: Optional[float] = None
|
||||
@ -56,7 +56,7 @@ class EventsSearchQueryParams(BaseModel):
|
||||
max_score: Optional[float] = None
|
||||
min_speed: Optional[float] = None
|
||||
max_speed: Optional[float] = None
|
||||
identifier: Optional[str] = "all"
|
||||
recognized_license_plate: Optional[str] = "all"
|
||||
sort: Optional[str] = None
|
||||
|
||||
|
||||
|
@ -101,7 +101,7 @@ def events(params: EventsQueryParams = Depends()):
|
||||
min_length = params.min_length
|
||||
max_length = params.max_length
|
||||
event_id = params.event_id
|
||||
identifier = params.identifier
|
||||
recognized_license_plate = params.recognized_license_plate
|
||||
|
||||
sort = params.sort
|
||||
|
||||
@ -159,31 +159,44 @@ def events(params: EventsQueryParams = Depends()):
|
||||
sub_label_clause = reduce(operator.or_, sub_label_clauses)
|
||||
clauses.append((sub_label_clause))
|
||||
|
||||
if identifier != "all":
|
||||
# use matching so joined identifiers are included
|
||||
# for example an identifier 'ABC123' would get events
|
||||
# with identifiers 'ABC123' and 'ABC123, XYZ789'
|
||||
identifier_clauses = []
|
||||
filtered_identifiers = identifier.split(",")
|
||||
if recognized_license_plate != "all":
|
||||
# use matching so joined recognized_license_plates are included
|
||||
# for example a recognized license plate 'ABC123' would get events
|
||||
# with recognized license plates 'ABC123' and 'ABC123, XYZ789'
|
||||
recognized_license_plate_clauses = []
|
||||
filtered_recognized_license_plates = recognized_license_plate.split(",")
|
||||
|
||||
if "None" in filtered_identifiers:
|
||||
filtered_identifiers.remove("None")
|
||||
identifier_clauses.append((Event.data["identifier"].is_null()))
|
||||
if "None" in filtered_recognized_license_plates:
|
||||
filtered_recognized_license_plates.remove("None")
|
||||
recognized_license_plate_clauses.append(
|
||||
(Event.data["recognized_license_plate"].is_null())
|
||||
)
|
||||
|
||||
for identifier in filtered_identifiers:
|
||||
for recognized_license_plate in filtered_recognized_license_plates:
|
||||
# Exact matching plus list inclusion
|
||||
identifier_clauses.append(
|
||||
(Event.data["identifier"].cast("text") == identifier)
|
||||
recognized_license_plate_clauses.append(
|
||||
(
|
||||
Event.data["recognized_license_plate"].cast("text")
|
||||
== recognized_license_plate
|
||||
)
|
||||
)
|
||||
identifier_clauses.append(
|
||||
(Event.data["identifier"].cast("text") % f"*{identifier},*")
|
||||
recognized_license_plate_clauses.append(
|
||||
(
|
||||
Event.data["recognized_license_plate"].cast("text")
|
||||
% f"*{recognized_license_plate},*"
|
||||
)
|
||||
)
|
||||
identifier_clauses.append(
|
||||
(Event.data["identifier"].cast("text") % f"*, {identifier}*")
|
||||
recognized_license_plate_clauses.append(
|
||||
(
|
||||
Event.data["recognized_license_plate"].cast("text")
|
||||
% f"*, {recognized_license_plate}*"
|
||||
)
|
||||
)
|
||||
|
||||
identifier_clause = reduce(operator.or_, identifier_clauses)
|
||||
clauses.append((identifier_clause))
|
||||
recognized_license_plate_clause = reduce(
|
||||
operator.or_, recognized_license_plate_clauses
|
||||
)
|
||||
clauses.append((recognized_license_plate_clause))
|
||||
|
||||
if zones != "all":
|
||||
# use matching so events with multiple zones
|
||||
@ -367,8 +380,8 @@ def events_explore(limit: int = 10):
|
||||
"average_estimated_speed",
|
||||
"velocity_angle",
|
||||
"path_data",
|
||||
"identifier",
|
||||
"identifier_score",
|
||||
"recognized_license_plate",
|
||||
"recognized_license_plate_score",
|
||||
]
|
||||
},
|
||||
"event_count": label_counts[event.label],
|
||||
@ -426,7 +439,7 @@ def events_search(request: Request, params: EventsSearchQueryParams = Depends())
|
||||
has_clip = params.has_clip
|
||||
has_snapshot = params.has_snapshot
|
||||
is_submitted = params.is_submitted
|
||||
identifier = params.identifier
|
||||
recognized_license_plate = params.recognized_license_plate
|
||||
|
||||
# for similarity search
|
||||
event_id = params.event_id
|
||||
@ -496,31 +509,44 @@ def events_search(request: Request, params: EventsSearchQueryParams = Depends())
|
||||
|
||||
event_filters.append((reduce(operator.or_, zone_clauses)))
|
||||
|
||||
if identifier != "all":
|
||||
# use matching so joined identifiers are included
|
||||
# for example an identifier 'ABC123' would get events
|
||||
# with identifiers 'ABC123' and 'ABC123, XYZ789'
|
||||
identifier_clauses = []
|
||||
filtered_identifiers = identifier.split(",")
|
||||
if recognized_license_plate != "all":
|
||||
# use matching so joined recognized_license_plates are included
|
||||
# for example an recognized_license_plate 'ABC123' would get events
|
||||
# with recognized_license_plates 'ABC123' and 'ABC123, XYZ789'
|
||||
recognized_license_plate_clauses = []
|
||||
filtered_recognized_license_plates = recognized_license_plate.split(",")
|
||||
|
||||
if "None" in filtered_identifiers:
|
||||
filtered_identifiers.remove("None")
|
||||
identifier_clauses.append((Event.data["identifier"].is_null()))
|
||||
if "None" in filtered_recognized_license_plates:
|
||||
filtered_recognized_license_plates.remove("None")
|
||||
recognized_license_plate_clauses.append(
|
||||
(Event.data["recognized_license_plate"].is_null())
|
||||
)
|
||||
|
||||
for identifier in filtered_identifiers:
|
||||
for recognized_license_plate in filtered_recognized_license_plates:
|
||||
# Exact matching plus list inclusion
|
||||
identifier_clauses.append(
|
||||
(Event.data["identifier"].cast("text") == identifier)
|
||||
recognized_license_plate_clauses.append(
|
||||
(
|
||||
Event.data["recognized_license_plate"].cast("text")
|
||||
== recognized_license_plate
|
||||
)
|
||||
)
|
||||
identifier_clauses.append(
|
||||
(Event.data["identifier"].cast("text") % f"*{identifier},*")
|
||||
recognized_license_plate_clauses.append(
|
||||
(
|
||||
Event.data["recognized_license_plate"].cast("text")
|
||||
% f"*{recognized_license_plate},*"
|
||||
)
|
||||
)
|
||||
identifier_clauses.append(
|
||||
(Event.data["identifier"].cast("text") % f"*, {identifier}*")
|
||||
recognized_license_plate_clauses.append(
|
||||
(
|
||||
Event.data["recognized_license_plate"].cast("text")
|
||||
% f"*, {recognized_license_plate}*"
|
||||
)
|
||||
)
|
||||
|
||||
identifier_clause = reduce(operator.or_, identifier_clauses)
|
||||
event_filters.append((identifier_clause))
|
||||
recognized_license_plate_clause = reduce(
|
||||
operator.or_, recognized_license_plate_clauses
|
||||
)
|
||||
event_filters.append((recognized_license_plate_clause))
|
||||
|
||||
if after:
|
||||
event_filters.append((Event.start_time > after))
|
||||
@ -683,8 +709,8 @@ def events_search(request: Request, params: EventsSearchQueryParams = Depends())
|
||||
"average_estimated_speed",
|
||||
"velocity_angle",
|
||||
"path_data",
|
||||
"identifier",
|
||||
"identifier_score",
|
||||
"recognized_license_plate",
|
||||
"recognized_license_plate_score",
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -141,8 +141,11 @@ class CameraState:
|
||||
if (
|
||||
obj.get("sub_label") and is_label_printable(obj["sub_label"][0])
|
||||
)
|
||||
else obj.get("identifier", [None])[0]
|
||||
if (obj.get("identifier") and obj["identifier"][0])
|
||||
else obj.get("recognized_license_plate", [None])[0]
|
||||
if (
|
||||
obj.get("recognized_license_plate")
|
||||
and obj["recognized_license_plate"][0]
|
||||
)
|
||||
else obj["label"]
|
||||
)
|
||||
draw_box_with_label(
|
||||
|
@ -14,7 +14,7 @@ class EventMetadataTypeEnum(str, Enum):
|
||||
manual_event_end = "manual_event_end"
|
||||
regenerate_description = "regenerate_description"
|
||||
sub_label = "sub_label"
|
||||
identifier = "identifier"
|
||||
recognized_license_plate = "recognized_license_plate"
|
||||
|
||||
|
||||
class EventMetadataPublisher(Publisher):
|
||||
|
@ -1064,7 +1064,8 @@ class LicensePlateProcessingMixin:
|
||||
)
|
||||
|
||||
self.sub_label_publisher.publish(
|
||||
EventMetadataTypeEnum.identifier, (id, top_plate, avg_confidence)
|
||||
EventMetadataTypeEnum.recognized_license_plate,
|
||||
(id, top_plate, avg_confidence),
|
||||
)
|
||||
|
||||
self.detected_license_plates[id] = {
|
||||
|
@ -27,7 +27,8 @@ def should_update_db(prev_event: Event, current_event: Event) -> bool:
|
||||
or prev_event["average_estimated_speed"]
|
||||
!= current_event["average_estimated_speed"]
|
||||
or prev_event["velocity_angle"] != current_event["velocity_angle"]
|
||||
or prev_event["identifier"] != current_event["identifier"]
|
||||
or prev_event["recognized_license_plate"]
|
||||
!= current_event["recognized_license_plate"]
|
||||
or prev_event["path_data"] != current_event["path_data"]
|
||||
):
|
||||
return True
|
||||
@ -227,10 +228,14 @@ class EventProcessor(threading.Thread):
|
||||
event[Event.sub_label] = event_data["sub_label"][0]
|
||||
event[Event.data]["sub_label_score"] = event_data["sub_label"][1]
|
||||
|
||||
# only overwrite the identifier in the database if it's set
|
||||
if event_data.get("identifier") is not None:
|
||||
event[Event.data]["identifier"] = event_data["identifier"][0]
|
||||
event[Event.data]["identifier_score"] = event_data["identifier"][1]
|
||||
# only overwrite the recognized_license_plate in the database if it's set
|
||||
if event_data.get("recognized_license_plate") is not None:
|
||||
event[Event.data]["recognized_license_plate"] = event_data[
|
||||
"recognized_license_plate"
|
||||
][0]
|
||||
event[Event.data]["recognized_license_plate_score"] = event_data[
|
||||
"recognized_license_plate"
|
||||
][1]
|
||||
|
||||
(
|
||||
Event.insert(event)
|
||||
|
@ -346,10 +346,10 @@ class TrackedObjectProcessor(threading.Thread):
|
||||
|
||||
return True
|
||||
|
||||
def set_identifier(
|
||||
self, event_id: str, identifier: str | None, score: float | None
|
||||
def set_recognized_license_plate(
|
||||
self, event_id: str, recognized_license_plate: str | None, score: float | None
|
||||
) -> None:
|
||||
"""Update identifier for given event id."""
|
||||
"""Update recognized license plate for given event id."""
|
||||
tracked_obj: TrackedObject = None
|
||||
|
||||
for state in self.camera_states.values():
|
||||
@ -367,15 +367,18 @@ class TrackedObjectProcessor(threading.Thread):
|
||||
return
|
||||
|
||||
if tracked_obj:
|
||||
tracked_obj.obj_data["identifier"] = (identifier, score)
|
||||
tracked_obj.obj_data["recognized_license_plate"] = (
|
||||
recognized_license_plate,
|
||||
score,
|
||||
)
|
||||
|
||||
if event:
|
||||
data = event.data
|
||||
data["identifier"] = identifier
|
||||
if identifier is None:
|
||||
data["identifier_score"] = None
|
||||
data["recognized_license_plate"] = recognized_license_plate
|
||||
if recognized_license_plate is None:
|
||||
data["recognized_license_plate_score"] = None
|
||||
elif score is not None:
|
||||
data["identifier_score"] = score
|
||||
data["recognized_license_plate_score"] = score
|
||||
event.data = data
|
||||
event.save()
|
||||
|
||||
@ -542,9 +545,11 @@ class TrackedObjectProcessor(threading.Thread):
|
||||
if topic.endswith(EventMetadataTypeEnum.sub_label.value):
|
||||
(event_id, sub_label, score) = payload
|
||||
self.set_sub_label(event_id, sub_label, score)
|
||||
if topic.endswith(EventMetadataTypeEnum.identifier.value):
|
||||
(event_id, identifier, score) = payload
|
||||
self.set_identifier(event_id, identifier, score)
|
||||
if topic.endswith(EventMetadataTypeEnum.recognized_license_plate.value):
|
||||
(event_id, recognized_license_plate, score) = payload
|
||||
self.set_recognized_license_plate(
|
||||
event_id, recognized_license_plate, score
|
||||
)
|
||||
elif topic.endswith(EventMetadataTypeEnum.manual_event_create.value):
|
||||
self.create_manual_event(payload)
|
||||
elif topic.endswith(EventMetadataTypeEnum.manual_event_end.value):
|
||||
|
@ -153,8 +153,12 @@ class TrackedObject:
|
||||
"current_estimated_speed": self.current_estimated_speed,
|
||||
"velocity_angle": self.velocity_angle,
|
||||
"path_data": self.path_data,
|
||||
"identifier": obj_data.get("identifier"),
|
||||
"identifier_score": obj_data.get("identifier_score"),
|
||||
"recognized_license_plate": obj_data.get(
|
||||
"recognized_license_plate"
|
||||
),
|
||||
"recognized_license_plate_score": obj_data.get(
|
||||
"recognized_license_plate_score"
|
||||
),
|
||||
}
|
||||
thumb_update = True
|
||||
|
||||
@ -367,7 +371,7 @@ class TrackedObject:
|
||||
"average_estimated_speed": self.average_estimated_speed,
|
||||
"velocity_angle": self.velocity_angle,
|
||||
"path_data": self.path_data,
|
||||
"identifier": self.obj_data.get("identifier"),
|
||||
"recognized_license_plate": self.obj_data.get("recognized_license_plate"),
|
||||
}
|
||||
|
||||
return event
|
||||
|
@ -333,13 +333,18 @@ function ObjectDetailsTab({
|
||||
}
|
||||
}, [search]);
|
||||
|
||||
const identifierScore = useMemo(() => {
|
||||
const recognizedLicensePlateScore = useMemo(() => {
|
||||
if (!search) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
if (search.data.identifier && search.data?.identifier_score) {
|
||||
return Math.round((search.data?.identifier_score ?? 0) * 100);
|
||||
if (
|
||||
search.data.recognized_license_plate &&
|
||||
search.data?.recognized_license_plate_score
|
||||
) {
|
||||
return Math.round(
|
||||
(search.data?.recognized_license_plate_score ?? 0) * 100,
|
||||
);
|
||||
} else {
|
||||
return undefined;
|
||||
}
|
||||
@ -550,13 +555,16 @@ function ObjectDetailsTab({
|
||||
</Tooltip>
|
||||
</div>
|
||||
</div>
|
||||
{search?.data.identifier && (
|
||||
{search?.data.recognized_license_plate && (
|
||||
<div className="flex flex-col gap-1.5">
|
||||
<div className="text-sm text-primary/40">Identifier</div>
|
||||
<div className="text-sm text-primary/40">
|
||||
Recognized License Plate
|
||||
</div>
|
||||
<div className="flex flex-col space-y-0.5 text-sm">
|
||||
<div className="flex flex-row items-center gap-2">
|
||||
{search.data.identifier}{" "}
|
||||
{identifierScore && ` (${identifierScore}%)`}
|
||||
{search.data.recognized_license_plate}{" "}
|
||||
{recognizedLicensePlateScore &&
|
||||
` (${recognizedLicensePlateScore}%)`}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -86,7 +86,7 @@ export default function SearchFilterDialog({
|
||||
(currentFilter.max_speed ?? 150) < 150 ||
|
||||
(currentFilter.zones?.length ?? 0) > 0 ||
|
||||
(currentFilter.sub_labels?.length ?? 0) > 0 ||
|
||||
(currentFilter.identifier?.length ?? 0) > 0),
|
||||
(currentFilter.recognized_license_plate?.length ?? 0) > 0),
|
||||
[currentFilter],
|
||||
);
|
||||
|
||||
@ -128,10 +128,13 @@ export default function SearchFilterDialog({
|
||||
setCurrentFilter({ ...currentFilter, sub_labels: newSubLabels })
|
||||
}
|
||||
/>
|
||||
<IdentifierFilterContent
|
||||
identifiers={currentFilter.identifier}
|
||||
setIdentifiers={(identifiers) =>
|
||||
setCurrentFilter({ ...currentFilter, identifier: identifiers })
|
||||
<RecognizedLicensePlatesFilterContent
|
||||
recognizedLicensePlates={currentFilter.recognized_license_plate}
|
||||
setRecognizedLicensePlates={(plate) =>
|
||||
setCurrentFilter({
|
||||
...currentFilter,
|
||||
recognized_license_plate: plate,
|
||||
})
|
||||
}
|
||||
/>
|
||||
<ScoreFilterContent
|
||||
@ -207,7 +210,7 @@ export default function SearchFilterDialog({
|
||||
max_speed: undefined,
|
||||
has_snapshot: undefined,
|
||||
has_clip: undefined,
|
||||
identifier: undefined,
|
||||
recognized_license_plate: undefined,
|
||||
}));
|
||||
}}
|
||||
>
|
||||
@ -847,97 +850,109 @@ export function SnapshotClipFilterContent({
|
||||
);
|
||||
}
|
||||
|
||||
type IdentifierFilterContentProps = {
|
||||
identifiers: string[] | undefined;
|
||||
setIdentifiers: (identifiers: string[] | undefined) => void;
|
||||
type RecognizedLicensePlatesFilterContentProps = {
|
||||
recognizedLicensePlates: string[] | undefined;
|
||||
setRecognizedLicensePlates: (
|
||||
recognizedLicensePlates: string[] | undefined,
|
||||
) => void;
|
||||
};
|
||||
|
||||
export function IdentifierFilterContent({
|
||||
identifiers,
|
||||
setIdentifiers,
|
||||
}: IdentifierFilterContentProps) {
|
||||
const { data: allIdentifiers, error } = useSWR<string[]>("identifiers", {
|
||||
revalidateOnFocus: false,
|
||||
});
|
||||
|
||||
const [selectedIdentifiers, setSelectedIdentifiers] = useState<string[]>(
|
||||
identifiers || [],
|
||||
export function RecognizedLicensePlatesFilterContent({
|
||||
recognizedLicensePlates,
|
||||
setRecognizedLicensePlates,
|
||||
}: RecognizedLicensePlatesFilterContentProps) {
|
||||
const { data: allRecognizedLicensePlates, error } = useSWR<string[]>(
|
||||
"recognized_license_plates",
|
||||
{
|
||||
revalidateOnFocus: false,
|
||||
},
|
||||
);
|
||||
|
||||
const [selectedRecognizedLicensePlates, setSelectedRecognizedLicensePlates] =
|
||||
useState<string[]>(recognizedLicensePlates || []);
|
||||
const [inputValue, setInputValue] = useState("");
|
||||
|
||||
useEffect(() => {
|
||||
if (identifiers) {
|
||||
setSelectedIdentifiers(identifiers);
|
||||
if (recognizedLicensePlates) {
|
||||
setSelectedRecognizedLicensePlates(recognizedLicensePlates);
|
||||
} else {
|
||||
setSelectedIdentifiers([]);
|
||||
setSelectedRecognizedLicensePlates([]);
|
||||
}
|
||||
}, [identifiers]);
|
||||
}, [recognizedLicensePlates]);
|
||||
|
||||
const handleSelect = (identifier: string) => {
|
||||
const newSelected = selectedIdentifiers.includes(identifier)
|
||||
? selectedIdentifiers.filter((id) => id !== identifier) // Deselect
|
||||
: [...selectedIdentifiers, identifier]; // Select
|
||||
const handleSelect = (recognizedLicensePlate: string) => {
|
||||
const newSelected = selectedRecognizedLicensePlates.includes(
|
||||
recognizedLicensePlate,
|
||||
)
|
||||
? selectedRecognizedLicensePlates.filter(
|
||||
(id) => id !== recognizedLicensePlate,
|
||||
) // Deselect
|
||||
: [...selectedRecognizedLicensePlates, recognizedLicensePlate]; // Select
|
||||
|
||||
setSelectedIdentifiers(newSelected);
|
||||
setSelectedRecognizedLicensePlates(newSelected);
|
||||
if (newSelected.length === 0) {
|
||||
setIdentifiers(undefined); // Clear filter if no identifiers selected
|
||||
setRecognizedLicensePlates(undefined); // Clear filter if no plates selected
|
||||
} else {
|
||||
setIdentifiers(newSelected);
|
||||
setRecognizedLicensePlates(newSelected);
|
||||
}
|
||||
};
|
||||
|
||||
if (!allIdentifiers || allIdentifiers.length === 0) {
|
||||
if (!allRecognizedLicensePlates || allRecognizedLicensePlates.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const filteredIdentifiers =
|
||||
allIdentifiers?.filter((id) =>
|
||||
const filteredRecognizedLicensePlates =
|
||||
allRecognizedLicensePlates?.filter((id) =>
|
||||
id.toLowerCase().includes(inputValue.toLowerCase()),
|
||||
) || [];
|
||||
|
||||
return (
|
||||
<div className="overflow-x-hidden">
|
||||
<DropdownMenuSeparator className="mb-3" />
|
||||
<div className="mb-3 text-lg">Identifiers</div>
|
||||
<div className="mb-3 text-lg">Recognized License Plates</div>
|
||||
{error ? (
|
||||
<p className="text-sm text-red-500">Failed to load identifiers</p>
|
||||
) : !allIdentifiers ? (
|
||||
<p className="text-sm text-muted-foreground">Loading identifiers...</p>
|
||||
<p className="text-sm text-red-500">
|
||||
Failed to load recognized license plates.
|
||||
</p>
|
||||
) : !allRecognizedLicensePlates ? (
|
||||
<p className="text-sm text-muted-foreground">
|
||||
Loading recognized license plates...
|
||||
</p>
|
||||
) : (
|
||||
<>
|
||||
<Command className="border border-input bg-background">
|
||||
<CommandInput
|
||||
placeholder="Type to search identifiers..."
|
||||
placeholder="Type to search license plates..."
|
||||
value={inputValue}
|
||||
onValueChange={setInputValue}
|
||||
/>
|
||||
<CommandList className="max-h-[200px] overflow-auto">
|
||||
{filteredIdentifiers.length === 0 && inputValue && (
|
||||
<CommandEmpty>No identifiers found.</CommandEmpty>
|
||||
{filteredRecognizedLicensePlates.length === 0 && inputValue && (
|
||||
<CommandEmpty>No license plates found.</CommandEmpty>
|
||||
)}
|
||||
{filteredIdentifiers.map((identifier) => (
|
||||
{filteredRecognizedLicensePlates.map((plate) => (
|
||||
<CommandItem
|
||||
key={identifier}
|
||||
value={identifier}
|
||||
onSelect={() => handleSelect(identifier)}
|
||||
key={plate}
|
||||
value={plate}
|
||||
onSelect={() => handleSelect(plate)}
|
||||
className="cursor-pointer"
|
||||
>
|
||||
<LuCheck
|
||||
className={cn(
|
||||
"mr-2 h-4 w-4",
|
||||
selectedIdentifiers.includes(identifier)
|
||||
selectedRecognizedLicensePlates.includes(plate)
|
||||
? "opacity-100"
|
||||
: "opacity-0",
|
||||
)}
|
||||
/>
|
||||
{identifier}
|
||||
{plate}
|
||||
</CommandItem>
|
||||
))}
|
||||
</CommandList>
|
||||
</Command>
|
||||
{selectedIdentifiers.length > 0 && (
|
||||
{selectedRecognizedLicensePlates.length > 0 && (
|
||||
<div className="mt-2 flex flex-wrap gap-2">
|
||||
{selectedIdentifiers.map((id) => (
|
||||
{selectedRecognizedLicensePlates.map((id) => (
|
||||
<span
|
||||
key={id}
|
||||
className="inline-flex items-center rounded bg-selected px-2 py-1 text-sm text-white"
|
||||
@ -956,7 +971,7 @@ export function IdentifierFilterContent({
|
||||
</>
|
||||
)}
|
||||
<p className="mt-1 text-sm text-muted-foreground">
|
||||
Select one or more identifiers from the list.
|
||||
Select one or more plates from the list.
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
|
@ -105,7 +105,8 @@ export default function Explore() {
|
||||
cameras: searchSearchParams["cameras"],
|
||||
labels: searchSearchParams["labels"],
|
||||
sub_labels: searchSearchParams["sub_labels"],
|
||||
identifier: searchSearchParams["identifier"],
|
||||
recognized_license_plate:
|
||||
searchSearchParams["recognized_license_plate"],
|
||||
zones: searchSearchParams["zones"],
|
||||
before: searchSearchParams["before"],
|
||||
after: searchSearchParams["after"],
|
||||
@ -141,7 +142,8 @@ export default function Explore() {
|
||||
cameras: searchSearchParams["cameras"],
|
||||
labels: searchSearchParams["labels"],
|
||||
sub_labels: searchSearchParams["sub_labels"],
|
||||
identifier: searchSearchParams["identifier"],
|
||||
recognized_license_plate:
|
||||
searchSearchParams["recognized_license_plate"],
|
||||
zones: searchSearchParams["zones"],
|
||||
before: searchSearchParams["before"],
|
||||
after: searchSearchParams["after"],
|
||||
|
@ -58,8 +58,8 @@ export type SearchResult = {
|
||||
average_estimated_speed: number;
|
||||
velocity_angle: number;
|
||||
path_data: [number[], number][];
|
||||
identifier?: string;
|
||||
identifier_score?: number;
|
||||
recognized_license_plate?: string;
|
||||
recognized_license_plate_score?: number;
|
||||
};
|
||||
};
|
||||
|
||||
@ -68,7 +68,7 @@ export type SearchFilter = {
|
||||
cameras?: string[];
|
||||
labels?: string[];
|
||||
sub_labels?: string[];
|
||||
identifier?: string[];
|
||||
recognized_license_plate?: string[];
|
||||
zones?: string[];
|
||||
before?: number;
|
||||
after?: number;
|
||||
@ -92,7 +92,7 @@ export type SearchQueryParams = {
|
||||
cameras?: string[];
|
||||
labels?: string[];
|
||||
sub_labels?: string[];
|
||||
identifier?: string[];
|
||||
recognized_license_plate?: string[];
|
||||
zones?: string[];
|
||||
before?: string;
|
||||
after?: string;
|
||||
|
@ -121,7 +121,9 @@ export default function SearchView({
|
||||
}, [config, searchFilter]);
|
||||
|
||||
const { data: allSubLabels } = useSWR("sub_labels");
|
||||
const { data: allIdentifiers } = useSWR("identifiers");
|
||||
const { data: allRecognizedLicensePlates } = useSWR(
|
||||
"recognized_license_plates",
|
||||
);
|
||||
|
||||
const allZones = useMemo<string[]>(() => {
|
||||
if (!config) {
|
||||
@ -161,13 +163,20 @@ export default function SearchView({
|
||||
max_score: ["100"],
|
||||
min_speed: ["1"],
|
||||
max_speed: ["150"],
|
||||
identifier: allIdentifiers,
|
||||
recognized_license_plate: allRecognizedLicensePlates,
|
||||
has_clip: ["yes", "no"],
|
||||
has_snapshot: ["yes", "no"],
|
||||
...(config?.plus?.enabled &&
|
||||
searchFilter?.has_snapshot && { is_submitted: ["yes", "no"] }),
|
||||
}),
|
||||
[config, allLabels, allZones, allSubLabels, allIdentifiers, searchFilter],
|
||||
[
|
||||
config,
|
||||
allLabels,
|
||||
allZones,
|
||||
allSubLabels,
|
||||
allRecognizedLicensePlates,
|
||||
searchFilter,
|
||||
],
|
||||
);
|
||||
|
||||
// remove duplicate event ids
|
||||
|
Loading…
Reference in New Issue
Block a user