v

Reviewed-on: #1

.gitignore

@@ -1 +1,2 @@
 .venv
+.conda

README.md

@@ -2,12 +2,12 @@
 
 #### Docker Build - Powershell (One Line)
 ```powershell
-$tag = ("0.0.2").Trim(); git reset --hard; git pull origin master; git tag $tag; git push --tags; docker build -t git.steelants.cz/steelants/py_ck:$tag .; docker push git.steelants.cz/steelants/py_ck:$tag; docker build -t git.steelants.cz/steelants/py_ck:latest .; docker push git.steelants.cz/steelants/py_ck:latest
+$tag = ("0.0.4").Trim(); git reset --hard; git pull origin master; git tag $tag; git push --tags; docker build -t git.steelants.cz/steelants/py_ck:$tag .; docker push git.steelants.cz/steelants/py_ck:$tag; docker build -t git.steelants.cz/steelants/py_ck:latest .; docker push git.steelants.cz/steelants/py_ck:latest
 ```
 
 #### Docker Build - Bash (One Line)
 ```bash
-export TAG="0.0.1" && sudo docker build -t git.steelants.cz/steelants/py_ck:"$TAG" . && sudo docker push git.steelants.cz/steelants/py_ck:"$TAG" && sudo docker build -t git.steelants.cz/steelants/py_ck:latest . && sudo docker push git.steelants.cz/steelants/py_ck:latest
+export TAG="0.0.4" && sudo docker build -t git.steelants.cz/steelants/py_ck:"$TAG" . && sudo docker push git.steelants.cz/steelants/py_ck:"$TAG" && sudo docker build -t git.steelants.cz/steelants/py_ck:latest . && sudo docker push git.steelants.cz/steelants/py_ck:latest
 ```
 
 #### Docker Stack Setup
@@ -23,3 +23,7 @@ services:
       - ${PWD}/app_data/:/app/data/
 networks: {}
 ```
+
+```python
+pip3 install -r requirements.txt
+```

app.py

@@ -3,19 +3,22 @@ import time
 import os
 import requests
 import json
+from retinaface import RetinaFace
 
-treashold = float(os.getenv('FACE_TRASHOLD', '0.5'))
+treashold = float(os.getenv('FACE_TRASHOLD', '0.9'))
 sever = os.getenv('API_ROOT', 'localhost:8000')
 root_api_url = 'http://{}/local'.format(sever)
 base_path = '/app/data/'
 
 print("API_ROOT: " + str(root_api_url), flush=True)
-time.sleep(900)
+print("FACE_TRASHOLD: " + str(treashold), flush=True)
+
 
 try:
     while True:
+        print("LOOP Started !!!", flush=True)
+        
         r = requests.get('{}/anonymize'.format(root_api_url))
-        face_cascade = cv2.CascadeClassifier(cv2.data.haarcascades + 'haarcascade_frontalface_default.xml')
         # print(r.text, flush=True)
         response =  r.json()
 
@@ -23,46 +26,61 @@ try:
             print(str(detection['id']) + " Anonymization Started", flush=True)
             
             img_path = "{}{}".format(base_path, detection['source_image_path'])
-
+            #print(img_path, flush=True)
             #Skip Non existing files
             if (not os.path.exists(img_path)):
                 continue
 
             img = cv2.imread(img_path)
-            gray = cv2.cvtColor(img, cv2.COLOR_BGR2GRAY)
+            faces = RetinaFace.detect_faces(img, treashold)
-            faces, rejects, weights = face_cascade.detectMultiScale3(gray, 1.1, 4, outputRejectLevels = 1)
 
             #Count faces  is null dont anonimize file
-            print(len(faces) + " Faces Found" , flush=True)
+            print(str(len(faces)) + " Faces Found" , flush=True)
-            if (len(faces) < 0):
+            if (len(faces) <= 0):
+                data = {
+                    "id": detection['id'],
+                    "source_image_path": img_path.replace(base_path,""),
+                    "face_found": 0,
+                }
+                response = requests.post('{}/anonymize'.format(root_api_url), json=data)
+                print(str(detection['id']) + " Anonymized 0 faces" , flush=True)
                 continue
 
             i = 0
-            for (x, y, w, h) in faces:
+            for (key) in faces:
-                confidence = float(weights[i])
+                confidence = faces[key]["score"]
-                if (confidence > treashold):
+                print(str(confidence) + " Faces Confidence" , flush=True)
-                    face_roi = img[y:y+h, x:x+w]
+                x1, y1 = min(faces[key]["facial_area"][0], faces[key]["facial_area"][2]) - 2, min(faces[key]["facial_area"][1], faces[key]["facial_area"][3]) - 2
+                x2, y2 = max(faces[key]["facial_area"][0], faces[key]["facial_area"][2]) + 2, max(faces[key]["facial_area"][1], faces[key]["facial_area"][3]) + 2
+                x1, x2 = max(x1, 0), min(x2, img.shape[1])
+                y1, y2 = max(y1, 0), min(y2, img.shape[0])
+                face_roi = img[y1:y2, x1:x2]
                 blurred_face = cv2.GaussianBlur(face_roi, (99, 99), 50)
-                    img[y:y+h, x:x+w] = blurred_face
+                img[y1:y2, x1:x2] = blurred_face
-
+                print("Faces Anonymized" , flush=True)
-                    print(weights[i], flush=True)
-                    text = "{}".format(weights[i])
-                    #cv2.rectangle(img, (x, y), (x+w, y+h), (255, 0, 0), 2)
-                    #cv2.putText(img, text, (x, y), cv2.FONT_HERSHEY_SIMPLEX, 0.45, (0, 0, 255), 2)
 
                 i = i +1
             
+            #cv2.imshow("test_img", img)
+            #cv2.waitKey(0)
             extension = img_path[img_path.index(".")+1:]
+            
+            new_img_path = img_path
+            if (not img_path.endswith(('_anonym.{}'.format(extension)))):
                 new_img_path = img_path.replace((".{}".format(extension)), ('_anonym.{}'.format(extension)))
+            else:
+                print("Path already anonymized !!!")
+                
             cv2.imwrite(new_img_path, img)
 
             data = {
                 "id": detection['id'],
-                "source_image_path": new_img_path.replace(base_path,"")
+                "source_image_path": new_img_path.replace(base_path,""),
+                "face_found": len(faces),
             }
             response = requests.post('{}/anonymize'.format(root_api_url), json=data)
             print(str(detection['id']) + " Anonymized" , flush=True)
-            time.sleep(5)
+            time.sleep(10)
         
         print("sleep", flush=True)
         time.sleep(900)

requirements.txt

@@ -1,2 +1,5 @@
 opencv-python
+numpy
 requests
+retina-face
+tf-keras