Update app.py

app.py

@@ -16,18 +16,19 @@ from opyfacerecog import processImage
 from opyfacerecog import verifyFeat
 from face import Face
 
-licenseKeyPath = "license.txt"
-license = ""
-
 maxFaceCount1 = 5
 maxFaceCount2 = 10
 
-try:
-    with open(licenseKeyPath, 'r') as file:
-        license = file.read().strip()
-except IOError as exc:
-    print("failed to open license.txt: ", exc.errno)
-print("License Key: ", license)
+licenseKeyPath = "license.txt"
+license = os.environ.get("LICENSE_KEY")
+
+if license is None:
+    try:
+        with open(licenseKeyPath, 'r') as file:
+            license = file.read().strip()
+    except IOError as exc:
+        print("failed to open license.txt: ", exc.errno)
+    print("License Key: ", license)
 
 hwid = getHWID()
 print("HWID: ", hwid.decode('utf-8'))
@@ -171,25 +172,41 @@ def compare_face_base64():
     faces1 = (Face * maxFaceCount1)()
     faceNum1 = processImage(image_np1, image_np1.shape[1], image_np1.shape[0], faces1, maxFaceCount1)
 
+    faces1_result = []
+    for i in range(faceNum1):
+        face = {"x": faces1[i].x, "y": faces1[i].y, "width": faces1[i].width, "height": faces1[i].height}
+        faces1_result.append(face)
+
     image_np2 = np.asarray(image2)
     faces2 = (Face * maxFaceCount1)()
     faceNum2 = processImage(image_np2, image_np2.shape[1], image_np2.shape[0], faces2, maxFaceCount1)
 
-    if faceNum1 == 1 and faceNum2 == 1:
-        score = verifyFeat(faces1[0].featSize, faces1[0].featData, faces2[0].featSize, faces2[0].featData)
-        response = jsonify({"resultCode": "Ok", "score": score})
+    faces2_result = []
+    for i in range(faceNum2):
+        face = {"x": faces2[i].x, "y": faces2[i].y, "width": faces2[i].width, "height": faces2[i].height}
+        faces2_result.append(face)
+
+    if faceNum1 > 0 and faceNum2 > 0:
+        results = []
+        for i in range(faceNum1):
+            for j in range(faceNum2):                
+                score = verifyFeat(faces1[i].featSize, faces1[i].featData, faces2[j].featSize, faces2[j].featData)
+                match_result = {"face1": i, "face2": j, "score": score}
+                results.append(match_result)
+
+        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"})
+        response = jsonify({"resultCode": "No face1", "faces1": faces1, "faces2": faces2})
 
         response.status_code = 200
         response.headers["Content-Type"] = "application/json; charset=utf-8"
         return response
     elif faceNum2 == 0:
-        response = jsonify({"resultCode": "No face2"})
+        response = jsonify({"resultCode": "No face2", "faces1": faces1, "faces2": faces2})
 
         response.status_code = 200
         response.headers["Content-Type"] = "application/json; charset=utf-8"