Merge pull request #14 from 5sControl/dev

Dev

Author: eugenos-programos

IdleAlgorithm.py

@@ -4,6 +4,7 @@
 from confs import configs
 import utils
 import numpy as np
+import time
 
 
 class IdleAlgorithm:
@@ -18,21 +19,24 @@ def __init__(
         self._image_extractor = image_extractor
         self._model_predictor = model_predictor
         self._reporter = reporter
+        self._min_epoch_time = 2 # replace on config in future
 
-    async def run(self):
-        iter_idx = 0
+    async def start(self) -> None:
         while True:
-            iter_idx += 1
-            if iter_idx % 60 == 0:
-                self._logger.info("60 iterations passed")
+            start_epoch_time = time.time()
+            self._run_one_idle_epoch()
+            end_epoch_time = time.time()
+            passed_time = end_epoch_time - start_epoch_time
+            if passed_time < self._min_epoch_time:
+                await asyncio.sleep(self._min_epoch_time - passed_time)
+
+    def _run_one_idle_epoch(self) -> None:
             img, start_tracking = self._image_extractor.get_snapshot()
             if img is None:
-                asyncio.sleep(1)
-                continue
+                return
             preds = self._model_predictor.predict(img)
             if preds is None:
-                asyncio.sleep(1)
-                continue
+                return
             if preds.size != 0 and not np.any(preds == 1.):
                 self._logger.info("Telephone is detected")
                 if utils.bboxes_not_equal(prev_preds, preds, configs["threshold"]):
@@ -42,4 +46,3 @@ async def run(self):
                 else:
                     self._logger.debug("Equal bboxes")
                 prev_preds = preds
-            asyncio.sleep(2)

confs/settings.env

@@ -27,7 +27,8 @@ def get_snapshot(self) -> Tuple[Union[cv2.Mat, None], Union[datetime.time, None]
             img = cv2.imdecode(nparr, cv2.IMREAD_COLOR)
             return img, curr_time
         except Exception as exc:
-            self.logger.error(f"Cannot retrieve image. Following error raised - {exc}")
+            self.logger.warning(f"Cannot retrieve image. Following error raised - {exc}")
+            print(images.keys())
             return None, None
 
 @sio.event
@@ -36,9 +37,9 @@ async def connect():
 
 @sio.event
 async def snapshot_updated(data):
-    camera_url, screen = data.get("camera_ip"), data.get("screenshot")
+    camera_ip, screen = data.get("camera_ip"), data.get("screenshot")
     global images
-    images[camera_url] = screen
+    images[camera_ip] = screen
 
 async def run_sio(url):
     await sio.connect(url)

connection/ImageHTTPExtractor.py

@@ -1,5 +1,5 @@
 import utils
-import connection
+from connection import run_sio, IdleReporter, ImageHTTPExtractor, ModelPredictionsReceiver
 from confs import configs
 from dotenv import load_dotenv
 from IdleAlgorithm import IdleAlgorithm
@@ -20,13 +20,13 @@
 logger = utils.create_logger()
 
 prev_preds = np.array([[]]).astype(np.float32)
-reporter = connection.IdleReporter(folder, server_url, configs["wait_time"], logger)
-image_extractor = connection.ImageHTTPExtractor(camera_ip, logger, username=username, password=password)
-model_predictor = connection.ModelPredictionsReceiver(server_url, logger)
+reporter = IdleReporter(folder, server_url, configs["wait_time"], logger)
+image_extractor = ImageHTTPExtractor(camera_ip, logger, username=username, password=password)
+model_predictor = ModelPredictionsReceiver(server_url, logger)
 algo = IdleAlgorithm(logger, image_extractor, model_predictor, reporter)
 
 async def main():
-    await asyncio.gather(connection.run_sio(server_url + ':3456'), algo.run())
+    await asyncio.gather(run_sio(server_url + ':3456'), algo.start())
 
 loop = asyncio.get_event_loop()
 try:

main.py

@@ -9,3 +9,5 @@ python-dotenv==1.0.0
 PyYAML==6.0
 requests==2.27.1
 numba==0.57.1
+python-socketio==5.8.0
+aiohttp==3.8.1