Skip to content

Commit

Permalink
Fix audio events in explore section (#15286)
Browse files Browse the repository at this point in the history
* Fix audio events in explore section

Make sure that audio events are listed in the explore section

* Update audio.py

* Hide other submit options

Only allow submits for objects only
  • Loading branch information
tpjanssen authored Dec 1, 2024
1 parent 71e8f75 commit 5802a66
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/static/frigate-api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3225,7 +3225,7 @@ components:
title: Sub Label
score:
anyOf:
- type: integer
- type: number
- type: 'null'
title: Score
default: 0
Expand Down Expand Up @@ -3264,7 +3264,7 @@ components:
properties:
end_time:
anyOf:
- type: integer
- type: number
- type: 'null'
title: End Time
type: object
Expand Down
4 changes: 2 additions & 2 deletions frigate/api/defs/events_body.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ class EventsDescriptionBody(BaseModel):
class EventsCreateBody(BaseModel):
source_type: Optional[str] = "api"
sub_label: Optional[str] = None
score: Optional[int] = 0
score: Optional[float] = 0
duration: Optional[int] = 30
include_recording: Optional[bool] = True
draw: Optional[dict] = {}


class EventsEndBody(BaseModel):
end_time: Optional[int] = None
end_time: Optional[float] = None


class SubmitPlusBody(BaseModel):
Expand Down
4 changes: 4 additions & 0 deletions frigate/events/audio.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,10 @@ def handle_detection(self, label: str, score: float) -> None:
"label": label,
"last_detection": datetime.datetime.now().timestamp(),
}
else:
self.logger.warning(
f"Failed to create audio event with status code {resp.status_code}"
)

def expire_detections(self) -> None:
now = datetime.datetime.now().timestamp()
Expand Down
1 change: 1 addition & 0 deletions frigate/events/external.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ def finish_manual_event(self, event_id: str, end_time: float) -> None:
EventTypeEnum.api,
EventStateEnum.end,
None,
"",
{"id": event_id, "end_time": end_time},
)
)
Expand Down
2 changes: 2 additions & 0 deletions web/src/components/menu/SearchResultActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ export default function SearchResultActions({
config?.plus?.enabled &&
searchResult.has_snapshot &&
searchResult.end_time &&
searchResult.data.type == "object" &&
!searchResult.plus_id && (
<MenuItem aria-label="Submit to Frigate Plus" onClick={showSnapshot}>
<FrigatePlusIcon className="mr-2 size-4 cursor-pointer text-primary" />
Expand Down Expand Up @@ -197,6 +198,7 @@ export default function SearchResultActions({
config?.plus?.enabled &&
searchResult.has_snapshot &&
searchResult.end_time &&
searchResult.data.type == "object" &&
!searchResult.plus_id && (
<Tooltip>
<TooltipTrigger>
Expand Down
1 change: 1 addition & 0 deletions web/src/components/overlay/detail/ReviewDetailDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ function EventItem({

{event.has_snapshot &&
event.plus_id == undefined &&
event.data.type == "object" &&
config?.plus.enabled && (
<Tooltip>
<TooltipTrigger>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/overlay/detail/SearchDetailDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ export function ObjectSnapshotTab({
</div>
)}
</TransformComponent>
{search.plus_id !== "not_enabled" && search.end_time && (
{search.data.type == "object" && search.plus_id !== "not_enabled" && search.end_time && (
<Card className="p-1 text-sm md:p-2">
<CardContent className="flex flex-col items-center justify-between gap-3 p-2 md:flex-row">
<div className={cn("flex flex-col space-y-3")}>
Expand Down

0 comments on commit 5802a66

Please sign in to comment.