mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-10-02 21:06:52 +03:00
Josh HawkinsandGitHub
06967fec91
* fix explore paging for non-date sorts Explore paged every sort by passing the last row's `start_time` as a `before` or `after` cursor, which only works when rows are ordered by `start_time`. For score, speed, and relevance sorts, each page dropped every match newer than that row and repeated older rows from earlier pages, so infinite scroll stopped after a few pages. `/events` and `/events/search` now accept `offset`, and Explore pages non-date sorts by offset. Date sorts keep the cursor because `useSWRInfinite` only revalidates the first page, and cursor keys for later pages follow it while offset keys don't. Score and speed sorts on `/events` break ties on `id` so offset pages stay stable. * order search ties by id and reject negative offsets `/events/search` sorted in Python over a query with no `ORDER BY`, so tied scores, speeds, or distances kept whatever order SQLite returned, which isn't guaranteed to match across page requests. The query is now ordered by id and the stable sorts keep that order for ties. `offset` also accepted negative values, which sliced from the end of the search results.
84 lines
2.6 KiB
Python
84 lines
2.6 KiB
Python
from pydantic import BaseModel, Field
|
|
|
|
DEFAULT_TIME_RANGE = "00:00,24:00"
|
|
|
|
|
|
class EventsQueryParams(BaseModel):
|
|
camera: str | None = "all"
|
|
cameras: str | None = "all"
|
|
label: str | None = "all"
|
|
labels: str | None = "all"
|
|
sub_label: str | None = "all"
|
|
sub_labels: str | None = "all"
|
|
attributes: str | None = "all"
|
|
zone: str | None = "all"
|
|
zones: str | None = "all"
|
|
limit: int | None = 100
|
|
offset: int | None = Field(0, ge=0)
|
|
after: float | None = None
|
|
before: float | None = None
|
|
time_range: str | None = DEFAULT_TIME_RANGE
|
|
has_clip: int | None = None
|
|
has_snapshot: int | None = None
|
|
in_progress: int | None = None
|
|
include_thumbnails: int | None = Field(
|
|
1,
|
|
description=(
|
|
"Deprecated. Thumbnail data is no longer included in the response. "
|
|
"Use the /api/events/:event_id/thumbnail.:extension endpoint instead."
|
|
),
|
|
deprecated=True,
|
|
)
|
|
favorites: int | None = None
|
|
min_score: float | None = None
|
|
max_score: float | None = None
|
|
min_speed: float | None = None
|
|
max_speed: float | None = None
|
|
recognized_license_plate: str | None = "all"
|
|
is_submitted: int | None = None
|
|
min_length: float | None = None
|
|
max_length: float | None = None
|
|
event_id: str | None = None
|
|
sort: str | None = None
|
|
timezone: str | None = "utc"
|
|
|
|
|
|
class EventsSearchQueryParams(BaseModel):
|
|
query: str | None = None
|
|
event_id: str | None = None
|
|
search_type: str | None = "thumbnail"
|
|
include_thumbnails: int | None = Field(
|
|
1,
|
|
description=(
|
|
"Deprecated. Thumbnail data is no longer included in the response. "
|
|
"Use the /api/events/:event_id/thumbnail.:extension endpoint instead."
|
|
),
|
|
deprecated=True,
|
|
)
|
|
limit: int | None = 50
|
|
offset: int | None = Field(0, ge=0)
|
|
cameras: str | None = "all"
|
|
labels: str | None = "all"
|
|
sub_labels: str | None = "all"
|
|
attributes: str | None = "all"
|
|
zones: str | None = "all"
|
|
after: float | None = None
|
|
before: float | None = None
|
|
time_range: str | None = DEFAULT_TIME_RANGE
|
|
has_clip: bool | None = None
|
|
has_snapshot: bool | None = None
|
|
is_submitted: bool | None = None
|
|
timezone: str | None = "utc"
|
|
min_score: float | None = None
|
|
max_score: float | None = None
|
|
min_speed: float | None = None
|
|
max_speed: float | None = None
|
|
recognized_license_plate: str | None = "all"
|
|
sort: str | None = None
|
|
|
|
|
|
class EventsSummaryQueryParams(BaseModel):
|
|
timezone: str | None = "utc"
|
|
has_clip: int | None = None
|
|
has_snapshot: int | None = None
|