Merge pull request #2 from 5sControl/dev

Dev

Author: eugenos-programos

.dockerignore

@@ -1 +1,2 @@
-.cache
+.cache
+__pycache__

confs/configs.json

@@ -0,0 +1,10 @@
+{
+    "classes": [
+        67
+    ],
+    "iou_thres": 0.5,
+    "conf_thres": 0.3,
+    "model_path": "idle_models/idle_v0.3.11.pt",
+    "wait_time": 10,
+    "threshold": 100
+}

confs/load_configs.py

@@ -0,0 +1,11 @@
+import json
+
+
+with open("confs/configs.json", "r") as conf:
+    configs = json.load(conf)
+    CONF_THRES = configs.get("conf_thres")
+    IOU_THRES = configs.get("iou_thres")
+    MODEL_PATH = configs.get("model_path")
+    CLASSES = configs.get("classes")
+    WAIT_TIME = configs.get("wait_time")
+    THRESHOLD = configs.get("threshold")

confs/settings.env

@@ -1,5 +1,5 @@
 username = 'admin'
 password = 'just4Taqtile'
-camera_url = 'http://192.168.1.162/onvif-http/snapshot?Profile_1'
+camera_url = 'http://192.168.1.166/onvif-http/snapshot?Profile_1'
 server_url = 'http://192.168.1.999'
 folder = 'images/192.168.1.168'

functional.py

@@ -1,4 +1,4 @@
-
+from confs.load_configs import *
 import os
 import uuid
 import datetime
@@ -9,7 +9,9 @@
 import requests
 import httplib2
 import numpy as np
-from ObjectDetectionModel import ObjDetectionModel
+from idle_models.ObjectDetectionModel import ObjDetectionModel
+import time
+from dotenv import load_dotenv
 
 
 def create_logger():
@@ -32,6 +34,9 @@ def create_logger():
 
 def init_connection():
     password = os.environ.get("password")
+    if password is None:
+        load_dotenv("confs/settings.env")
+        password = os.environ.get("password")
     username = os.environ.get("username")
     try:
         h = httplib2.Http(".cache")
@@ -43,7 +48,7 @@ def init_connection():
 
 
 def init_model():
-    model = ObjDetectionModel("yolov8l.pt", 0.3, 0.5)
+    model = ObjDetectionModel(MODEL_PATH, CONF_THRES, IOU_THRES, CLASSES)
     return model
 
 
@@ -66,7 +71,7 @@ def put_rectangle(img, boxes, scores):
     return img
 
 
-def check_coordinates_diffs(coords_1: np.array, coords_2: np.array, threshold=20):
+def check_coordinates_diffs(coords_1: np.array, coords_2: np.array, threshold=THRESHOLD):
     if coords_1 is None:
         return True
     diff = np.abs(coords_1 - coords_2).sum()
@@ -81,10 +86,10 @@ def send_report_and_save_photo(img0):
     save_photo_url = f'{folder}/' + str(uuid.uuid4()) + '.jpg'
     cv2.imwrite(save_photo_url, img0)
 
-    time_delta_seconds = 10
+    time_delta_seconds = WAIT_TIME
     start_tracking = str(datetime.datetime.now())
-    stop_tracking = str(datetime.datetime.now() +
-                        datetime.timedelta(0, time_delta_seconds))
+    time.sleep(time_delta_seconds)
+    stop_tracking = str(datetime.datetime.now())
 
     report_for_send = {
         'camera': folder.split('/')[1],

ObjectDetectionModel.py renamed to idle_models/ObjectDetectionModel.py

@@ -3,11 +3,11 @@
 
 
 class ObjDetectionModel:
-    def __init__(self, path: str, conf_thresh, iou_thresh) -> None:
+    def __init__(self, path: str, conf_thresh, iou_thresh, classes) -> None:
         self.model = YOLO(path)
         self.conf_thresh = conf_thresh
         self.iou_thresh = iou_thresh
-        self.classes = [67]
+        self.classes = classes
 
     @torch.no_grad()
     def __call__(self, img) -> list:

main.py

@@ -10,7 +10,7 @@ def run():
         logger.warning("Cannot create connection")
         time.sleep(1)
     model = init_model()
-    logger.info("Model is initialized")
+    logger.info("Model initialized")
     prev_preds = None
     iter_idx = 0
     while True:
@@ -20,7 +20,7 @@ def run():
         if (img := get_frame(h)) is None:
             logger.warning("Empty photo")
             continue
-        time.sleep(0.1)
+        time.sleep(3)
         preds, scores = model(img)
         img = put_rectangle(img, preds.numpy(), scores.numpy())
         if len(scores) > 0: