updated models

app/Hackathon_setup/face_recognition.py

@@ -23,18 +23,11 @@ from sklearn.preprocessing import StandardScaler
 # Current_path stores absolute path of the file from where it runs. 
 current_path = os.path.dirname(os.path.abspath(__file__))
 
-# Simple fallback classifier for sklearn compatibility issues
-def create_fallback_classifier(current_features):
-    """Creates a simple fallback classifier that just returns Person1 for now"""
-    class FallbackClassifier:
-        def predict(self, X):
-            # For now, just return Person1 (index 0) for all predictions
-            # This is a temporary workaround
-            return [0] * len(X)
-    
-    print("[WARNING] Using fallback classifier - will always predict Person1")
-    print("[WARNING] Please retrain and save classifier with compatible sklearn version")
-    return FallbackClassifier()
+# Simple error handling for missing models
+def handle_missing_model(error_msg):
+    """Helper function to handle missing model files"""
+    print(f"[ERROR] {error_msg}")
+    return "Unknown"
 
 #1) The below function is used to detect faces in the given image.
 #2) It returns only one image which has maximum area out of all the detected faces in the photo.
@@ -154,61 +147,27 @@ def get_face_class(img1):
                 print(f"[DEBUG] Extracted features shape: {features_np.shape}")
             
             # Load the classifier and scaler
-            classifier_path = current_path + '/face_recognition_classifier.pkl'
-            classifier_path_v2 = current_path + '/face_recognition_classifier_v2.pkl'
-            classifier_path_joblib = current_path + '/face_recognition_classifier_joblib.pkl'
             simple_classifier_path = current_path + '/simple_face_classifier.pkl'
             scaler_path = current_path + '/face_recognition_scaler.pkl'
             
             print(f"[DEBUG] Looking for classifier files:")
-            print(f"[DEBUG] Original: {os.path.exists(classifier_path)}")
-            print(f"[DEBUG] V2: {os.path.exists(classifier_path_v2)}")
-            print(f"[DEBUG] Joblib: {os.path.exists(classifier_path_joblib)}")
-            print(f"[DEBUG] Simple: {os.path.exists(simple_classifier_path)}")
+            print(f"[DEBUG] Simple classifier: {os.path.exists(simple_classifier_path)}")
             print(f"[DEBUG] Scaler: {os.path.exists(scaler_path)}")
             
             classifier = None
-            # Try to load classifier in order of preference
+            # Try to load the simple classifier
             try:
                 if os.path.exists(simple_classifier_path):
                     print("[DEBUG] Loading simple custom classifier...")
-                    import pickle
                     with open(simple_classifier_path, 'rb') as f:
                         classifier = pickle.load(f)
                     print("[DEBUG] Simple classifier loaded successfully")
-                elif os.path.exists(classifier_path_v2):
-                    print("[DEBUG] Loading v2 classifier...")
-                    import pickle
-                    with open(classifier_path_v2, 'rb') as f:
-                        classifier = pickle.load(f)
-                    print("[DEBUG] V2 classifier loaded successfully")
-                elif os.path.exists(classifier_path_joblib):
-                    print("[DEBUG] Loading joblib classifier...")
-                    classifier = joblib.load(classifier_path_joblib)
-                    print("[DEBUG] Joblib classifier loaded successfully")
-                elif os.path.exists(classifier_path):
-                    print("[DEBUG] Loading original classifier...")
-                    try:
-                        classifier = joblib.load(classifier_path)
-                        print("[DEBUG] Original classifier loaded successfully")
-                    except AttributeError as sklearn_error:
-                        if 'EuclideanDistance64' in str(sklearn_error):
-                            print("[WARNING] sklearn version compatibility issue detected!")
-                            print("[WARNING] Creating fallback distance-based classifier...")
-                            # Create a simple fallback classifier
-                            classifier = create_fallback_classifier(features_np)
-                        else:
-                            raise sklearn_error
                 else:
                     print("[ERROR] No classifier file found!")
                     return "Unknown"
             except Exception as classifier_error:
-                if 'EuclideanDistance64' in str(classifier_error):
-                    print("[WARNING] sklearn compatibility issue - using fallback classifier")
-                    classifier = create_fallback_classifier(features_np)
-                else:
-                    print(f"[ERROR] Failed to load classifier: {classifier_error}")
-                    return "Unknown"
+                print(f"[ERROR] Failed to load classifier: {classifier_error}")
+                return handle_missing_model("Failed to load classifier")
             
             if classifier is not None:
                 # Load the scaler used during training

app/Hackathon_setup/face_recognition_classifier.pkl

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab2cb40f8723c0eb1c00724ecd6ad410252bde054d140eb87b052789dfeb2ba9
-size 2326
+oid sha256:553fc0f0033fe377470c3f4235b209bfcab2d14e85421c54005979a74b1b05b8
+size 535

app/Hackathon_setup/face_recognition_classifier_joblib.pkl

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ab2cb40f8723c0eb1c00724ecd6ad410252bde054d140eb87b052789dfeb2ba9
-size 2326

app/Hackathon_setup/face_recognition_classifier_v2.pkl

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f03af7986bfe5048e5fc0e053e9fb57f3443a5900ec5eaacc67626f3a787b858
-size 2034

app/Hackathon_setup/face_recognition_scaler.pkl

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:814c85400b6877b93468ea0b12a992e56b789c540626b470609372f1ae8e0d54
+oid sha256:b5cf2a5316f974e017e272dda77c54e5ebd786463d1a0fbe44e6f58f916fe7b6
 size 719

app/Hackathon_setup/simple_face_classifier.pkl

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c906e1a570a8e4f76adebac192f6f4dddb14c3aa49601e575b8e58221b0dd109
-size 535