send list (#176)

* send list

* adapt test

* clip value

* fix type

pyroengine/engine.py

@@ -256,7 +256,7 @@ def _update_states(self, frame: Image.Image, preds: np.ndarray, cam_key: str) ->
             output_predictions = output_predictions[:5, :]  # max 5 bbox
 
         self._states[cam_key]["last_predictions"].append(
-            (frame, preds, json.dumps(output_predictions.tolist()), datetime.utcnow().isoformat(), False)
+            (frame, preds, output_predictions.tolist(), datetime.utcnow().isoformat(), False)
         )
 
         # update state
@@ -354,7 +354,7 @@ def _upload_frame(self, cam_id: str, media_data: bytes) -> Response:
 
         return response
 
-    def _stage_alert(self, frame: Image.Image, cam_id: str, ts: int, localization: str) -> None:
+    def _stage_alert(self, frame: Image.Image, cam_id: str, ts: int, localization: list) -> None:
         # Store information in the queue
         self._alerts.append(
             {
@@ -381,7 +381,7 @@ def _process_alerts(self) -> None:
                 # Media creation
                 if not isinstance(self._alerts[0]["media_id"], int):
                     self._alerts[0]["media_id"] = self.api_client[cam_id].create_media_from_device().json()["id"]
-
+                print(self._alerts[0])
                 # Alert creation
                 if not isinstance(self._alerts[0]["alert_id"], int):
                     self._alerts[0]["alert_id"] = (

pyroengine/vision.py

@@ -96,4 +96,4 @@ def __call__(self, pil_img: Image.Image, occlusion_mask: Optional[np.ndarray] =
 
             y = y[keep]
 
-        return y
+        return np.clip(y, 0, 1)

tests/test_engine.py

@@ -53,7 +53,7 @@ def test_engine_offline(tmpdir_factory, mock_wildfire_image, mock_forest_image):
     assert isinstance(engine._states["-1"]["last_predictions"][0][0], Image.Image)
     assert engine._states["-1"]["last_predictions"][0][1].shape[0] == 0
     assert engine._states["-1"]["last_predictions"][0][1].shape[1] == 5
-    assert engine._states["-1"]["last_predictions"][0][2] == "[]"
+    assert engine._states["-1"]["last_predictions"][0][2] == []
     assert engine._states["-1"]["last_predictions"][0][3] < datetime.utcnow().isoformat()
     assert engine._states["-1"]["last_predictions"][0][4] is False
 
@@ -64,7 +64,7 @@ def test_engine_offline(tmpdir_factory, mock_wildfire_image, mock_forest_image):
     assert isinstance(engine._states["-1"]["last_predictions"][0][0], Image.Image)
     assert engine._states["-1"]["last_predictions"][1][1].shape[0] > 0
     assert engine._states["-1"]["last_predictions"][1][1].shape[1] == 5
-    assert engine._states["-1"]["last_predictions"][1][2] == "[]"
+    assert engine._states["-1"]["last_predictions"][1][2] == []
     assert engine._states["-1"]["last_predictions"][1][3] < datetime.utcnow().isoformat()
     assert engine._states["-1"]["last_predictions"][1][4] is False
 
@@ -75,7 +75,7 @@ def test_engine_offline(tmpdir_factory, mock_wildfire_image, mock_forest_image):
     assert isinstance(engine._states["-1"]["last_predictions"][0][0], Image.Image)
     assert engine._states["-1"]["last_predictions"][2][1].shape[0] > 0
     assert engine._states["-1"]["last_predictions"][2][1].shape[1] == 5
-    assert len(engine._states["-1"]["last_predictions"][-1][2].split(" ")) == 5
+    assert len(engine._states["-1"]["last_predictions"][-1][2][0]) == 5
     assert engine._states["-1"]["last_predictions"][2][3] < datetime.utcnow().isoformat()
     assert engine._states["-1"]["last_predictions"][2][4] is False