feat(idle_requests): change json matrix on byte array in requests

Author: eugenos-programos

idle_models/IdleObjectDetectionModel.py

@@ -24,11 +24,11 @@ def __preprocess_image__(self, img: np.array) -> np.array:
         return img
 
     @torch.no_grad()
-    def __call__(self, img: np.array) -> list:
+    def __call__(self, img: np.array) -> torch.Tensor:
         img = self.__preprocess_image__(img)
         pred = self.model(img, augment=False)[0]
         pred = non_max_suppression(
             pred, 0.45, 0.5, classes=[67], agnostic=False)[0]
         pred[:, :4] = scale_coords(
             img.shape[2:], pred[:, :4], self.img_shape).round()
-        return pred[:, :4], pred[:, 4]
+        return pred[:, :5]

idle_models/app.py

@@ -3,6 +3,7 @@
 from configs.load_configs import *
 from IdleObjectDetectionModel import IdleObjectDetectionModel
 import numpy as np
+import io
 
 
 app = Flask(__name__)
@@ -13,15 +14,15 @@
     CLASSES
 )
 
+convert_bytes2image = lambda bytes: np.array(Image.open(io.BytesIO(bytes)), dtype=np.uint8)
 
 @app.route('/predict', methods=['POST'])
 def predict():
     if request.method == 'POST':
-        image = np.array(request.json['image']).astype(np.float32)
-        coords, confs = model(image)
+        image = convert_bytes2image(request.files["image"].read())
+        coords = model(image)
         return jsonify(
             {
-                "coordinates": coords.tolist(),
-                "confidences": confs.tolist()
+                "coordinates": coords.tolist()
             }
         )

main.py

@@ -28,14 +28,15 @@ def run():
             time.sleep(1)
             continue
         time.sleep(1)
-        preds, scores = predict(img, server_url, logger)
+        preds = predict(img, server_url, logger)
         if preds is None:
+            logger.warning("Empty response")
             time.sleep(1)
             continue
-        img = put_rectangle(img, preds, scores)
-        if len(scores) > 0:
+        if len(preds) > 0:
             logger.info("Telephone is detected")
             if check_coordinates_diffs(prev_preds, preds):
+                img = put_rectangle(img, preds[:, :4], preds[:, 4])
                 send_report_and_save_photo(img, start_tracking)
             prev_preds = preds
 

send_request.py

@@ -1,31 +1,30 @@
 import requests
 import numpy as np
 from logging import Logger
+from PIL import Image
+import io
 
 
 PORT = 5001
 
 
+def convert_image2bytes(image: np.array, format='PNG', encoding='utf-8'):
+    pil_image = Image.fromarray(image)
+    img_byte_arr = io.BytesIO()
+    pil_image.save(img_byte_arr, format=format)
+    img_byte_arr.seek(0)
+    return img_byte_arr
+
+
 def predict(img: np.array, server_url: str, logger: Logger) -> list:
     try:
         response = requests.post(
             f"{server_url}:{PORT}/predict",
-            json={
-                "image": img.tolist()
+            files={
+                  "image": ("image", convert_image2bytes(img), "image/png")
             }
         )
+        response.raise_for_status()
+        return np.array(response.json().get("coordinates"))
     except Exception as exc:
-        logger.critical(
-            "Cannot send request. Error - {}".format(exc)
-        )
-        return [None, None]
-    if response.status_code == 200:
-        coordinates = np.array(response.json().get("coordinates"))
-        confidences = np.array(response.json().get("confidences"))
-    else:
-        logger.warning(
-            "Status code = {}\n response = {}".format(
-                response.status_code, response)
-        )
-        coordinates = confidences = None
-    return [coordinates, confidences]
+        logger.critical("Cannot send request. Error - {}".format(exc))