Update app.py

app.py

@@ -19,15 +19,15 @@ face_detector = mp_face_detection.FaceDetection(model_selection=0, min_detection
 
 # === UTILS ===
 def get_drive_files(folder_id, mime_prefix="image/"):
-    api_url = f"https://www.googleapis.com/drive/v3/files?q='{folder_id}'+in+parents&key={API_KEY}&fields=files(id,name,mimeType)"
-    r = requests.get(api_url)
+    url = f"https://www.googleapis.com/drive/v3/files?q='{folder_id}'+in+parents&key={API_KEY}&fields=files(id,name,mimeType)"
+    r = requests.get(url)
     files = r.json().get("files", [])
     return [f for f in files if f["mimeType"].startswith(mime_prefix)]
 
 def get_image_from_drive(file_id):
     url = f"https://drive.google.com/uc?id={file_id}&export=download"
-    response = requests.get(url, stream=True)
-    img_array = np.asarray(bytearray(response.content), dtype=np.uint8)
+    r = requests.get(url)
+    img_array = np.asarray(bytearray(r.content), dtype=np.uint8)
     img = cv2.imdecode(img_array, cv2.IMREAD_COLOR)
     return img
 
@@ -39,7 +39,8 @@ def extract_face_embeddings(img):
         for det in results.detections:
             bbox = det.location_data.relative_bounding_box
             h, w, _ = img.shape
-            x, y, bw, bh = int(bbox.xmin * w), int(bbox.ymin * h), int(bbox.width * w), int(bbox.height * h)
+            x, y = int(bbox.xmin * w), int(bbox.ymin * h)
+            bw, bh = int(bbox.width * w), int(bbox.height * h)
             face_crop = img[max(0, y):y+bh, max(0, x):x+bw]
             if face_crop.size > 0:
                 resized = cv2.resize(face_crop, (128, 128))
@@ -56,37 +57,44 @@ def compare_faces(face1, face2):
 def upload_intruder_image(img_array, name_hint="intruder"):
     _, buffer = cv2.imencode('.jpg', img_array)
     img_bytes = buffer.tobytes()
-
     upload_url = f"https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart&key={API_KEY}"
+
     metadata = {
         "name": f"{name_hint}.jpg",
         "parents": [INTRUDER_FOLDER_ID]
     }
+
     boundary = "foo_bar_baz"
-    headers = {"Content-Type": f"multipart/related; boundary={boundary}"}
+    headers = {
+        "Content-Type": f"multipart/related; boundary={boundary}"
+    }
 
-    multipart_body = (
-        f"--{boundary}\r\n"
+    meta_json = str(metadata).replace("'", '"')
+    body_prefix = (
+        "--" + boundary + "\r\n"
         "Content-Type: application/json; charset=UTF-8\r\n\r\n"
-        f"{str(metadata).replace(\"'\", '\"')}\r\n"
-        f"--{boundary}\r\n"
+        + meta_json + "\r\n"
+        "--" + boundary + "\r\n"
         "Content-Type: image/jpeg\r\n\r\n"
-    ).encode("utf-8") + img_bytes + ("\r\n--" + boundary + "--").encode("utf-8")
+    ).encode("utf-8")
+
+    body_suffix = ("\r\n--" + boundary + "--").encode("utf-8")
+    multipart_body = body_prefix + img_bytes + body_suffix
 
     r = requests.post(upload_url, headers=headers, data=multipart_body)
     return r.status_code == 200
 
 def download_video(link):
-    response = requests.get(link, stream=True)
+    r = requests.get(link, stream=True)
     temp = tempfile.NamedTemporaryFile(delete=False, suffix=".mp4")
-    for chunk in response.iter_content(chunk_size=1024*1024):
+    for chunk in r.iter_content(chunk_size=1024*1024):
         temp.write(chunk)
     temp.close()
     return temp.name
 
 # === MAIN ===
 st.title("🔐 Intruder Detection from CCTV Feed")
-st.write("Streaming videos from Google Drive, detecting faces using MediaPipe, and uploading unmatched ones.")
+st.write("Streaming videos from Google Drive, detecting faces using MediaPipe, and uploading unmatched intruders.")
 
 # Load registered faces
 st.sidebar.header("✅ Registered Faces")
@@ -103,8 +111,8 @@ for f in reg_files:
 with st.spinner("Processing CCTV videos..."):
     total_detections = 0
     for folder_id in CCTVFEED_IDS:
-        api_url = f"https://www.googleapis.com/drive/v3/files?q='{folder_id}'+in+parents&key={API_KEY}&fields=files(id,name,mimeType)"
-        response = requests.get(api_url)
+        url = f"https://www.googleapis.com/drive/v3/files?q='{folder_id}'+in+parents&key={API_KEY}&fields=files(id,name,mimeType)"
+        response = requests.get(url)
         files = response.json().get("files", [])
         for f in files:
             if f["mimeType"].startswith("video/"):
@@ -122,12 +130,12 @@ with st.spinner("Processing CCTV videos..."):
                     for face in faces:
                         st.sidebar.image(cv2.cvtColor(face, cv2.COLOR_BGR2RGB), caption="Detected", width=100)
                         distances = [compare_faces(face, reg_face) for reg_face in registered_faces]
-                        if not distances or min(distances) > 45:  # Threshold
+                        if not distances or min(distances) > 45:  # Distance threshold
                             uploaded = upload_intruder_image(face, f"intruder_{f['name']}")
                             if uploaded:
                                 st.warning("⚠️ Intruder uploaded to Google Drive!")
                             else:
-                                st.error("Failed to upload intruder!")
+                                st.error("Failed to upload intruder.")
                             found_intruder = True
                 cap.release()
                 os.remove(video_file)