Update demo.py

demo.py

@@ -62,41 +62,38 @@ def compare_face(frame1, frame2):
             image1 = Image.open(frame1)
             image2 = Image.open(frame2)
 
-            print(json_result)
-            # faces1 = json_result.get("faces1", {})
-            html = json.dumps(json_result, indent=4)
-            
-            # faces2 = json_result.get("faces2", {})
-            # results = json_result.get("results", {})
+            faces1 = json_result.get("faces1", {})           
+            faces2 = json_result.get("faces2", {})
+            results = json_result.get("results", {})
     
-            # for result in results:
-            #     similarity = result.get('similarity')
-            #     face1_idx = result.get('face1')
-            #     face2_idx = result.get('face2')
+            for result in results:
+                similarity = result.get('similarity')
+                face1_idx = result.get('face1')
+                face2_idx = result.get('face2')
     
-            #     face_image1 = face_crop(image1, faces1[face1_idx])
-            #     face_value1 = ('<img src="data:image/png;base64,{base64_image}" style="width: 100px; height: auto; object-fit: contain;"/>').format(base64_image=pil_image_to_base64(face_image1, format="PNG"))
+                face_image1 = face_crop(image1, faces1[face1_idx])
+                face_value1 = ('<img src="data:image/png;base64,{base64_image}" style="width: 100px; height: auto; object-fit: contain;"/>').format(base64_image=pil_image_to_base64(face_image1, format="PNG"))
     
-            #     face_image2 = face_crop(image2, faces2[face2_idx])
-            #     face_value2 = ('<img src="data:image/png;base64,{base64_image}" style="width: 100px; height: auto; object-fit: contain;"/>').format(base64_image=pil_image_to_base64(face_image2, format="PNG"))
+                face_image2 = face_crop(image2, faces2[face2_idx])
+                face_value2 = ('<img src="data:image/png;base64,{base64_image}" style="width: 100px; height: auto; object-fit: contain;"/>').format(base64_image=pil_image_to_base64(face_image2, format="PNG"))
     
-            #     match_icon = '<svg fill="red" width="19" height="32" viewBox="0 0 19 32"><path d="M0 13.92V10.2H19V13.92H0ZM0 21.64V17.92H19V21.64H0Z"></path><path d="M14.08 0H18.08L5.08 32H1.08L14.08 0Z"></path></svg>'
-            #     if similarity > 0.67:
-            #         match_icon = '<svg fill="green" width="19" height="32" viewBox="0 0 19 32"><path d="M0 13.9202V10.2002H19V13.9202H0ZM0 21.6402V17.9202H19V21.6402H0Z"></path></svg>'
+                match_icon = '<svg fill="red" width="19" height="32" viewBox="0 0 19 32"><path d="M0 13.92V10.2H19V13.92H0ZM0 21.64V17.92H19V21.64H0Z"></path><path d="M14.08 0H18.08L5.08 32H1.08L14.08 0Z"></path></svg>'
+                if similarity > 0.67:
+                    match_icon = '<svg fill="green" width="19" height="32" viewBox="0 0 19 32"><path d="M0 13.9202V10.2002H19V13.9202H0ZM0 21.6402V17.9202H19V21.6402H0Z"></path></svg>'
     
-            #     item_value = ('<div style="align-items: center; gap: 10px; display: flex; flex-direction: column;">'
-            #                     '<div style="display: flex; align-items: center; gap: 20px;">'
-            #                     '{face_value1}'
-            #                     '{match_icon}'
-            #                     '{face_value2}'
-            #                     '</div>'
-            #                     '<div style="text-align: center; margin-top: 10px;">'
-            #                     'Similarity: {similarity}'
-            #                     '</div>'
-            #                     '</div>'
-            #     ).format(face_value1=face_value1, face_value2=face_value2, match_icon=match_icon, similarity=f"{similarity:.2f}")
-            #     html += item_value
-            #     html += '<hr style="border: 1px solid #C0C0C0; margin: 10px 0;"/>'
+                item_value = ('<div style="align-items: center; gap: 10px; display: flex; flex-direction: column;">'
+                                '<div style="display: flex; align-items: center; gap: 20px;">'
+                                '{face_value1}'
+                                '{match_icon}'
+                                '{face_value2}'
+                                '</div>'
+                                '<div style="text-align: center; margin-top: 10px;">'
+                                'Similarity: {similarity}'
+                                '</div>'
+                                '</div>'
+                ).format(face_value1=face_value1, face_value2=face_value2, match_icon=match_icon, similarity=f"{similarity:.2f}")
+                html += item_value
+                html += '<hr style="border: 1px solid #C0C0C0; margin: 10px 0;"/>'
     
             return html
         except: