From 7854e1c2c16ab26544232de85b6e240bee78db5e Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Tue, 24 Sep 2024 11:22:11 -0600
Subject: [PATCH] Fix plus api (#13937)

* Fix plus api

* Fix regenerate api
---
 frigate/api/defs/events_body.py | 4 ++++
 frigate/api/event.py            | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/frigate/api/defs/events_body.py b/frigate/api/defs/events_body.py
index ea5cd8c0d..bfcb2610b 100644
--- a/frigate/api/defs/events_body.py
+++ b/frigate/api/defs/events_body.py
@@ -28,3 +28,7 @@ class EventsCreateBody(BaseModel):
 
 class EventsEndBody(BaseModel):
     end_time: Optional[int] = datetime.now().timestamp()
+
+
+class SubmitPlusBody(BaseModel):
+    include_annotation: int = Field(default=1)
diff --git a/frigate/api/event.py b/frigate/api/event.py
index a60ddeb0a..f897741ee 100644
--- a/frigate/api/event.py
+++ b/frigate/api/event.py
@@ -22,6 +22,7 @@ from frigate.api.defs.events_body import (
     EventsDescriptionBody,
     EventsEndBody,
     EventsSubLabelBody,
+    SubmitPlusBody,
 )
 from frigate.api.defs.events_query_parameters import (
     DEFAULT_TIME_RANGE,
@@ -616,7 +617,7 @@ def set_retain(event_id: str):
 
 
 @router.post("/events/{event_id}/plus")
-def send_to_plus(request: Request, event_id: str):
+def send_to_plus(request: Request, event_id: str, body: SubmitPlusBody = None):
     if not request.app.frigate_config.plus_api.is_active():
         message = "PLUS_API_KEY environment variable is not set"
         logger.error(message)
@@ -630,9 +631,7 @@ def send_to_plus(request: Request, event_id: str):
             status_code=400,
         )
 
-    include_annotation = (
-        request.json.get("include_annotation") if request.is_json else None
-    )
+    include_annotation = body.include_annotation if body is not None else None
 
     try:
         event = Event.get(Event.id == event_id)
@@ -945,7 +944,7 @@ def set_description(
     )
 
 
-@router.put("/events/<id>/description/regenerate")
+@router.put("/events/{event_id}/description/regenerate")
 def regenerate_description(request: Request, event_id: str):
     try:
         event: Event = Event.get(Event.id == event_id)