remove deepstack detector and all references to it (#24259)

the 0.18 release notes indicated this was being removed in 0.19

frigate/detectors/plugins/deepstack.py

@@ -1,105 +0,0 @@
-import io
-import logging
-from typing import Literal
-
-import numpy as np
-import requests
-from PIL import Image
-from pydantic import ConfigDict, Field
-
-from frigate.detectors.detection_api import DetectionApi
-from frigate.detectors.detector_config import BaseDetectorConfig
-
-logger = logging.getLogger(__name__)
-
-DETECTOR_KEY = "deepstack"
-
-
-class DeepstackDetectorConfig(BaseDetectorConfig):
-    """DeepStack/CodeProject.AI detector that sends images to a remote DeepStack HTTP API for inference. Not recommended."""
-
-    model_config = ConfigDict(
-        title="DeepStack",
-    )
-
-    type: Literal[DETECTOR_KEY]
-    api_url: str = Field(
-        default="http://localhost:80/v1/vision/detection",
-        title="DeepStack API URL",
-        description="The URL of the DeepStack API.",
-    )
-    api_timeout: float = Field(
-        default=0.1,
-        title="DeepStack API timeout (in seconds)",
-        description="Maximum time allowed for a DeepStack API request.",
-    )
-    api_key: str = Field(
-        default="",
-        title="DeepStack API key (if required)",
-        description="Optional API key for authenticated DeepStack services.",
-    )
-
-
-class DeepStack(DetectionApi):
-    type_key = DETECTOR_KEY
-
-    def __init__(self, detector_config: DeepstackDetectorConfig):
-        self.api_url = detector_config.api_url
-        self.api_timeout = detector_config.api_timeout
-        self.api_key = detector_config.api_key
-        self.labels = detector_config.model.merged_labelmap
-        self.session = requests.Session()
-
-    def get_label_index(self, label_value):
-        if label_value.lower() == "truck":
-            label_value = "car"
-        for index, value in self.labels.items():
-            if value == label_value.lower():
-                return index
-        return -1
-
-    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
-        with io.BytesIO() as output:
-            image.save(output, format="JPEG")
-            image_bytes = output.getvalue()
-        data = {"api_key": self.api_key}
-
-        try:
-            response = self.session.post(
-                self.api_url,
-                data=data,
-                files={"image": image_bytes},
-                timeout=self.api_timeout,
-            )
-        except requests.exceptions.RequestException as ex:
-            logger.error("Error calling deepstack API: %s", ex)
-            return np.zeros((20, 6), np.float32)
-
-        response_json = response.json()
-        detections = np.zeros((20, 6), np.float32)
-        if response_json.get("predictions") is None:
-            logger.debug(f"Error in parsing response json: {response_json}")
-            return detections
-
-        for i, detection in enumerate(response_json.get("predictions")):
-            logger.debug(f"Response: {detection}")
-            if detection["confidence"] < 0.4:
-                logger.debug("Break due to confidence < 0.4")
-                break
-            label = self.get_label_index(detection["label"])
-            if label < 0:
-                logger.debug("Break due to unknown label")
-                break
-            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,
-            ]
-
-        return detections

frigate/test/test_config_migration.py

@@ -128,10 +128,10 @@ class TestMigrateModels(unittest.TestCase):
             migrated = migrate_models(
                 {
                     "detectors": {
-                        "ds": {
-                            "type": "deepstack",
-                            "api_url": "http://host:5000/v1/vision/detection",
-                            "api_key": "secret",
+                        "remote": {
+                            "type": "zmq",
+                            "endpoint": "tcp://host:5555",
+                            "request_timeout_ms": 200,
                         }
                     }
                 }
@@ -139,9 +139,9 @@ class TestMigrateModels(unittest.TestCase):
 
         self.assertEqual(
             migrated["models"][0]["devices"],
-            ["deepstack:http://host:5000/v1/vision/detection"],
+            ["zmq:tcp://host:5555"],
         )
-        self.assertTrue(any("api_key" in message for message in logs.output))
+        self.assertTrue(any("request_timeout_ms" in message for message in logs.output))
 
     def test_mixed_detector_types_are_logged(self):
         with self.assertLogs("frigate.util.config", level=logging.ERROR) as logs:

frigate/util/config.py

@@ -31,7 +31,6 @@ DEFAULT_CONFIG_FILE = os.path.join(CONFIG_DIR, "config.yml")
 DETECTOR_DEVICE_FIELDS = {
     "cpu": "num_threads",
     "rknn": "num_cores",
-    "deepstack": "api_url",
     "degirum": "location",
     "zmq": "endpoint",
 }
@@ -40,7 +39,6 @@ DETECTOR_DEVICE_FIELDS = {
 # detectors that use them are being reworked, so they are dropped rather than
 # carried over.
 DROPPED_DETECTOR_OPTIONS = {
-    "deepstack": ["api_timeout", "api_key"],
     "degirum": ["zoo", "token"],
     "zmq": ["request_timeout_ms", "linger_ms"],
 }