Update auth.py

auth.py

@@ -2,7 +2,6 @@ import json
 from huggingface_hub import HfApi, hf_hub_download
 from werkzeug.security import generate_password_hash, check_password_hash
 import gradio as gr
-from datetime import datetime
 
 def register_user(username, password, logged_in_username, auth_globals):
     hf_token = auth_globals["hf_token"]
@@ -10,7 +9,7 @@ def register_user(username, password, logged_in_username, auth_globals):
     hf_api = HfApi(token=hf_token)
 
     if not username or not password:
-        return logged_in_username, "Please enter username and password.", gr.update(visible=bool(logged_in_username)), gr.update(visible=False), gr.update(visible=False)
+        return logged_in_username, "Please enter username and password.", gr.update(visible=bool(logged_in_username))
 
     try:
         # Check if user exists
@@ -21,19 +20,14 @@ def register_user(username, password, logged_in_username, auth_globals):
                 repo_type="dataset",
                 token=hf_token
             )
-            return logged_in_username, "User already exists!", gr.update(visible=bool(logged_in_username)), gr.update(visible=False), gr.update(visible=False)
+            return logged_in_username, "User already exists!", gr.update(visible=bool(logged_in_username))
         except:
             pass
 
-        # Create default chat
         user_data = {
             "password": generate_password_hash(password),
-            "chats": {
-                "default": []
-            },
-            "current_chat": "default"
+            "history": []
         }
-
         hf_api.upload_file(
             path_or_fileobj=json.dumps(user_data).encode('utf-8'),
             path_in_repo=f"{username}.json",
@@ -41,11 +35,10 @@ def register_user(username, password, logged_in_username, auth_globals):
             repo_type="dataset",
             token=hf_token
         )
-
-        return username, "Registration successful! Logged in.", gr.update(visible=True), gr.update(choices=["default"], visible=True), gr.update(choices=["default"], visible=True)
-
+        # Auto-login
+        return username, "Registration successful! Logged in.", gr.update(visible=True)
     except Exception as e:
-        return logged_in_username, f"Registration failed: {str(e)}", gr.update(visible=bool(logged_in_username)), gr.update(visible=False), gr.update(visible=False)
+        return logged_in_username, f"Registration failed: {str(e)}", gr.update(visible=bool(logged_in_username))
 
 def login_user(username, password, logged_in_username, auth_globals):
     hf_token = auth_globals["hf_token"]
@@ -53,7 +46,7 @@ def login_user(username, password, logged_in_username, auth_globals):
     hf_api = HfApi(token=hf_token)
 
     if not username or not password:
-        return [], "default", logged_in_username, "Please enter username and password.", gr.update(visible=bool(logged_in_username)), gr.update(visible=False), gr.update(visible=False)
+        return [], logged_in_username, "Please enter username and password.", gr.update(visible=bool(logged_in_username))
 
     try:
         user_file = hf_hub_download(
@@ -62,39 +55,24 @@ def login_user(username, password, logged_in_username, auth_globals):
             repo_type="dataset",
             token=hf_token
         )
-
         with open(user_file, 'r') as f:
             data = json.load(f)
-
         if check_password_hash(data["password"], password):
-            current_chat = data.get("current_chat", "default")
-            chats = list(data["chats"].keys())
-            return (
-                data["chats"].get(current_chat, []),
-                current_chat,
-                username,
-                "Login successful!",
-                gr.update(visible=True),
-                gr.update(choices=chats, visible=True),
-                gr.update(choices=chats, visible=True)
-            )
+            return data["history"], username, "Login successful!", gr.update(visible=True)
         else:
-            return [], "default", logged_in_username, "Incorrect password.", gr.update(visible=bool(logged_in_username)), gr.update(visible=False), gr.update(visible=False)
-
+            return [], logged_in_username, "Incorrect password.", gr.update(visible=bool(logged_in_username))
     except Exception as e:
-        return [], "default", logged_in_username, f"Login failed: {str(e)}", gr.update(visible=bool(logged_in_username)), gr.update(visible=False), gr.update(visible=False)
+        return [], logged_in_username, f"Login failed: {str(e)}", gr.update(visible=bool(logged_in_username))
 
 def logout_user():
-    return [], "default", None, "Logged out successfully!", gr.update(visible=False), gr.update(visible=False), gr.update(visible=False)
+    return [], None, "Logged out successfully!", gr.update(visible=False)
 
-def save_history(username, history, current_chat, auth_globals):
+def save_history(username, history, auth_globals):
     if not username:
         return "No user logged in!"
-
     hf_token = auth_globals["hf_token"]
     user_repo = auth_globals["user_repo"]
     hf_api = HfApi(token=hf_token)
-
     try:
         user_file = hf_hub_download(
             repo_id=user_repo,
@@ -102,12 +80,9 @@ def save_history(username, history, current_chat, auth_globals):
             repo_type="dataset",
             token=hf_token
         )
-
         with open(user_file, 'r') as f:
             data = json.load(f)
-
-        data["chats"][current_chat] = history
-
+        data["history"] = history
         hf_api.upload_file(
             path_or_fileobj=json.dumps(data).encode('utf-8'),
             path_in_repo=f"{username}.json",
@@ -117,105 +92,4 @@ def save_history(username, history, current_chat, auth_globals):
         )
         return "History saved!"
     except Exception as e:
-        return f"Failed to save history: {str(e)}"
-
-def create_new_chat(username, current_chat, new_chat_name, auth_globals):
-    if not username:
-        return current_chat, "No user logged in!", []
-
-    hf_token = auth_globals["hf_token"]
-    user_repo = auth_globals["user_repo"]
-    hf_api = HfApi(token=hf_token)
-
-    try:
-        user_file = hf_hub_download(
-            repo_id=user_repo,
-            filename=f"{username}.json",
-            repo_type="dataset",
-            token=hf_token
-        )
-
-        with open(user_file, 'r') as f:
-            data = json.load(f)
-
-        if not new_chat_name:
-            new_chat_name = f"Chat {datetime.now().strftime('%Y-%m-%d %H:%M')}"
-
-        if new_chat_name in data["chats"]:
-            return current_chat, f"Chat '{new_chat_name}' already exists!", data["chats"][current_chat]
-
-        data["chats"][new_chat_name] = []
-        data["current_chat"] = new_chat_name
-
-        hf_api.upload_file(
-            path_or_fileobj=json.dumps(data).encode('utf-8'),
-            path_in_repo=f"{username}.json",
-            repo_id=user_repo,
-            repo_type="dataset",
-            token=hf_token
-        )
-
-        return new_chat_name, f"Created new chat: {new_chat_name}", []
-
-    except Exception as e:
-        return current_chat, f"Failed to create chat: {str(e)}", data["chats"][current_chat]
-
-def switch_chat(username, current_chat, target_chat, auth_globals):
-    if not username:
-        return current_chat, "No user logged in!", []
-
-    hf_token = auth_globals["hf_token"]
-    user_repo = auth_globals["user_repo"]
-    hf_api = HfApi(token=hf_token)
-
-    try:
-        user_file = hf_hub_download(
-            repo_id=user_repo,
-            filename=f"{username}.json",
-            repo_type="dataset",
-            token=hf_token
-        )
-
-        with open(user_file, 'r') as f:
-            data = json.load(f)
-
-        if target_chat not in data["chats"]:
-            return current_chat, f"Chat '{target_chat}' doesn't exist!", data["chats"][current_chat]
-
-        data["current_chat"] = target_chat
-
-        hf_api.upload_file(
-            path_or_fileobj=json.dumps(data).encode('utf-8'),
-            path_in_repo=f"{username}.json",
-            repo_id=user_repo,
-            repo_type="dataset",
-            token=hf_token
-        )
-
-        return target_chat, f"Switched to chat: {target_chat}", data["chats"][target_chat]
-
-    except Exception as e:
-        return current_chat, f"Failed to switch chat: {str(e)}", data["chats"][current_chat]
-
-def get_chat_list(username, auth_globals):
-    if not username:
-        return []
-
-    hf_token = auth_globals["hf_token"]
-    user_repo = auth_globals["user_repo"]
-
-    try:
-        user_file = hf_hub_download(
-            repo_id=user_repo,
-            filename=f"{username}.json",
-            repo_type="dataset",
-            token=hf_token
-        )
-
-        with open(user_file, 'r') as f:
-            data = json.load(f)
-
-        return list(data["chats"].keys())
-
-    except Exception:
-        return []
+        return f"Failed to save history: {str(e)}"