Update app.py

app.py

@@ -8,20 +8,21 @@ import numpy as np
 import cv2
 import dlib
 
-# Firebase Realtime Database initialization
+# Get the current working directory
 current_directory = os.path.dirname(os.path.abspath(__file__))
 skp_path = os.path.join(current_directory, "projectinsta-s-firebase-adminsdk-y6vlu-9a1345f468.json")
 
+# Check if the app is already initialized
 if not firebase_admin._apps:
+    # Initialize Firebase Admin SDK
     cred = credentials.Certificate(skp_path)
     firebase_admin.initialize_app(cred, {
         'databaseURL': 'https://projectinsta-s-default-rtdb.firebaseio.com/',
         'projectId': 'projectinsta-s'
     })
 
+# Reference to the root of your Firebase Realtime Database
 ref = db.reference('/')
-encodings_ref = ref.child('encodings')  # Node to store encodings
-messages_ref = ref.child('messages')  # Node to store chat messages
 
 # Streamlit session state
 if "auth_state" not in st.session_state:
@@ -36,20 +37,27 @@ detector = dlib.get_frontal_face_detector()
 shape_predictor = dlib.shape_predictor(shape_predictor_path)
 
 # Firebase Authentication
-def authenticate_user(email, password):
+def authenticate_user(email_or_username, password):
     try:
-        user = auth.get_user_by_email(email)
+        # Check if the input is an email
+        if "@" in email_or_username:
+            user = auth.get_user_by_email(email_or_username)
+        else:
+            # If not an email, assume it's a username
+            user = auth.get_user_by_email(email_or_username + "@example.com")  # Assuming the username is unique and we append a dummy domain
+        # The user is successfully fetched, meaning the email/username and password are valid.
         return True, user
     except auth.AuthError as e:
         print(f"Authentication error: {str(e)}")
         return False, None
         
 # Sign-up Functionality
-def create_user(email, password):
+def create_user(email, username, password):
     try:
         user = auth.create_user(
             email=email,
-            password=password
+            password=password,
+            display_name=username  # Using display_name to store the username
         )
         return True, user.uid
     except Exception as e:
@@ -78,6 +86,7 @@ def load_and_encode(image_path):
 def detect_and_align_faces(image_path):
     image = face_recognition.load_image_file(image_path)
     
+    # Resize the image to a fixed width (you can adjust the width as needed)
     target_width = 800
     aspect_ratio = image.shape[1] / image.shape[0]
     target_height = int(target_width / aspect_ratio)
@@ -85,15 +94,18 @@ def detect_and_align_faces(image_path):
 
     gray = cv2.cvtColor(resized_image, cv2.COLOR_BGR2GRAY)
     
+    # Detect faces using dlib
     faces = detector(gray)
 
     if not faces:
         return None
 
+    # Use the first face found (you can modify this to handle multiple faces)
     face = faces[0]
     
+    # Use dlib for face alignment
     landmarks = shape_predictor(gray, face)
-    aligned_face = dlib.get_face_chip(resized_image, landmarks, size=256)
+    aligned_face = dlib.get_face_chip(resized_image, landmarks, size=256)  # Adjust the size as needed
     
     return aligned_face
 
@@ -104,9 +116,11 @@ def add_person(name, image_path, instagram_handle):
         if not encoding:
             return "No face found in the provided image."
 
+        # Convert NumPy arrays to lists for JSON serialization
         encoding = encoding[0].tolist()
 
-        encodings_ref.child(name).set({
+        # Save data to Firebase Realtime Database
+        ref.child(name).set({
             "encoding": encoding,
             "info": {
                 "instagram_handle": instagram_handle,
@@ -129,7 +143,7 @@ def recognize_face(image_path):
             return "No face found in the provided image."
 
         matches = []
-        for name, data in encodings_ref.get().items():
+        for name, data in ref.get().items():
             known_encoding = np.array(data["encoding"])
             if face_recognition.compare_faces([known_encoding], unknown_encoding[0])[0]:
                 matches.append((name, data["info"]))
@@ -158,7 +172,7 @@ def recognize_face_optimal(image_path):
             return "No face found in the provided image."
 
         matches = []
-        for name, data in encodings_ref.get().items():
+        for name, data in ref.get().items():
             known_encoding = np.array(data["encoding"])
             similarity_score = face_recognition.face_distance([known_encoding], unknown_encoding[0])[0]
             matches.append((name, similarity_score))
@@ -166,7 +180,7 @@ def recognize_face_optimal(image_path):
         if matches:
             best_match = min(matches, key=lambda x: x[1])
             best_name, best_score = best_match
-            info = encodings_ref.child(best_name).child("info").get()
+            info = ref.child(best_name).child("info").get()
             insta_handle = info["instagram_handle"]
             insta_link = info["instagram_link"]
             insta_link_html = f'<a href="{insta_link}" target="_blank"><font color="red">{insta_handle}</font></a>'
@@ -179,46 +193,11 @@ def recognize_face_optimal(image_path):
 # Delete person from database
 def delete_person(name):
     try:
-        encodings_ref.child(name).delete()
+        ref.child(name).delete()
         return f"{name} deleted from the database!"
     except Exception as e:
         return f"Failed to delete person: {str(e)}"
 
-# Function to send message to Firebase Realtime Database
-def send_message(sender_email, receiver_email, message):
-    try:
-        sender_ref = messages_ref.child(sender_email).child(receiver_email)
-        receiver_ref = messages_ref.child(receiver_email).child(sender_email)
-        
-        sender_ref.push().set({
-            'sender_email': sender_email,
-            'message': message
-        })
-        
-        receiver_ref.push().set({
-            'sender_email': sender_email,
-            'message': message
-        })
-        
-        return True
-    except Exception as e:
-        print(f"Failed to send message: {str(e)}")
-        return False
-
-# Function to get messages from Firebase Realtime Database
-def get_messages(sender_email, receiver_email):
-    try:
-        sender_ref = messages_ref.child(sender_email).child(receiver_email)
-        receiver_ref = messages_ref.child(receiver_email).child(sender_email)
-        
-        sender_messages = sender_ref.get()
-        receiver_messages = receiver_ref.get()
-        
-        return sender_messages, receiver_messages
-    except Exception as e:
-        print(f"Failed to get messages: {str(e)}")
-        return None, None
-
 # Streamlit interface for adding a person
 def add_person_ui():
     st.title("Add Person")
@@ -247,7 +226,7 @@ def recognize_face_optimal_ui():
     if st.button("Recognize Face (Optimal)"):
         result = recognize_face_optimal(image_path)
         st.write(result, unsafe_allow_html=True)
-
+        
 # Streamlit interface for deleting a person
 def delete_person_ui():
     st.title("Delete Person")
@@ -259,6 +238,10 @@ def delete_person_ui():
             result = delete_person(name)
             st.success(result)
 
+def tour_guide_ui():
+    st.title("Tour Guide")
+    display_tour_steps(steps)
+
 # Streamlit interface for user authentication
 def authenticate_user_ui():
     st.title("Insta's EYE")
@@ -271,13 +254,13 @@ def authenticate_user_ui():
     else:
         option = st.sidebar.radio("Select Option", ["Login", "Sign-Up"])
 
-        email = st.text_input("Enter Email", help="Enter your email address")
-        password = st.text_input("Enter Password", type="password", help="Enter your password")
-
         if option == "Login":
+            st.write("## Login")
+            email = st.text_input("Email or Username", help="Enter your email address or username")
+            password = st.text_input("Password", type="password", help="Enter your password")
             if st.button("Login"):
                 if not email or not password:
-                    st.error("Please enter both email and password.")
+                    st.error("Please enter both email/username and password.")
                 else:
                     success, user = authenticate_user(email, password)
                     if success:
@@ -286,12 +269,15 @@ def authenticate_user_ui():
                         st.success("Authentication successful! You can now manage your set of images and profiles.")
                         main()
                     else:
-                        st.error("Authentication failed. Please check your email and password.")
-
+                        st.error("Authentication failed. Please check your email/username and password.")
         elif option == "Sign-Up":
+            st.write("## Sign-Up")
+            email = st.text_input("Email", help="Enter your email address")
+            username = st.text_input("Username", help="Enter your desired username")
+            password = st.text_input("Password", type="password", help="Enter your password")
             confirm_password = st.text_input("Confirm Password", type="password", help="Re-enter your password for confirmation")
             if st.button("Sign-Up"):
-                if not email or not password or not confirm_password:
+                if not email or not username or not password or not confirm_password:
                     st.error("Please fill all the fields.")
                 elif password != confirm_password:
                     st.error("Passwords do not match.")
@@ -307,35 +293,56 @@ def logout():
     st.session_state.auth_state["user"] = None
     st.session_state.auth_state["signed_in"] = False
 
-# Streamlit interface for chat
-def chat_ui():
-    st.title("Chat")
-    sender_email = st.session_state.auth_state["user"].email
-    receiver_email = st.text_input("Receiver's Email", help="Enter the receiver's email address")
-    message = st.text_input("Type your message", help="Type your message here")
-    if st.button("Send"):
-        if not message or not receiver_email:
-            st.error("Please enter both a message and the receiver's email.")
-        else:
-            if send_message(sender_email, receiver_email, message):
-                st.success("Message sent successfully!")
-            else:
-                st.error("Failed to send message.")
-
-    st.title("Messages")
-    sender_messages, receiver_messages = get_messages(sender_email, receiver_email)
-    if sender_messages:
-        for key, value in sender_messages.items():
-            st.write(f"{value['sender_email']}: {value['message']}")
-    if receiver_messages:
-        for key, value in receiver_messages.items():
-            st.write(f"{value['sender_email']}: {value['message']}")
-
-# Update the main function to include the chat UI option
+# Define tour steps
+steps = [
+    {
+        "element": "h1",
+        "title": "Welcome to Insta's EYE",
+        "content": "This is a tour guide to help you navigate through the application.",
+    },
+    {
+        "element": '[aria-label="Select Option"]',
+        "title": "Options Sidebar",
+        "content": "Here you can select different options such as adding a person, recognizing a face, deleting a person, or recognizing a face with optimal identification.",
+    },
+    {
+        "element": "div[class='element-container']",
+        "title": "Main Interface",
+        "content": "This is where the main functionality of the application is displayed.",
+    },
+    {
+        "element": "[data-testid='stFileUploader']",
+        "title": "Upload Image",
+        "content": "You can upload an image here for face recognition or adding a person.",
+    },
+    {
+        "element": "[data-testid='stTextInput']",
+        "title": "Text Input",
+        "content": "Enter text here such as the person's name or Instagram handle.",
+    },
+    {
+        "element": "[data-testid='stButton']",
+        "title": "Buttons",
+        "content": "Click on these buttons to perform actions like adding a person or recognizing a face.",
+    },
+]
+    
+# Function to display tour steps
+def display_tour_steps(steps):
+    st.markdown("# Tour Guide")
+    st.markdown("This tour will guide you through the application.")
+    st.markdown("---")
+
+    for step in steps:
+        st.markdown(f"## {step['title']}")
+        st.write(step['content'])
+        st.markdown("---")
+    
+# Update the main function to include the new option
 def main():
     st.sidebar.title("Options")
-    option = st.sidebar.radio("Select Option", ["Tour Guide", "Add Person", "Recognize Face", "Delete Person", "Recognize Face (Optimal)", "Chat"])
-
+    option = st.sidebar.radio("Select Option", ["Tour Guide", "Add Person", "Recognize Face", "Delete Person", "Recognize Face (Optimal)"])
+    
     if option == "Tour Guide":
         tour_guide_ui()
     elif option == "Add Person":
@@ -346,9 +353,7 @@ def main():
         delete_person_ui()
     elif option == "Recognize Face (Optimal)":
         recognize_face_optimal_ui()
-    elif option == "Chat":
-        chat_ui()
 
-# Run the application
+# Run the tour guide
 if __name__ == "__main__":
-    authenticate_user_ui()
+    authenticate_user_ui()