Update app.py

app.py

@@ -5,106 +5,71 @@ import requests
 from PIL import Image
 
 def face_compare(frame1, frame2):
-    url = "https://faceapi.miniai.live/face_compare"
-    files = {'file1': open(frame1, 'rb'), 'file2': open(frame2, 'rb')}
-
+    url = "https://face.miniai.live/api/face_match"
+    files = {'image1': open(frame1, 'rb'), 'image2': open(frame2, 'rb')}
     r = requests.post(url=url, files=files)
+    response = r.json()
+
+    detections = response.get("detections", [])
+    matches = response.get("match", [])
+    detection_rows = ""
+    match_rows = ""
+
+    # Process detections
+    for detection in detections:
+        face_image = detection.get("face", "")
+        face_img_tag = f"<img src='data:image/png;base64,{face_image}' width='100' />" if face_image else "N/A"
+        first_face_index = detection.get("firstFaceIndex", "N/A")
+        second_face_index = detection.get("secondFaceIndex", "N/A")
+
+        detection_rows += f"""
+        <tr>
+            <td>{first_face_index}</td>
+            <td>{second_face_index}</td>
+            <td>{face_img_tag}</td>
+        </tr>
+        """
 
-    html = None
-    faces = None
-
-    compare_result = r.json().get('compare_result')
-    compare_similarity = r.json().get('compare_similarity')
-
-    html = ("<table>"
-                "<tr>"
-                    "<th>State</th>"
-                    "<th>Value</th>"
-                "</tr>"
-                "<tr>"
-                    "<td>Is same person? </td>"
-                    "<td>{compare_result}</td>"
-                "</tr>"
-                "<tr>"
-                    "<td>Similarity</td>"
-                    "<td>{compare_similarity}</td>"
-                "</tr>"
-                "</table>".format(compare_result=compare_result, compare_similarity=compare_similarity))
-
-    try:
-        image1 = Image.open(frame1)
-        image2 = Image.open(frame2)
-
-        face1 = None
-        face2 = None
-
-        if r.json().get('face1') is not None:
-            face = r.json().get('face1')
-            x1 = face.get('x1')
-            y1 = face.get('y1')
-            x2 = face.get('x2')
-            y2 = face.get('y2')
-
-            if x1 < 0:
-                x1 = 0
-            if y1 < 0:
-                y1 = 0
-            if x2 >= image1.width:
-                x2 = image1.width - 1
-            if y2 >= image1.height:
-                y2 = image1.height - 1
-
-            face1 = image1.crop((x1, y1, x2, y2))
-            face_image_ratio = face1.width / float(face1.height)
-            resized_w = int(face_image_ratio * 150)
-            resized_h = 150
-
-            face1 = face1.resize((int(resized_w), int(resized_h)))
-
-        if r.json().get('face2') is not None:
-            face = r.json().get('face2')
-            x1 = face.get('x1')
-            y1 = face.get('y1')
-            x2 = face.get('x2')
-            y2 = face.get('y2')
-
-            if x1 < 0:
-                x1 = 0
-            if y1 < 0:
-                y1 = 0
-            if x2 >= image2.width:
-                x2 = image2.width - 1
-            if y2 >= image2.height:
-                y2 = image2.height - 1
-
-            face2 = image2.crop((x1, y1, x2, y2))
-            face_image_ratio = face2.width / float(face2.height)
-            resized_w = int(face_image_ratio * 150)
-            resized_h = 150
-
-            face2 = face2.resize((int(resized_w), int(resized_h)))
-
-        if face1 is not None and face2 is not None:
-            new_image = Image.new('RGB',(face1.width + face2.width + 10, 150), (80,80,80))
-
-            new_image.paste(face1,(0,0))
-            new_image.paste(face2,(face1.width + 10, 0))
-            faces = new_image.copy()
-        elif face1 is not None and face2 is None:
-            new_image = Image.new('RGB',(face1.width + face1.width + 10, 150), (80,80,80))
-
-            new_image.paste(face1,(0,0))
-            faces = new_image.copy()
-        elif face1 is None and face2 is not None:
-            new_image = Image.new('RGB',(face2.width + face2.width + 10, 150), (80,80,80))
-
-            new_image.paste(face2,(face2.width + 10, 0))
-            faces = new_image.copy()
-
-    except:
-        pass
+    # Process matches
+    for match in matches:
+        first_face_index = match.get("firstFaceIndex", "N/A")
+        second_face_index = match.get("secondFaceIndex", "N/A")
+        similarity = match.get("similarity", "N/A")
+
+        match_rows += f"""
+        <tr>
+            <td>{first_face_index}</td>
+            <td>{second_face_index}</td>
+            <td>{similarity:.6f}</td>
+        </tr>
+        """
 
-    return [faces, html]
+    # Create HTML tables
+    detections_table = f"""
+    <h3>Face Detection</h3>
+    <table border="1" style="border-collapse: collapse; width: 100%;">
+        <tr>
+            <th>First Face Index</th>
+            <th>Second Face Index</th>
+            <th>Face Image</th>
+        </tr>
+        {detection_rows}
+    </table>
+    """
+
+    matches_table = f"""
+    <h3>Matching Results</h3>
+    <table border="1" style="border-collapse: collapse; width: 100%;">
+        <tr>
+            <th>First Face Index</th>
+            <th>Second Face Index</th>
+            <th>Similarity</th>
+        </tr>
+        {match_rows}
+    </table>
+    """
+
+    return detections_table + matches_table
 
 def check_liveness(frame):
     url = "https://faceapi.miniai.live/face_liveness_check"
@@ -281,10 +246,9 @@ with gr.Blocks() as MiniAIdemo:
                         inputs=im_match_in2
                     )
                 with gr.Column():
-                    im_match_crop = gr.Image(type="pil", height=256)
                     txt_compare_out = gr.HTML()
             btn_f_match = gr.Button("Check Comparing!", variant='primary')
-            btn_f_match.click(face_compare, inputs=[im_match_in1, im_match_in2], outputs=[im_match_crop, txt_compare_out])
+            btn_f_match.click(face_compare, inputs=[im_match_in1, im_match_in2], outputs=txt_compare_out)
         with gr.Tab("Face Liveness Detection"):
             with gr.Row():
                 with gr.Column(scale=1):