administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-05 10:45:21 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactor DeepstackDetectorConfig and DeepStack classes to use httpx for making API requests

Browse Source
This commit is contained in:
Sergey Krashevich 2023-07-06 18:41:34 +03:00
parent baf671b764
commit c7d2fbeeb1
No known key found for this signature in database
GPG Key ID: 625171324E7D3856
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frigate/detectors/plugins/deepstack.py
View File

@ -1,8 +1,8 @@
import io
import logging
import httpx
import numpy as np
import requests
from PIL import Image
from pydantic import Field
from typing_extensions import Literal
@ -20,7 +20,7 @@ class DeepstackDetectorConfig(BaseDetectorConfig):
api_url: str = Field(
default="http://localhost:80/v1/vision/detection", title="DeepStack API URL"
)
api_timeout: float = Field(default=0.1, title="DeepStack API timeout (in seconds)")
api_timeout: float = Field(default=1.0, title="DeepStack API timeout (in seconds)")
api_key: str = Field(default="", title="DeepStack API key (if required)")
@ -44,18 +44,23 @@ class DeepStack(DetectionApi):
def detect_raw(self, tensor_input):
image_data = np.squeeze(tensor_input).astype(np.uint8)
image = Image.fromarray(image_data)
self.w, self.h = image.size
w, h = image.size
with io.BytesIO() as output:
image.save(output, format="JPEG")
image_bytes = output.getvalue()
data = {"api_key": self.api_key}
response = requests.post(
try:
response = httpx.post(
self.api_url,
data=data,
files={"image": image_bytes},
timeout=self.api_timeout,
)
response_json = response.json()
except httpx.RequestError as e:
logger.error(f"An error occurred while making the request: {e}")
return np.zeros((20, 6), np.float32)
detections = np.zeros((20, 6), np.float32)
if response_json.get("predictions") is None:
logger.debug(f"Error in parsing response json: {response_json}")
@ -73,10 +78,10 @@ class DeepStack(DetectionApi):
detections[i] = [
label,
float(detection["confidence"]),
detection["y_min"] / self.h,
detection["x_min"] / self.w,
detection["y_max"] / self.h,
detection["x_max"] / self.w,
detection["y_min"] / h,
detection["x_min"] / w,
detection["y_max"] / h,
detection["x_max"] / w,
]
return detections

1
requirements-wheels.txt
View File

@ -2,6 +2,7 @@ click == 8.1.*
Flask == 2.3.*
faster-fifo == 1.4.*
imutils == 0.5.*
httpx == 0.24.*
matplotlib == 3.7.*
mypy == 1.4.1
numpy == 1.23.*