update on 2023-10-21

app.py

@@ -1,6 +1,7 @@
 import os
 import json
 import math
+import base64
 
 os.environ["DEEPFACE_HOME"] = "."
 
@@ -40,6 +41,32 @@ def image_search_performer(image, threshold=20.0, results=3):
     return search_performer(face, threshold, results)
 
 
+
+def image_search_performers(image, threshold=20.0, results=3):
+    image_array = np.array(image)
+
+    response = []
+    faces = DeepFace.represent(img_path = image_array, detector_backend='retinaface', model_name='Facenet512', normalization="Facenet2018")
+    # faces = DeepFace.represent(img_path = image_array, detector_backend='yolov8', model_name='SFace')
+    for face in faces:
+        embedding = face['embedding']
+        area = face['facial_area']
+        confidence = face['face_confidence']
+        cimage = image.crop((area['x'], area['y'], area['x'] + area['w'], area['y'] + area['h']))
+        # return image base64 encoded for display
+        with open('temp.jpg', 'wb') as f:
+            cimage.save(f, format='JPEG')
+        im_b64 = base64.b64encode(open('temp.jpg', 'rb').read())
+
+        response.append({
+            'image': im_b64.decode('ascii'),
+            'confidence': confidence,
+            'performers': search_performer(embedding, threshold, results)
+        })
+    
+    return response
+
+
 def vector_search_performer(vector_json, threshold=20.0, results=3):
     """Search for a performer from a vector
 
@@ -88,7 +115,7 @@ def search_performer(vector, threshold=20.0, results=3):
             persons[id].update(PERFORMER_DB.get(id))
 
     persons = sorted(persons.values(), key=lambda x: x["distance"])
-    persons = [p for p in persons if p["distance"] < threshold]
+    # persons = [p for p in persons if p["distance"] < threshold]
     return persons[:results]
 
 
@@ -127,6 +154,18 @@ image_search = gr.Interface(
     description="Upload an image of a person and we'll tell you who it is.",
 )
 
+image_search_multiple = gr.Interface(
+    fn=image_search_performers,
+    inputs=[
+        gr.components.Image(type='pil'),
+        gr.components.Slider(label="threshold",minimum=0.0, maximum=30.0, value=20.0),
+        gr.components.Slider(label="results", minimum=0, maximum=50, value=3, step=1),
+    ],
+    outputs=gr.outputs.JSON(label=""),
+    title="Who is in the photo?",
+    description="Upload an image of a person(s) and we'll tell you who it is.",
+)
+
 vector_search = gr.Interface(
     fn=vector_search_performer,
     inputs=[
@@ -139,4 +178,4 @@ vector_search = gr.Interface(
     description="512 vector created with deepface of a person and we'll tell you who it is.",
 )
 
-gr.TabbedInterface([image_search, vector_search]).launch(enable_queue=True, server_name="0.0.0.0")
+gr.TabbedInterface([image_search, image_search_multiple, vector_search]).launch(enable_queue=True, server_name="0.0.0.0")

face.db

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14866ae4466e9beadd2e9bab69508c4e665f51f35c273c8109d13e32af3e2400
-size 630139200
+oid sha256:a00dd4d0faee9b0bc2b33968d41e7db8d0acb4b2971695c4782926432461b8eb
+size 634081440

face.json

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92d94c2e3538056a5924f0647a3b239c3585257075b553b9f5abfe37a93524e1
-size 7876960
+oid sha256:a4d19429102a70aa88f298e51ed821523d92d7a836fc6aac7c3aca8583505a90
+size 7936400

persons.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:716498ffa78d2f3116402f179c3b74bd404923e971845926018b9d307d37904f
-size 3788836
+oid sha256:f20040291e460866c497f1077a3df127498a7968602b6dfb2ce5e2db762ce606
+size 3808624