Update app.py

app.py

@@ -7,16 +7,19 @@ import uuid
 from pydrive2.auth import GoogleAuth
 from pydrive2.drive import GoogleDrive
 
-# --- Google Drive setup ---
+# --- Google Drive setup với Service Account ---
 gauth = GoogleAuth()
-gauth.LocalWebserverAuth()  # mở trình duyệt để login
+gauth.ServiceAuth(settings_file="service_account.json")  # file JSON của service account
 drive = GoogleDrive(gauth)
 
-# Dictionary lưu mapping image_id -> Google Drive file_id
+# ID folder public trên Google Drive
+FOLDER_ID = "1MwGdJbVbLNSLnmHrR-mGlH8EAJ3gy50R"
+
+# Dictionary lưu mapping image_id -> {'file_id':..., 'name':...}
 image_drive_map = {}
 
 # 1️⃣ Upload ảnh lên Google Drive
-def upload_image(image):
+def upload_image(image, name):
     try:
         if isinstance(image, Image.Image):
             image = np.array(image)
@@ -25,12 +28,13 @@ def upload_image(image):
         pil_image = Image.fromarray(image)
         pil_image.save(filename)  # tạm lưu local
 
-        gfile = drive.CreateFile({'title': filename})
+        gfile = drive.CreateFile({'title': filename, 'parents':[{'id': FOLDER_ID}]})
         gfile.SetContentFile(filename)
         gfile.Upload()
 
-        image_drive_map[image_id] = gfile['id']
-        return f"Ảnh lưu thành công với ID: {image_id}", image_id
+        image_drive_map[image_id] = {'file_id': gfile['id'], 'name': name}
+        file_link = f"https://drive.google.com/file/d/{gfile['id']}/view?usp=sharing"
+        return f"Ảnh lưu thành công với ID: {image_id}\nTên: {name}\nLink: {file_link}", image_id
     except Exception as e:
         return f"Lỗi khi upload: {str(e)}", None
 
@@ -43,14 +47,16 @@ def recognize_face(image, image_id):
             image = np.array(image)
 
         # Download ảnh từ Drive
-        file_id = image_drive_map[image_id]
+        file_id = image_drive_map[image_id]['file_id']
+        stored_name = image_drive_map[image_id]['name']
         gfile = drive.CreateFile({'id': file_id})
         gfile.GetContentFile(f"temp_{image_id}.png")
 
         result = DeepFace.verify(img1_path=image, img2_path=f"temp_{image_id}.png")
         output = {
             "Verified": result["verified"],
-            "Khoảng cách": round(result["distance"], 4)
+            "Khoảng cách": round(result["distance"], 4),
+            "Tên ảnh gốc": stored_name
         }
         return json.dumps(output, ensure_ascii=False, indent=2)
     except Exception as e:
@@ -82,11 +88,12 @@ with gr.Blocks() as demo:
     gr.Markdown("## 📁 Upload ảnh lên Google Drive")
     with gr.Row():
         upload_input = gr.Image(label="Upload ảnh", type="numpy")
+        name_input = gr.Textbox(label="Tên người trong ảnh")
         upload_btn = gr.Button("Upload")
         upload_output = gr.Textbox(label="Kết quả Upload")
         image_id_store = gr.State()
 
-    upload_btn.click(upload_image, inputs=upload_input, outputs=[upload_output, image_id_store])
+    upload_btn.click(upload_image, inputs=[upload_input, name_input], outputs=[upload_output, image_id_store])
 
     gr.Markdown("## 🆔 Nhận diện khuôn mặt")
     with gr.Row():