Update app.py

app.py

@@ -39,7 +39,7 @@ logger = logging.getLogger(__name__)
 
 # --- HYBRID PRIVACY SETTINGS ---
 CONFIDENCE_THRESHOLD = 0.3   # High Sensitivity (Catches mostly everything)
-TARGET_MOSAIC_GRID = 10      # Max Resolution: Face is divided into 12x12 grid, (Lower = Stronger Blur)
+TARGET_MOSAIC_GRID = 8      # Max Resolution: Face is divided into 12x12 grid, (Lower = Stronger Blur)
 MIN_PIXEL_SIZE = 15          # Min Block Size: Blocks cannot be smaller than 12px, (Higher = Stronger Blur for small faces)
 COVERAGE_SCALE = 1.1         # 110% Coverage (Padding around face)
 
@@ -289,21 +289,45 @@ def apply_blur(image, x, y, w, h):
     image[y:y+h, x:x+w] = pixelated
     return image
 
-def draw_label(image, x, y, w, text, color, on_blur=False):
-    """Annotation step: Draws text."""
+def draw_label(image, x, y, w, h, text, color):
+    """
+    Smart Annotation:
+    - Draws text OUTSIDE the face box.
+    - Tries to draw ABOVE. If no space, draws BELOW.
+    - Background box matches text size.
+    """
     font = cv2.FONT_HERSHEY_SIMPLEX
     scale = 0.6
     thickness = 2
     (tw, th), _ = cv2.getTextSize(text, font, scale, thickness)
     
-    if on_blur:
-        center_x = x + (w // 2) - (tw // 2)
-        center_y = y + (w // 2)
-        cv2.rectangle(image, (center_x - 5, center_y - th - 5), (center_x + tw + 5, center_y + 5), color, -1)
-        cv2.putText(image, text, (center_x, center_y), font, scale, (255, 255, 255), thickness)
+    margin = 10 # Gap between face and text
+    
+    # Check if we have space above the face
+    # We need space for Text Height (th) + Padding (~15px)
+    space_above = y - th - 15
+    
+    if space_above > 0:
+        # === DRAW ABOVE ===
+        text_y = y - margin
+        
+        # Coordinates for the background rectangle
+        box_tl = (x, text_y - th - 5)
+        box_br = (x + tw + 10, text_y + 5)
+        
+        cv2.rectangle(image, box_tl, box_br, color, -1)
+        cv2.putText(image, text, (x + 5, text_y), font, scale, (255, 255, 255), thickness)
     else:
-        cv2.rectangle(image, (x, y - th - 10), (x + tw + 10, y), color, -1)
-        cv2.putText(image, text, (x + 5, y - 5), font, scale, (255, 255, 255), thickness)
+        # === DRAW BELOW ===
+        # y + h is the bottom of the face
+        text_y = y + h + th + margin
+        
+        # Coordinates for the background rectangle
+        box_tl = (x, text_y - th - 5)
+        box_br = (x + tw + 10, text_y + 5)
+        
+        cv2.rectangle(image, box_tl, box_br, color, -1)
+        cv2.putText(image, text, (x + 5, text_y), font, scale, (255, 255, 255), thickness)
 
 def process_frame(image, mode):
     """
@@ -321,7 +345,10 @@ def process_frame(image, mode):
         x, y, w, h = face['box']
         
         # 2. Analysis
-        identity = {"name": "", "color": (0, 255, 0)}
+        # Default vars
+        full_log_text = "Unknown"   # Goes to text box
+        img_label_text = "Unknown"  # Goes to image overlay
+        color = (0, 255, 0)
         
         if mode in ["data", "smart"]:
             # Crop and Check DB
@@ -330,13 +357,18 @@ def process_frame(image, mode):
                 res = FACE_DB.recognize(face_crop)
                 
                 if res['match']:
-                    label_text = f"ID: {res['id']} ({res['name']})"
-                    log_entries.append(f"✅ Face #{i+1}: MATCH - {res['name']} (ID: {res['id']})")
+                    # 1. LOG GETS FULL DETAILS
+                    full_log_text = f"MATCH - {res['name']} (ID: {res['id']})"
+                    log_entries.append(f"✅ Face #{i+1}: {full_log_text}")
+                    
+                    # 2. IMAGE GETS ID ONLY
+                    img_label_text = f"ID: {res['id']}"
                 else:
-                    label_text = "Unknown"
-                    log_entries.append(f"⚠️ Face #{i+1}: UNKNOWN")
+                    full_log_text = "UNKNOWN"
+                    log_entries.append(f"⚠️ Face #{i+1}: {full_log_text}")
+                    img_label_text = "Unknown"
                     
-                identity = {"name": label_text, "color": res['color']}
+                color = res['color']
         else:
              log_entries.append(f"🔒 Face #{i+1}: Anonymized")
 
@@ -345,12 +377,14 @@ def process_frame(image, mode):
             processed_img = apply_blur(processed_img, x, y, w, h)
             
         elif mode == "data":
-            cv2.rectangle(processed_img, (x, y), (x+w, y+h), identity['color'], 2)
-            draw_label(processed_img, x, y, w, identity['name'], identity['color'], on_blur=False)
+            # Draw Box + Label (passing 'h' for smart positioning)
+            cv2.rectangle(processed_img, (x, y), (x+w, y+h), color, 2)
+            draw_label(processed_img, x, y, w, h, img_label_text, color)
             
         elif mode == "smart":
+            # Blur + Label (passing 'h' for smart positioning)
             processed_img = apply_blur(processed_img, x, y, w, h)
-            draw_label(processed_img, x, y, w, identity['name'], identity['color'], on_blur=True)
+            draw_label(processed_img, x, y, w, h, img_label_text, color)
             
     # Create Log String
     if not log_entries:
@@ -410,14 +444,13 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue"), title="Smart Redaction
     # Unified Config Info Row
     with gr.Row():
         gr.Markdown(f"**System Status:** {FACE_DB.get_stats()}")
-        gr.Markdown(f"**Config:** Hybrid Pixelate | High Sensitivity | 110% Coverage")
 
     with gr.Tabs():
         
         # --- TAB 1: RAW PRIVACY ---
         with gr.TabItem("1️⃣ Raw Privacy (Baseline)"):
             gr.Markdown("### 🔒 Total Anonymization")
-            gr.Markdown("*Scenario: GDPR Compliance. Everyone is hidden. No data is extracted.*")
+            gr.Markdown("*GDPR Compliance: Everyone is hidden. No data is extracted.*")
             
             with gr.Tabs():
                 with gr.TabItem("Image"):
@@ -437,7 +470,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue"), title="Smart Redaction
         # --- TAB 2: THE DATA LAYER ---
         with gr.TabItem("2️⃣ The Data Layer (Security)"):
             gr.Markdown("### 🔍 Recognition & Intelligence")
-            gr.Markdown("*Scenario: Security Control Room. We identify Known vs Unknown. No Privacy.*")
+            gr.Markdown("*Security Control Room. We identify Known vs Unknown. No Privacy.*")
             
             with gr.Tabs():
                 with gr.TabItem("Image"):
@@ -460,7 +493,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue"), title="Smart Redaction
         # --- TAB 3: SMART REDACTION ---
         with gr.TabItem("3️⃣ Smart Redaction (Combined)"):
             gr.Markdown("### 🛡️ Intelligent Privacy")
-            gr.Markdown("*Scenario: The Solution. Faces are blurred for privacy, but Identities are overlaid for security.*")
+            gr.Markdown("*The Solution: Faces are blurred for privacy, but Identities are overlaid for security.*")
             
             with gr.Tabs():
                 with gr.TabItem("Image"):