Remove file handling

Author: robmarkcole

README.md

@@ -14,4 +14,4 @@ TODO: add face registration and recognition.
 * 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`
+* Black format with `venv/bin/black deepstack/core.py` and `venv/bin/black tests/test_deepstack.py`

deepstack/core.py

@@ -59,12 +59,14 @@ def get_objects_summary(predictions: List[Dict]):
     }
 
 
-def post_image(url: str, image: bytes, api_key: str, timeout: int, data: dict = {}):
+def post_image(
+    url: str, image_bytes: bytes, api_key: str, timeout: int, data: dict = {}
+):
     """Post an image to Deepstack."""
     try:
         data["api_key"] = api_key
         response = requests.post(
-            url, files={"image": image}, data=data, timeout=timeout
+            url, files={"image": image_bytes}, data=data, timeout=timeout
         )
         return response
     except requests.exceptions.Timeout:
@@ -96,13 +98,8 @@ def __init__(
         self._timeout = timeout
         self._predictions = []
 
-    def process_file(self, file_path: str):
-        """Process an image file."""
-        with open(file_path, "rb") as image_bytes:
-            self.process_image_bytes(image_bytes)
-
-    def process_image_bytes(self, image_bytes: bytes):
-        """Process an image, performing detection."""
+    def detect(self, image_bytes: bytes):
+        """Process image_bytes, performing detection."""
         self._predictions = []
         url = self._url_detection.format(self._ip_address, self._port)
 
@@ -150,19 +147,18 @@ def __init__(
             ip_address, port, api_key, timeout, url_detection=URL_FACE_DETECTION
         )
 
-    def register_face(self, name: str, file_path: str):
+    def register_face(self, name: str, image_bytes: bytes):
         """
         Register a face name to a file.
         """
 
-        with open(file_path, "rb") as image:
-            response = post_image(
-                url=URL_FACE_REGISTRATION.format(self._ip_address, self._port),
-                image=image,
-                api_key=self._api_key,
-                timeout=self._timeout,
-                data={"userid": name},
-            )
+        response = post_image(
+            url=URL_FACE_REGISTRATION.format(self._ip_address, self._port),
+            image_bytes=image_bytes,
+            api_key=self._api_key,
+            timeout=self._timeout,
+            data={"userid": name},
+        )
 
         if response.status_code == 200 and response.json()["success"] == True:
             print("Taught face {} using file {}".format(name, file_path))

tests/test_deepstack.py

@@ -48,23 +48,25 @@
 CONFIDENCE_THRESHOLD = 0.7
 
 
-def test_DeepstackObject_process_image_bytes():
+def test_DeepstackObject_detect():
     """Test a good response from server."""
     with requests_mock.Mocker() as mock_req:
-        mock_req.post(MOCK_URL, status_code=ds.HTTP_OK, json=MOCK_OBJECT_DETECTION_RESPONSE)
+        mock_req.post(
+            MOCK_URL, status_code=ds.HTTP_OK, json=MOCK_OBJECT_DETECTION_RESPONSE
+        )
 
         dsobject = ds.DeepstackObject(MOCK_IP_ADDRESS, MOCK_PORT)
-        dsobject.process_image_bytes(MOCK_BYTES)
+        dsobject.detect(MOCK_BYTES)
         assert dsobject.predictions == MOCK_OBJECT_PREDICTIONS
 
 
-def test_DeepstackObject_process_image_bytes_timeout():
+def test_DeepstackObject_detect_timeout():
     """Test a timeout. THIS SHOULD FAIL"""
     with pytest.raises(ds.DeepstackException) as excinfo:
         with requests_mock.Mocker() as mock_req:
             mock_req.post(MOCK_URL, exc=requests.exceptions.ConnectTimeout)
             dsobject = ds.DeepstackObject(MOCK_IP_ADDRESS, MOCK_PORT)
-            dsobject.process_image_bytes(MOCK_BYTES)
+            dsobject.detect(MOCK_BYTES)
             assert False
             assert "SHOULD FAIL" in str(excinfo.value)
 
@@ -90,6 +92,10 @@ def test_get_object_confidences():
 
 def test_get_confidences_above_threshold():
     assert (
-        len(ds.get_confidences_above_threshold(MOCK_OBJECT_CONFIDENCES, CONFIDENCE_THRESHOLD))
+        len(
+            ds.get_confidences_above_threshold(
+                MOCK_OBJECT_CONFIDENCES, CONFIDENCE_THRESHOLD
+            )
+        )
         == 1
     )