fix: No image to upload problem (#5)

* feat: Add exiting message for key interrupt

* fix: Save image before changing state

* refactor: Clear the code

* fix: Increase the threshold for detection

* feat: Add logging for error return on API

* fix: Wait until a file is saved before upload

Author: electricalgorithm

core/observers/subject/eye_subject.py

@@ -27,8 +27,8 @@ class EyeSubject(BaseSubject):
     Concretes a subject for Eye/Camera features.
     """
     DEFAULT_IMAGE_LOCATIONS: str = "~/.home-security-system/images"
-    DEFAULT_SLEEP_INTERVAL = 30
-    SLEEP_INTERVAL_DETECTED = 5
+    DEFAULT_SLEEP_INTERVAL = 10
+    SLEEP_INTERVAL_DETECTED = 2
 
     def __init__(self, image_path: str = DEFAULT_IMAGE_LOCATIONS):
         super().__init__()
@@ -75,20 +75,27 @@ def _run_in_loop(self,
                 logger.debug("EyeStrategyResult: " + str(result.result))
 
                 if result.result:
-                    self.set_state(EyeStates.DETECTED)
+                    logger.debug("Changing state to DETECTED...")
                     self._save_image(result)
+                    self.set_state(EyeStates.DETECTED)
                     sleep_interval = EyeSubject.SLEEP_INTERVAL_DETECTED
+                else:
+                    logger.debug("Changing state to NOT_DETECTED...")
+                    self.set_state(EyeStates.NOT_DETECTED)
+                    sleep_interval = EyeSubject.DEFAULT_SLEEP_INTERVAL
 
             # If the WiFi subject does not give rights,
             # aka: "There is protectors around the house."
             else:
-                self.set_state(EyeStates.NOT_DETECTED)
+                logger.debug("Changing state to UNREACHABLE...")
+                self.set_state(EyeStates.UNREACHABLE)
                 sleep_interval = EyeSubject.DEFAULT_SLEEP_INTERVAL
 
             sleep(sleep_interval)
 
     def _save_image(self, result: EyeStrategyResult) -> None:
         """This method is called when the observer is updated."""
+        logger.debug("Saving image to the disk...")
         time_now = datetime.now().strftime("%d-%m-%Y_%H-%M-%S")
         file_location = f"{self._image_path}/intruder_{time_now}.jpg"
         cv2.imwrite(file_location, result.image)

core/observers/subject/wifi_subject.py

@@ -21,6 +21,7 @@ class WiFiSubject(BaseSubject):
     Concretes a subject for WiFiS features.
     """
     SINGLETON_LOCK: Optional[Lock] = None
+    CHECK_INTERVAL: int = 5
 
     @staticmethod
     def get_default_state() -> WiFiStates:
@@ -29,7 +30,7 @@ def get_default_state() -> WiFiStates:
 
     def run(self, wifi_strategy: BaseWiFiStrategy) -> None:
         """This method is called when the observer is updated."""
-        thread = Thread(target=self._run_in_loop, args=(self, wifi_strategy,))
+        thread = Thread(target=self._run_in_loop, args=(wifi_strategy,))
         thread.start()
         logger.debug("WiFiSubject is running...")
 
@@ -43,7 +44,6 @@ def get_protector_lock(cls) -> Lock:
             cls.SINGLETON_LOCK = Lock()
         return cls.SINGLETON_LOCK
 
-    @staticmethod
     def _run_in_loop(self, wifi_strategy: BaseWiFiStrategy) -> None:
         """This method is called when the observer is updated."""
         protector_lock: Lock = self.get_protector_lock()
@@ -60,4 +60,4 @@ def _run_in_loop(self, wifi_strategy: BaseWiFiStrategy) -> None:
                 self.set_state(WiFiStates.DISCONNECTED)
                 if protector_lock.locked():
                     protector_lock.release()
-            sleep(5)
+            sleep(self.CHECK_INTERVAL)

core/strategies/detectors/efficientdet_strategy.py

@@ -15,7 +15,7 @@ class EfficientdetStrategy(BaseDetectorStrategy):
     """
     MODEL_PATH: str = "models/efficientdet_1.tflite"
     LABEL_PATH: str = "models/efficientdet_1_labelmap.txt"
-    DETECTION_THRES: float = 0.35
+    DETECTION_THRES: float = 0.65
 
     @classmethod
     def detect_humans(cls, frame: numpy.ndarray) -> DetectorResult:

core/strategies/notifier/whatsapp_strategy.py

@@ -35,6 +35,7 @@ def _send_message(self, reciever: WhatsappReciever, message: str) -> bool:
         if response.status_code != 200 or "ERROR" in response.text:
             logger.error("Failed to send WhatsApp message to %s", reciever.telephone_number)
             logger.error("Status code: %s", response.status_code)
+            logger.error("ERROR in response: %s", "ERROR" in response.text)
             return False
 
         # Log the success.

core/utils/fileio_adaptor.py

@@ -4,6 +4,10 @@
 import os
 import glob
 import json
+from time import sleep
+from core.utils.logger import get_logger
+
+logger = get_logger(__name__)
 
 def read_latest_file(dir_path: str) -> str:
     """This method reads the latest file from the given directory."""
@@ -16,7 +20,13 @@ def read_latest_file(dir_path: str) -> str:
         raise FileNotFoundError(f"The given directory path does not exist: {dir_path}")
 
     # Get the latest file.
-    list_of_files = glob.glob(dir_path + '/*')
+    while True:
+        list_of_files = glob.glob(dir_path + '/*')
+        if len(list_of_files) == 0:
+            # Wait for save operation to complete.
+            sleep(2)
+        else:
+            break
     return max(list_of_files, key=os.path.getctime)
 
 def upload_to_fileio(file_path: str) -> str:
@@ -30,6 +40,9 @@ def upload_to_fileio(file_path: str) -> str:
         files={"file": open(file_path, 'rb')},
         auth=HTTPBasicAuth(file_io_key, '')
     )
+    
+    logger.debug("File.io response: " + str(response.status_code))
+
     res: dict[str, Any] = response.json()
     if res['success'] == True: 
         return res['link']

main.py

@@ -62,4 +62,8 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    try:
+        main()
+    except KeyboardInterrupt:
+        print("Exiting...")
+        exit(0)