Merge pull request #13 from robmarkcole/add-face

Add face api

Author: robmarkcole

README.md

@@ -3,9 +3,15 @@
 [![build status](http://img.shields.io/travis/robmarkcole/deepstack-python/master.svg?style=flat)](https://travis-ci.org/robmarkcole/deepstack-python)
 
 # deepstack-python
-Unofficial python API for DeepStack. Provides class for making requests to the object detection endpoint, and functions for processing the result. See the `usage.ipynb` notebook for usage.
+Unofficial python API for [DeepStack](https://python.deepstack.cc/). Provides class for making requests to the object detection endpoint, and functions for processing the result. See the Jupyter notebooks for usage.
+
+## Services
+Face and object detection endpoints return bounding boxes of faces and objects respectively. 
+
+TODO: add face registration and recognition.
 
 ## Development
-* Use `venv`
+* Use `venv` -> `source venv/bin/activate`
 * `pip install -r requirements-dev.txt`
 * Run tests with `venv/bin/pytest tests/*`
+* Black format with `venv/bin/black deepstack/core.py`

deepstack/core.py

@@ -9,6 +9,10 @@
 HTTP_OK = 200
 DEFAULT_TIMEOUT = 10  # seconds
 
+## API urls
+URL_OBJECT_DETECTION = "http://{}:{}/v1/vision/detection"
+URL_FACE_DETECTION = "http://{}:{}/v1/vision/face"
+
 
 def format_confidence(confidence: Union[str, float]) -> float:
     """Takes a confidence from the API like 
@@ -70,21 +74,21 @@ class DeepstackException(Exception):
     pass
 
 
-class DeepstackObject:
-    """The object detection API locates and classifies 80 
-    different kinds of objects in a single image.."""
+class Deepstack(object):
+    """Base class for deepstack."""
 
     def __init__(
         self,
         ip_address: str,
         port: str,
         api_key: str = "",
         timeout: int = DEFAULT_TIMEOUT,
+        url_detection: str = "",
     ):
 
-        self._url_object_detection = "http://{}:{}/v1/vision/detection".format(
-            ip_address, port
-        )
+        self._ip_address = ip_address
+        self._port = port
+        self._url_detection = url_detection
         self._api_key = api_key
         self._timeout = timeout
         self._predictions = []
@@ -97,10 +101,9 @@ def process_file(self, file_path: str):
     def process_image_bytes(self, image_bytes: bytes):
         """Process an image."""
         self._predictions = []
+        url = self._url_detection.format(self._ip_address, self._port)
 
-        response = post_image(
-            self._url_object_detection, image_bytes, self._api_key, self._timeout
-        )
+        response = post_image(url, image_bytes, self._api_key, self._timeout)
 
         if response.status_code == HTTP_OK:
             if response.json()["success"]:
@@ -113,3 +116,32 @@ def process_image_bytes(self, image_bytes: bytes):
     def predictions(self):
         """Return the classifier attributes."""
         return self._predictions
+
+
+class DeepstackObject(Deepstack):
+    """Work with objects"""
+
+    def __init__(
+        self,
+        ip_address: str,
+        port: str,
+        api_key: str = "",
+        timeout: int = DEFAULT_TIMEOUT,
+    ):
+        super().__init__(
+            ip_address, port, api_key, timeout, url_detection=URL_OBJECT_DETECTION
+        )
+
+class DeepstackFace(Deepstack):
+    """Work with objects"""
+
+    def __init__(
+        self,
+        ip_address: str,
+        port: str,
+        api_key: str = "",
+        timeout: int = DEFAULT_TIMEOUT,
+    ):
+        super().__init__(
+            ip_address, port, api_key, timeout, url_detection=URL_FACE_DETECTION
+        )

tests/images/couple.jpg

@@ -4,15 +4,11 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "This package provides convenience classes and functions for working with deepstack object detection API. \n",
-    "Pull the latest image for noavx:\n",
-    "```\n",
-    "docker pull deepquestai/deepstack:noavx\n",
-    "```\n",
+    "This package provides convenience classes and functions for working with deepstack object detection API.\n",
     "\n",
     "Run deepstack with:\n",
     "```\n",
-    "docker run -e VISION-DETECTION=True -e VISION-FACE=True -e MODE=High -d \\\n",
+    "docker run -e VISION-DETECTION=True -e MODE=High -d \\\n",
     "      -v localstorage:/datastore -p 5000:5000 \\\n",
     "      -e API-KEY=\"Mysecretkey\" \\\n",
     "       --name deepstack deepquestai/deepstack:noavx\n",
@@ -46,6 +42,13 @@
     "TIMEOUT = 8"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Object detection"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 3,
@@ -83,12 +86,12 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Process an image directly"
+    "Perform object detection"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
@@ -117,7 +120,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -143,7 +146,7 @@
        "  'x_max': 825}]"
       ]
      },
-     "execution_count": 6,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -153,20 +156,31 @@
    ]
   },
   {
-   "cell_type": "markdown",
+   "cell_type": "code",
+   "execution_count": 14,
    "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "3"
+      ]
+     },
+     "execution_count": 14,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
-    "## Helper functions\n",
-    "The package provides helper functions for extracting info out of deepstack predictions"
+    "len(dsobject.predictions)"
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": 7,
+   "cell_type": "markdown",
    "metadata": {},
-   "outputs": [],
    "source": [
-    "# help(ds)"
+    "## Helper functions\n",
+    "The package provides helper functions for extracting info out of deepstack predictions"
    ]
   },
   {
@@ -178,16 +192,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "['person', 'dog']"
+       "['dog', 'person']"
       ]
      },
-     "execution_count": 8,
+     "execution_count": 9,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -205,16 +219,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "{'person': 2, 'dog': 1}"
+       "{'dog': 1, 'person': 2}"
       ]
      },
-     "execution_count": 9,
+     "execution_count": 10,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -226,16 +240,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "['person', 'dog']"
+       "['dog', 'person']"
       ]
      },
-     "execution_count": 10,
+     "execution_count": 11,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -253,7 +267,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
@@ -262,7 +276,7 @@
        "[0.9998661, 0.9996547]"
       ]
      },
-     "execution_count": 11,
+     "execution_count": 12,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -281,12 +295,23 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 16,
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "1"
+      ]
+     },
+     "execution_count": 16,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "CONFIDENCE_THRESHOLD = 0.9997\n",
-    "print(len(ds.get_confidences_above_threshold(confidences, CONFIDENCE_THRESHOLD)))"
+    "len(ds.get_confidences_above_threshold(confidences, CONFIDENCE_THRESHOLD))"
    ]
   },
   {