Merge pull request #33 from robmarkcole/Support-min_confidence

test custom_model

Author: robmarkcole

deepstack/core.py

@@ -170,24 +170,15 @@ def __init__(
         port: int = DEFAULT_PORT,
         api_key: str = DEFAULT_API_KEY,
         timeout: int = DEFAULT_TIMEOUT,
-        custom_model: str = None,
+        custom_model: str = "",
     ):
-        if not custom_model:
-            super().__init__(
-                ip=ip,
-                port=port,
-                api_key=api_key,
-                timeout=timeout,
-                url_detect=URL_OBJECT_DETECTION,
-            )
+        if custom_model:
+            url_detect = URL_CUSTOM.format(custom_model=custom_model)
         else:
-            super().__init__(
-                ip=ip,
-                port=port,
-                api_key=api_key,
-                timeout=timeout,
-                url_detect=URL_CUSTOM.format(custom_model=custom_model),
-            )
+            url_detect = URL_OBJECT_DETECTION
+        super().__init__(
+            ip=ip, port=port, api_key=api_key, timeout=timeout, url_detect=url_detect,
+        )
 
     def detect(self, image_bytes: bytes):
         """Process image_bytes and detect."""

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-VERSION = "0.7"
+VERSION = "0.8"
 
 REQUIRES = ["requests"]
 

tests/test_core.py

@@ -5,9 +5,11 @@
 
 MOCK_IP_ADDRESS = "localhost"
 MOCK_PORT = 80
-OBJ_URL = "http://{}:{}/v1/vision/detection".format(MOCK_IP_ADDRESS, MOCK_PORT)
-SCENE_URL = "http://{}:{}/v1/vision/scene".format(MOCK_IP_ADDRESS, MOCK_PORT)
-FACE_DETECTION_URL = "http://{}:{}/v1/vision/face".format(MOCK_IP_ADDRESS, MOCK_PORT)
+MOCK_CUSTOM_MODEL = "mask"
+OBJ_URL = "http://localhost:80/v1/vision/detection"
+OBJ_CUSTOM_URL = "http://localhost:80/v1/vision/custom/mask"
+SCENE_URL = "http://localhost:80/v1/vision/scene"
+FACE_DETECTION_URL = "http://localhost:80/v1/vision/face"
 
 CONFIDENCE_THRESHOLD = 0.7
 
@@ -97,21 +99,22 @@ def test_DeepstackObject_detect():
         mock_req.post(
             OBJ_URL, status_code=ds.HTTP_OK, json=MOCK_OBJECT_DETECTION_RESPONSE
         )
-
         dsobject = ds.DeepstackObject(MOCK_IP_ADDRESS, MOCK_PORT)
         predictions = dsobject.detect(MOCK_BYTES)
         assert predictions == MOCK_OBJECT_PREDICTIONS
 
 
-def test_DeepstackObject_detect_timeout():
-    """Test a timeout. THIS SHOULD FAIL, CURRENTLY BROKEN TEST"""
-    with pytest.raises(ds.DeepstackException) as excinfo:
-        with requests_mock.Mocker() as mock_req:
-            mock_req.post(OBJ_URL, exc=requests.exceptions.ConnectTimeout)
-            dsobject = ds.DeepstackObject(MOCK_IP_ADDRESS, MOCK_PORT)
-            dsobject.detect(MOCK_BYTES)
-            assert False
-            assert "SHOULD FAIL" in str(excinfo.value)
+def test_DeepstackObject_detect_custom():
+    """Test a good response from server."""
+    with requests_mock.Mocker() as mock_req:
+        mock_req.post(
+            OBJ_CUSTOM_URL, status_code=ds.HTTP_OK, json=MOCK_OBJECT_DETECTION_RESPONSE
+        )
+        dsobject = ds.DeepstackObject(
+            MOCK_IP_ADDRESS, MOCK_PORT, custom_model=MOCK_CUSTOM_MODEL
+        )
+        predictions = dsobject.detect(MOCK_BYTES)
+        assert predictions == MOCK_OBJECT_PREDICTIONS
 
 
 def test_DeepstackScene():

usage-object-detection.ipynb

@@ -93,8 +93,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "CPU times: user 7.74 ms, sys: 3.7 ms, total: 11.4 ms\n",
-      "Wall time: 411 ms\n"
+      "CPU times: user 7.59 ms, sys: 4.3 ms, total: 11.9 ms\n",
+      "Wall time: 442 ms\n"
      ]
     }
    ],
@@ -316,8 +316,8 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "CPU times: user 3.92 ms, sys: 2.3 ms, total: 6.22 ms\n",
-      "Wall time: 228 ms\n"
+      "CPU times: user 4.19 ms, sys: 2.03 ms, total: 6.22 ms\n",
+      "Wall time: 273 ms\n"
      ]
     }
    ],