Update app.py

app.py

@@ -18,7 +18,7 @@ from facebox import FaceBox
 
 verifyThreshold = 0.67
 
-maxFaceCount = 1
+maxFaceCount = 8
 
 licensePath = "license.txt"
 license = ""
@@ -90,49 +90,67 @@ def compare_face():
     faceBoxes2 = (FaceBox * maxFaceCount)()
     faceCount2 = faceDetection(image_np2, image_np2.shape[1], image_np2.shape[0], faceBoxes2, maxFaceCount)
 
-    if faceCount1 == 1 and faceCount2 == 1:
-        templateExtraction(image_np1, image_np1.shape[1], image_np1.shape[0], faceBoxes1[0])
-        templateExtraction(image_np2, image_np2.shape[1], image_np2.shape[0], faceBoxes2[0])
-        similarity = similarityCalculation(faceBoxes1[0].templates, faceBoxes2[0].templates)
-        if similarity > verifyThreshold:
-            result = "Same person"
-        else:
-            result = "Different person"
-    elif faceCount1 == 0:
-        result = "No face1"
-    elif faceCount2 == 0:
-        result = "No face2"
-
-    if faceCount1 == 1:
+    faces1_result = []
+    for i in range(faceCount1):
+        templateExtraction(image_np1, image_np1.shape[1], image_np1.shape[0], faceBoxes1[i])
+
         landmark_68 = []
         for j in range(68):
-            landmark_68.append({"x": faceBoxes1[0].landmark_68[j * 2], "y": faceBoxes1[0].landmark_68[j * 2 + 1]})
+            landmark_68.append({"x": faceBoxes1[i].landmark_68[j * 2], "y": faceBoxes1[i].landmark_68[j * 2 + 1]})
 
-        face1 = {"x1": faceBoxes1[0].x1, "y1": faceBoxes1[0].y1, "x2": faceBoxes1[0].x2, "y2": faceBoxes1[0].y2, 
-                      "yaw": faceBoxes1[0].yaw, "roll": faceBoxes1[0].roll, "pitch": faceBoxes1[0].pitch,
-                      "face_quality": faceBoxes1[0].face_quality, "face_luminance": faceBoxes1[0].face_luminance, "eye_dist": faceBoxes1[0].eye_dist,
-                      "left_eye_closed": faceBoxes1[0].left_eye_closed, "right_eye_closed": faceBoxes1[0].right_eye_closed,
-                      "face_occlusion": faceBoxes1[0].face_occlusion, "mouth_opened": faceBoxes1[0].mouth_opened,
+        face = {"x1": faceBoxes1[i].x1, "y1": faceBoxes1[i].y1, "x2": faceBoxes1[i].x2, "y2": faceBoxes1[i].y2, 
+                      "yaw": faceBoxes1[i].yaw, "roll": faceBoxes1[i].roll, "pitch": faceBoxes1[i].pitch,
+                      "face_quality": faceBoxes1[i].face_quality, "face_luminance": faceBoxes1[i].face_luminance, "eye_dist": faceBoxes1[i].eye_dist,
+                      "left_eye_closed": faceBoxes1[i].left_eye_closed, "right_eye_closed": faceBoxes1[i].right_eye_closed,
+                      "face_occlusion": faceBoxes1[i].face_occlusion, "mouth_opened": faceBoxes1[i].mouth_opened,
                       "landmark_68": landmark_68}
+        
+        faces1_result.append(face)
+
+    for i in range(faceCount2):
+        templateExtraction(image_np2, image_np2.shape[1], image_np2.shape[0], faceBoxes2[i])
 
-    if faceCount2 == 1:
         landmark_68 = []
         for j in range(68):
-            landmark_68.append({"x": faceBoxes2[0].landmark_68[j * 2], "y": faceBoxes2[0].landmark_68[j * 2 + 1]})
+            landmark_68.append({"x": faceBoxes2[i].landmark_68[j * 2], "y": faceBoxes2[i].landmark_68[j * 2 + 1]})
 
-        face2 = {"x1": faceBoxes2[0].x1, "y1": faceBoxes2[0].y1, "x2": faceBoxes2[0].x2, "y2": faceBoxes2[0].y2, 
-                      "yaw": faceBoxes2[0].yaw, "roll": faceBoxes2[0].roll, "pitch": faceBoxes2[0].pitch,
-                      "face_quality": faceBoxes2[0].face_quality, "face_luminance": faceBoxes2[0].face_luminance, "eye_dist": faceBoxes2[0].eye_dist,
-                      "left_eye_closed": faceBoxes2[0].left_eye_closed, "right_eye_closed": faceBoxes2[0].right_eye_closed,
-                      "face_occlusion": faceBoxes2[0].face_occlusion, "mouth_opened": faceBoxes2[0].mouth_opened,
+
+        face = {"x1": faceBoxes2[i].x1, "y1": faceBoxes2[i].y1, "x2": faceBoxes2[i].x2, "y2": faceBoxes2[i].y2, 
+                      "yaw": faceBoxes2[i].yaw, "roll": faceBoxes2[i].roll, "pitch": faceBoxes2[i].pitch,
+                      "face_quality": faceBoxes2[i].face_quality, "face_luminance": faceBoxes2[i].face_luminance, "eye_dist": faceBoxes2[i].eye_dist,
+                      "left_eye_closed": faceBoxes2[i].left_eye_closed, "right_eye_closed": faceBoxes2[i].right_eye_closed,
+                      "face_occlusion": faceBoxes2[i].face_occlusion, "mouth_opened": faceBoxes2[i].mouth_opened,
                       "landmark_68": landmark_68}
+        
+        faces2_result.append(face)
+
+    
+    if faceCount1 > 0 and faceCount2 > 0:
+        results = []
+        for i in range(faceCount1):
+            for j in range(faceCount2): 
+                similarity = similarityCalculation(faceBoxes1[i].templates, faceBoxes2[j].templates)
+                match_result = {"face1": i, "face2": j, "similarity": similarity}
+                results.append(match_result)
+
+        response = jsonify({"resultCode": "Ok", "faces1": faces1_result, "faces2": faces2_result, "results": results})
 
-    response = jsonify({"compare_result": result, "compare_similarity": similarity, "face1": face1, "face2": face2})
+        response.status_code = 200
+        response.headers["Content-Type"] = "application/json; charset=utf-8"
+        return response
+    elif faceNum1 == 0:
+        response = jsonify({"resultCode": "No face1", "faces1": faces1, "faces2": faces2})
 
-    response.status_code = 200
-    response.headers["Content-Type"] = "application/json; charset=utf-8"
-    return response
+        response.status_code = 200
+        response.headers["Content-Type"] = "application/json; charset=utf-8"
+        return response
+    elif faceNum2 == 0:
+        response = jsonify({"resultCode": "No face2", "faces1": faces1, "faces2": faces2})
 
+        response.status_code = 200
+        response.headers["Content-Type"] = "application/json; charset=utf-8"
+        return response
+        
 @app.route('/compare_face_base64', methods=['POST'])
 def compare_face_base64():
     result = "None"
@@ -175,48 +193,66 @@ def compare_face_base64():
     faceBoxes2 = (FaceBox * maxFaceCount)()
     faceCount2 = faceDetection(image_np2, image_np2.shape[1], image_np2.shape[0], faceBoxes2, maxFaceCount)
 
-    if faceCount1 == 1 and faceCount2 == 1:
-        templateExtraction(image_np1, image_np1.shape[1], image_np1.shape[0], faceBoxes1[0])
-        templateExtraction(image_np2, image_np2.shape[1], image_np2.shape[0], faceBoxes2[0])
-        similarity = similarityCalculation(faceBoxes1[0].templates, faceBoxes2[0].templates)
-        if similarity > verifyThreshold:
-            result = "Same person"
-        else:
-            result = "Different person"
-    elif faceCount1 == 0:
-        result = "No face1"
-    elif faceCount2 == 0:
-        result = "No face2"
-
-    if faceCount1 == 1:
+    faces1_result = []
+    for i in range(faceCount1):
+        templateExtraction(image_np1, image_np1.shape[1], image_np1.shape[0], faceBoxes1[i])
+
         landmark_68 = []
         for j in range(68):
-            landmark_68.append({"x": faceBoxes1[0].landmark_68[j * 2], "y": faceBoxes1[0].landmark_68[j * 2 + 1]})
+            landmark_68.append({"x": faceBoxes1[i].landmark_68[j * 2], "y": faceBoxes1[i].landmark_68[j * 2 + 1]})
 
-        face1 = {"x1": faceBoxes1[0].x1, "y1": faceBoxes1[0].y1, "x2": faceBoxes1[0].x2, "y2": faceBoxes1[0].y2, 
-                      "yaw": faceBoxes1[0].yaw, "roll": faceBoxes1[0].roll, "pitch": faceBoxes1[0].pitch,
-                      "face_quality": faceBoxes1[0].face_quality, "face_luminance": faceBoxes1[0].face_luminance, "eye_dist": faceBoxes1[0].eye_dist,
-                      "left_eye_closed": faceBoxes1[0].left_eye_closed, "right_eye_closed": faceBoxes1[0].right_eye_closed,
-                      "face_occlusion": faceBoxes1[0].face_occlusion, "mouth_opened": faceBoxes1[0].mouth_opened,
+        face = {"x1": faceBoxes1[i].x1, "y1": faceBoxes1[i].y1, "x2": faceBoxes1[i].x2, "y2": faceBoxes1[i].y2, 
+                      "yaw": faceBoxes1[i].yaw, "roll": faceBoxes1[i].roll, "pitch": faceBoxes1[i].pitch,
+                      "face_quality": faceBoxes1[i].face_quality, "face_luminance": faceBoxes1[i].face_luminance, "eye_dist": faceBoxes1[i].eye_dist,
+                      "left_eye_closed": faceBoxes1[i].left_eye_closed, "right_eye_closed": faceBoxes1[i].right_eye_closed,
+                      "face_occlusion": faceBoxes1[i].face_occlusion, "mouth_opened": faceBoxes1[i].mouth_opened,
                       "landmark_68": landmark_68}
+        
+        faces1_result.append(face)
+
+    for i in range(faceCount2):
+        templateExtraction(image_np2, image_np2.shape[1], image_np2.shape[0], faceBoxes2[i])
 
-    if faceCount2 == 1:
         landmark_68 = []
         for j in range(68):
-            landmark_68.append({"x": faceBoxes2[0].landmark_68[j * 2], "y": faceBoxes2[0].landmark_68[j * 2 + 1]})
+            landmark_68.append({"x": faceBoxes2[i].landmark_68[j * 2], "y": faceBoxes2[i].landmark_68[j * 2 + 1]})
+
 
-        face2 = {"x1": faceBoxes2[0].x1, "y1": faceBoxes2[0].y1, "x2": faceBoxes2[0].x2, "y2": faceBoxes2[0].y2, 
-                      "yaw": faceBoxes2[0].yaw, "roll": faceBoxes2[0].roll, "pitch": faceBoxes2[0].pitch,
-                      "face_quality": faceBoxes2[0].face_quality, "face_luminance": faceBoxes2[0].face_luminance, "eye_dist": faceBoxes2[0].eye_dist,
-                      "left_eye_closed": faceBoxes2[0].left_eye_closed, "right_eye_closed": faceBoxes2[0].right_eye_closed,
-                      "face_occlusion": faceBoxes2[0].face_occlusion, "mouth_opened": faceBoxes2[0].mouth_opened,
+        face = {"x1": faceBoxes2[i].x1, "y1": faceBoxes2[i].y1, "x2": faceBoxes2[i].x2, "y2": faceBoxes2[i].y2, 
+                      "yaw": faceBoxes2[i].yaw, "roll": faceBoxes2[i].roll, "pitch": faceBoxes2[i].pitch,
+                      "face_quality": faceBoxes2[i].face_quality, "face_luminance": faceBoxes2[i].face_luminance, "eye_dist": faceBoxes2[i].eye_dist,
+                      "left_eye_closed": faceBoxes2[i].left_eye_closed, "right_eye_closed": faceBoxes2[i].right_eye_closed,
+                      "face_occlusion": faceBoxes2[i].face_occlusion, "mouth_opened": faceBoxes2[i].mouth_opened,
                       "landmark_68": landmark_68}
+        
+        faces2_result.append(face)
+
+    
+    if faceCount1 > 0 and faceCount2 > 0:
+        results = []
+        for i in range(faceCount1):
+            for j in range(faceCount2): 
+                similarity = similarityCalculation(faceBoxes1[i].templates, faceBoxes2[j].templates)
+                match_result = {"face1": i, "face2": j, "similarity": similarity}
+                results.append(match_result)
 
-    response = jsonify({"compare_result": result, "compare_similarity": similarity, "face1": face1, "face2": face2})
+        response = jsonify({"resultCode": "Ok", "faces1": faces1_result, "faces2": faces2_result, "results": results})
+
+        response.status_code = 200
+        response.headers["Content-Type"] = "application/json; charset=utf-8"
+        return response
+    elif faceNum1 == 0:
+        response = jsonify({"resultCode": "No face1", "faces1": faces1, "faces2": faces2})
 
-    response.status_code = 200
-    response.headers["Content-Type"] = "application/json; charset=utf-8"
-    return response
+        response.status_code = 200
+        response.headers["Content-Type"] = "application/json; charset=utf-8"
+        return response
+    elif faceNum2 == 0:
+        response = jsonify({"resultCode": "No face2", "faces1": faces1, "faces2": faces2})
+
+        response.status_code = 200
+        response.headers["Content-Type"] = "application/json; charset=utf-8"
+        return response
 
 if __name__ == '__main__':
     port = int(os.environ.get("PORT", 8080))