Update app.py

app.py

@@ -46,12 +46,25 @@ SF_CREDENTIALS = {
 @retry(stop_max_attempt_number=3, wait_fixed=2000)
 def connect_to_salesforce():
     try:
-        sf = Salesforce(**SF_CREDENTIALS)
-        logger.info("Connected to Salesforce")
+        if SF_CREDENTIALS["instance"]:
+            sf = Salesforce(
+                username=SF_CREDENTIALS["username"],
+                password=SF_CREDENTIALS["password"],
+                security_token=SF_CREDENTIALS["security_token"],
+                instance=SF_CREDENTIALS["instance"]
+            )
+        else:
+            sf = Salesforce(
+                username=SF_CREDENTIALS["username"],
+                password=SF_CREDENTIALS["password"],
+                security_token=SF_CREDENTIALS["security_token"],
+                domain=SF_CREDENTIALS["domain"]
+            )
+        logger.info("Connected to Salesforce successfully")
         sf.describe()
         return sf
     except Exception as e:
-        logger.error(f"Salesforce connection failed: {e}")
+        logger.error(f"Salesforce connection failed: {e}. Check SF_USERNAME, SF_PASSWORD, SF_SECURITY_TOKEN, and SF_DOMAIN in .env file.")
         raise
 
 class AttendanceSystem:
@@ -69,12 +82,13 @@ class AttendanceSystem:
         self.recognition_cooldown = 5  # seconds
         self.video_file_path = None
         self.video_processing = False
+        self.min_face_size = (100, 100)  # Minimum face size for registration/recognition
 
         # Initialize Salesforce
         try:
             self.sf = connect_to_salesforce()
         except Exception as e:
-            logger.error(f"Error connecting to Salesforce: {e}")
+            logger.error(f"Failed to initialize Salesforce connection: {e}")
             self.sf = None
     
         # Create directories
@@ -178,10 +192,22 @@ class AttendanceSystem:
         image_array = np.array(image)
     
         try:
+            # Verify face and size
             face_analysis = DeepFace.analyze(img_path=image_array, actions=['emotion'], enforce_detection=True, detector_backend='opencv')
+            faces = DeepFace.extract_faces(img_path=image_array, target_size=(160, 160), enforce_detection=False, detector_backend='opencv')
+            if not faces or faces[0]['facial_area']['w'] < self.min_face_size[0] or faces[0]['facial_area']['h'] < self.min_face_size[1]:
+                return "❌ Face too small or not clear enough (must be at least 100x100 pixels)!", self.get_registered_workers_info()
         
             embedding = DeepFace.represent(img_path=image_array, model_name='Facenet')[0]['embedding']
         
+            # Check for duplicate face
+            if len(self.known_face_embeddings) > 0:
+                distances = [np.linalg.norm(np.array(embedding) - np.array(known_embedding)) 
+                            for known_embedding in self.known_face_embeddings]
+                if min(distances) < 10:
+                    best_match_index = distances.index(min(distances))
+                    return f"❌ Face already registered as {self.known_face_names[best_match_index]} (ID: {self.known_face_ids[best_match_index]})!", self.get_registered_workers_info()
+        
             name = name.strip().title()
             if name in self.known_face_names:
                 return f"❌ {name} is already registered!", self.get_registered_workers_info()
@@ -215,6 +241,7 @@ class AttendanceSystem:
                         logger.warning("Image URL not set due to upload failure")
                 except Exception as e:
                     logger.error(f"Error saving to Salesforce: {e}")
+                    return f"❌ Error saving to Salesforce: {e}. Check connection and permissions.", self.get_registered_workers_info()
         
             self.save_data()
         
@@ -227,14 +254,28 @@ class AttendanceSystem:
         except Exception as e:
             return f"❌ Error during registration: {str(e)}", self.get_registered_workers_info()
 
-    def register_worker_auto(self, face_image: np.ndarray) -> Tuple[Optional[str], Optional[str]]:
+    def register_worker_auto(self, face_image: np.ndarray, face_area: dict) -> Tuple[Optional[str], Optional[str]]:
         """Automatic worker registration for unrecognized faces"""
         try:
-            worker_id = f"W{self.next_worker_id:04d}"
-            worker_name = f"Unknown_Worker_{self.next_worker_id}"
+            # Verify face size
+            if face_area['w'] < self.min_face_size[0] or face_area['h'] < self.min_face_size[1]:
+                logger.info("Face too small for registration (must be at least 100x100 pixels)")
+                return None, None
         
             embedding = DeepFace.represent(img_path=face_image, model_name='Facenet')[0]['embedding']
         
+            # Check for duplicate face
+            if len(self.known_face_embeddings) > 0:
+                distances = [np.linalg.norm(np.array(embedding) - np.array(known_embedding)) 
+                            for known_embedding in self.known_face_embeddings]
+                if min(distances) < 10:
+                    best_match_index = distances.index(min(distances))
+                    logger.info(f"Face already registered as {self.known_face_names[best_match_index]} (ID: {self.known_face_ids[best_match_index]})")
+                    return self.known_face_ids[best_match_index], self.known_face_names[best_match_index]
+        
+            worker_id = f"W{self.next_worker_id:04d}"
+            worker_name = f"Unknown_Worker_{self.next_worker_id}"
+        
             face_pil = Image.fromarray(cv2.cvtColor(face_image, cv2.COLOR_BGR2RGB))
             caption = self.get_image_caption(face_pil)
         
@@ -326,6 +367,10 @@ class AttendanceSystem:
                     face_area = face_obj['facial_area']
                     x, y, w, h = face_area['x'], face_area['y'], face_area['w'], face_area['h']
                 
+                    # Check face size
+                    if w < self.min_face_size[0] or h < self.min_face_size[1]:
+                        continue
+                
                     face_image = frame[y:y+h, x:x+w]
                 
                     try:
@@ -353,13 +398,14 @@ class AttendanceSystem:
                                     self.last_recognition_time[worker_id] = current_time
                             else:
                                 if face_image.size > 0:
-                                    new_id, new_name = self.register_worker_auto(face_image)
+                                    new_id, new_name = self.register_worker_auto(face_image, face_area)
                                     if new_id:
                                         worker_id = new_id
                                         worker_name = new_name
                                         color = (255, 165, 0)
                                         logger.info(f"New worker registered: {new_name} ({new_id})")
-                                        self.mark_attendance(worker_id, worker_name)
+                                        if self.mark_attendance(worker_id, worker_name):
+                                            logger.info(f"Attendance marked for new worker {worker_name} ({worker_id})")
                     
                         cv2.rectangle(frame, (x, y), (x+w, y+h), color, 2)
                         cv2.rectangle(frame, (x, y+h - 35), (x+w, y+h), color, cv2.FILLED)
@@ -481,7 +527,7 @@ class AttendanceSystem:
 
     def get_registered_workers_info(self) -> str:
         if not self.sf:
-            return "❌ Salesforce connection not established."
+            return "❌ Salesforce connection not established. Check credentials in .env file and ensure user has access to Worker__c and ContentVersion objects."
     
         try:
             workers = self.sf.query_all("SELECT Name, Worker_ID__c, Image_Caption__c, Image_URL__c FROM Worker__c")['records']
@@ -509,7 +555,7 @@ class AttendanceSystem:
 
     def get_today_attendance(self) -> str:
         if not self.sf:
-            return "❌ Salesforce connection not established."
+            return "❌ Salesforce connection not established. Check credentials in .env file and ensure user has access to Attendance__c object."
     
         today = date.today().isoformat()
         try:
@@ -553,7 +599,7 @@ class AttendanceSystem:
             return "Invalid date format. Please use YYYY-MM-DD."
     
         if not self.sf:
-            return "❌ Salesforce connection not established."
+            return "❌ Salesforce connection not established. Check credentials in .env file and ensure user has access to Attendance__c object."
     
         try:
             records = self.sf.query_all(
@@ -659,7 +705,7 @@ def create_interface():
             ## 🚀 **Key Features:**
             - **🎥 Live Camera Recognition** - Real-time face detection from camera/CCTV
             - **📹 Video File Processing** - Process pre-recorded videos for attendance
-            - **🤖 Automatic Worker Registration** - Auto-register unknown faces with unique IDs
+            - **🤖 Automatic Worker Registration** - Auto-register unknown faces with unique IDs in Salesforce
             - **👤 Manual Registration** - Register workers manually with photos and AI-generated captions
             - **📅 24-Hour Attendance Rule** - One attendance mark per worker per day
             - **📊 Advanced Analytics** - Detailed reports and data export