support min_confidence

Author: robmarkcole

deepstack/core.py

@@ -93,11 +93,10 @@ def get_objects_summary(predictions: List[Dict]):
 
 
 def post_image(
-    url: str, image_bytes: bytes, api_key: str, timeout: int, data: dict = {}
+    url: str, image_bytes: bytes, timeout: int, data: dict
 ) -> requests.models.Response:
     """Post an image to Deepstack. Only handles exceptions."""
     try:
-        data["api_key"] = api_key  # Insert the api_key
         return requests.post(
             url, files={"image": image_bytes}, data=data, timeout=timeout
         )
@@ -112,12 +111,17 @@ def post_image(
 
 
 def process_image(
-    url: str, image_bytes: bytes, api_key: str, timeout: int, data: dict = {}
+    url: str,
+    image_bytes: bytes,
+    api_key: str,
+    min_confidence: float,
+    timeout: int,
+    data: dict = {},
 ) -> Dict:
     """Process image_bytes and detect. Handles common status codes"""
-    response = post_image(
-        url=url, image_bytes=image_bytes, api_key=api_key, timeout=timeout, data=data
-    )
+    data["api_key"] = api_key
+    data["min_confidence"] = min_confidence
+    response = post_image(url=url, image_bytes=image_bytes, timeout=timeout, data=data)
     if response.status_code == HTTP_OK:
         return response.json()
     elif response.status_code == BAD_URL:
@@ -194,6 +198,7 @@ def detect(self, image_bytes: bytes):
             url=self._url_detect,
             image_bytes=image_bytes,
             api_key=self._api_key,
+            min_confidence=self._min_confidence,
             timeout=self._timeout,
         )
         return response["predictions"]
@@ -225,6 +230,7 @@ def recognize(self, image_bytes: bytes):
             url=self._url_recognize,
             image_bytes=image_bytes,
             api_key=self._api_key,
+            min_confidence=self._min_confidence,
             timeout=self._timeout,
         )
         del response["success"]
@@ -259,6 +265,7 @@ def detect(self, image_bytes: bytes):
             url=self._url_detect,
             image_bytes=image_bytes,
             api_key=self._api_key,
+            min_confidence=self._min_confidence,
             timeout=self._timeout,
         )
         return response["predictions"]
@@ -271,6 +278,7 @@ def register(self, name: str, image_bytes: bytes):
             url=self._url_register,
             image_bytes=image_bytes,
             api_key=self._api_key,
+            min_confidence=self._min_confidence,
             timeout=self._timeout,
             data={"userid": name},
         )
@@ -290,6 +298,7 @@ def recognize(self, image_bytes: bytes):
             url=self._url_recognize,
             image_bytes=image_bytes,
             api_key=self._api_key,
+            min_confidence=self._min_confidence,
             timeout=self._timeout,
         )
 

usage-object-detection.ipynb

@@ -29,7 +29,8 @@
     "IP = 'localhost'\n",
     "PORT = '80'\n",
     "API_KEY = \"\"\n",
-    "TIMEOUT = 20 # Default is 10"
+    "TIMEOUT = 20 # Default is 10\n",
+    "MIN_CONFIDENCE = 0.01 # Default is 0.45"
    ]
   },
   {
@@ -50,7 +51,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "dsobject = ds.DeepstackObject(ip=IP, port=PORT, api_key=API_KEY, timeout=TIMEOUT)"
+    "dsobject = ds.DeepstackObject(ip=IP, port=PORT, api_key=API_KEY, timeout=TIMEOUT, min_confidence=MIN_CONFIDENCE)"
    ]
   },
   {
@@ -93,8 +94,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "CPU times: user 7.59 ms, sys: 4.3 ms, total: 11.9 ms\n",
-      "Wall time: 442 ms\n"
+      "CPU times: user 7.68 ms, sys: 3.96 ms, total: 11.6 ms\n",
+      "Wall time: 431 ms\n"
      ]
     }
    ],
@@ -115,7 +116,19 @@
     {
      "data": {
       "text/plain": [
-       "[{'confidence': 0.90210795,\n",
+       "[{'confidence': 0.028640902,\n",
+       "  'label': 'handbag',\n",
+       "  'y_min': 114,\n",
+       "  'x_min': 444,\n",
+       "  'y_max': 522,\n",
+       "  'x_max': 605},\n",
+       " {'confidence': 0.037546907,\n",
+       "  'label': 'frisbee',\n",
+       "  'y_min': 309,\n",
+       "  'x_min': 419,\n",
+       "  'y_max': 333,\n",
+       "  'x_max': 437},\n",
+       " {'confidence': 0.90210795,\n",
        "  'label': 'dog',\n",
        "  'y_min': 348,\n",
        "  'x_min': 650,\n",
@@ -167,7 +180,7 @@
     {
      "data": {
       "text/plain": [
-       "['dog', 'person']"
+       "['dog', 'frisbee', 'handbag', 'person']"
       ]
      },
      "execution_count": 7,
@@ -194,7 +207,7 @@
     {
      "data": {
       "text/plain": [
-       "{'dog': 1, 'person': 2}"
+       "{'dog': 1, 'frisbee': 1, 'handbag': 1, 'person': 2}"
       ]
      },
      "execution_count": 8,
@@ -316,8 +329,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "CPU times: user 4.19 ms, sys: 2.03 ms, total: 6.22 ms\n",
-      "Wall time: 273 ms\n"
+      "CPU times: user 4.75 ms, sys: 2.3 ms, total: 7.05 ms\n",
+      "Wall time: 350 ms\n"
      ]
     }
    ],
@@ -355,27 +368,6 @@
     "predictions"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 16,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "{'a': 'a', 'b': 'b'}"
-      ]
-     },
-     "execution_count": 16,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "data = {'a':'a', 'b':'b'}\n",
-    "data"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,