Update app.py

app.py

@@ -36,38 +36,45 @@ DEFAULT_ADMIN = "admin"
 DEFAULT_PASSWORD = "1234"
 cursor.execute("SELECT * FROM users WHERE username=?", (DEFAULT_ADMIN,))
 if not cursor.fetchone():
-    cursor.execute("INSERT INTO users(username,password_hash) VALUES (?,?)",
-                   (DEFAULT_ADMIN, hashlib.sha256(DEFAULT_PASSWORD.encode()).hexdigest()))
+    cursor.execute(
+        "INSERT INTO users(username,password_hash) VALUES (?,?)",
+        (DEFAULT_ADMIN, hashlib.sha256(DEFAULT_PASSWORD.encode()).hexdigest())
+    )
     conn.commit()
 
-# ---------------- Utility ----------------
+# ---------------- Utility Functions ----------------
 def hash_password(password):
     return hashlib.sha256(password.encode()).hexdigest()
 
 def register(username, password):
     try:
-        cursor.execute("INSERT INTO users(username,password_hash) VALUES (?,?)",
-                       (username, hash_password(password)))
+        cursor.execute(
+            "INSERT INTO users(username,password_hash) VALUES (?,?)",
+            (username, hash_password(password))
+        )
         conn.commit()
         return "Account created successfully!"
     except sqlite3.IntegrityError:
         return "Username already exists!"
 
 def login(username, password):
-    cursor.execute("SELECT * FROM users WHERE username=? AND password_hash=?",
-                   (username, hash_password(password)))
+    cursor.execute(
+        "SELECT * FROM users WHERE username=? AND password_hash=?",
+        (username, hash_password(password))
+    )
     user = cursor.fetchone()
     if user:
-        return "Login successful!", gr.update(visible=True), user[0]
+        return "Login successful!", gr.update(visible=True), gr.State.update(value=user[0])
     else:
-        return "Login failed!", gr.update(visible=False), None
+        return "Login failed!", gr.update(visible=False), gr.State.update(value=None)
 
 def send_message(sender_id, receiver_id, message):
-    timestamp = datetime.now().strftime("%H:%M:%S")
-    cursor.execute("INSERT INTO messages(sender_id,receiver_id,message,timestamp) VALUES (?,?,?,?)",
-                   (sender_id, receiver_id, message, timestamp))
+    timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    cursor.execute(
+        "INSERT INTO messages(sender_id,receiver_id,message,timestamp) VALUES (?,?,?,?)",
+        (sender_id, receiver_id, message, timestamp)
+    )
     conn.commit()
-    return ""
 
 def get_messages_html(user_id, receiver_id):
     cursor.execute("""
@@ -79,25 +86,21 @@ def get_messages_html(user_id, receiver_id):
     result = ""
     for s_id, msg, ts in msgs:
         if s_id == user_id:
-            # Your messages on the right
             result += f'<div style="text-align:right; margin:5px;"><span style="background:#DCF8C6; padding:8px; border-radius:10px; display:inline-block;">{msg} <br><small>{ts}</small></span></div>'
         else:
-            # Friend messages on the left
             result += f'<div style="text-align:left; margin:5px;"><span style="background:#FFF; padding:8px; border-radius:10px; display:inline-block;">{msg} <br><small>{ts}</small></span></div>'
-    if not result:
-        return "No messages yet."
-    return result
+    return result if result else "No messages yet."
 
 def get_all_users(exclude_id):
     cursor.execute("SELECT username FROM users WHERE id!=?", (exclude_id,))
     users = [u[0] for u in cursor.fetchall()]
     if not users:
         users = ["No other users"]
-    return gr.Dropdown.update(choices=users)
+    return users
 
-# ---------------- Gradio ----------------
+# ---------------- Gradio App ----------------
 with gr.Blocks() as demo:
-    gr.Markdown("## 💬 WhatsApp-Style Prototype")
+    gr.Markdown("## 💬 WhatsApp-Style Chat App")
 
     # Login/Register
     with gr.Row():
@@ -110,10 +113,11 @@ with gr.Blocks() as demo:
     chat_ui = gr.Column(visible=False)
     current_user_id = gr.State(value=None)
 
+    # Login/Register events
     login_btn.click(login, [username, password], [login_status, chat_ui, current_user_id])
     register_btn.click(register, [username, password], login_status)
 
-    # ---------------- Chat UI ----------------
+    # ---------------- Chat Interface ----------------
     with chat_ui:
         with gr.Row():
             receiver_dropdown = gr.Dropdown(label="Select User")
@@ -121,23 +125,29 @@ with gr.Blocks() as demo:
         send_btn = gr.Button("Send")
         chat_display = gr.HTML(label="Chat")
 
-        # Update dropdown dynamically
-        receiver_dropdown.change(get_all_users, current_user_id, receiver_dropdown)
+        # Update dropdown dynamically after login
+        def update_dropdown(user_id):
+            return gr.Dropdown.update(choices=get_all_users(user_id))
+        current_user_id.change(update_dropdown, current_user_id, receiver_dropdown)
 
-        # Send message
+        # Send message + refresh
         def send_and_refresh(sender_id, receiver, msg):
             if not receiver or not msg:
-                return ""
+                return "", gr.update(value="")
             cursor.execute("SELECT id FROM users WHERE username=?", (receiver,))
             r = cursor.fetchone()
             if not r:
-                return "Receiver not found."
+                return "Receiver not found.", gr.update(value="")
             send_message(sender_id, r[0], msg)
-            return get_messages_html(sender_id, r[0])
+            return get_messages_html(sender_id, r[0]), gr.update(value="")
 
-        send_btn.click(send_and_refresh, [current_user_id, receiver_dropdown, message_input], chat_display)
+        send_btn.click(
+            send_and_refresh,
+            [current_user_id, receiver_dropdown, message_input],
+            [chat_display, message_input]
+        )
 
-        # Real-time refresh
+        # Real-time refresh with Timer
         def refresh(user_id, receiver):
             if not receiver:
                 return ""
@@ -147,4 +157,6 @@ with gr.Blocks() as demo:
                 return "Receiver not found."
             return get_messages_html(user_id, r[0])
 
-        chat_display.render(refresh, [current_user_id, receiver_dropdown], chat_display, every=2)
+        gr.Timer(interval=2, run=refresh, inputs=[current_user_id, receiver_dropdown], outputs=chat_display)
+
+demo.launch()