auth

app.py

@@ -22,7 +22,7 @@ import re
 import transformers
 import spaces
 import requests
-from urllib.parse import urlencode, urlparse, parse_qs
+from urllib.parse import urlencode
 
 # Initialize embeddings and ChromaDB
 model_name = "sentence-transformers/all-mpnet-base-v2"
@@ -120,16 +120,13 @@ def exchange_code_for_token(auth_code):
     }
     
     response = requests.post(TOKEN_URL, data=data)
+    
     if response.status_code == 200:
         token_data = response.json()
-        return token_data.get('access_token')
-    return None
-
-def handle_redirect(auth_code):
-    token = exchange_code_for_token(auth_code)
-    if token:
-        return True  # Successful login
-    return False  # Failed login
+        access_token = token_data.get('access_token')
+        return access_token
+    else:
+        return None
 
 def login_user(auth_code):
     # Exchange the authorization code for an access token
@@ -168,39 +165,34 @@ def chat(query, history=None):
 def clear_input():
     return "",  # Return empty string to clear input field
 
-# Gradio interface
 with gr.Blocks() as interface:
     gr.Markdown("## RAG Chatbot")
     gr.Markdown("Please log in to continue.")
     
-    login_status = gr.Textbox(label="Login Status", visible=False)
+    # Custom HTML to show login link
+    login_link = gr.HTML(f'<a href="{login_url}" target="_blank">Click here to login with Microsoft</a>')
+
+    # Login button to simulate the login process
+    login_button = gr.Button("Login")
     
     # Components for chat (initially hidden)
     input_box = gr.Textbox(label="Enter your question", placeholder="Type your question here...", visible=False)
     submit_btn = gr.Button("Submit", visible=False)
     chat_history = gr.Chatbot(label="Chat History", visible=False)
 
-    # Button for login
-    login_button = gr.Button("Click here to login with Microsoft")
-    
-    # Handle the login button click
-    login_button.click(lambda: gr.update(visible=False), inputs=[], outputs=[login_button])
-    
-    # Function to handle the redirect
-    def on_redirect(url):
-        # Extract the authorization code from the URL
-        parsed_url = urlparse(url)
-        query_params = parse_qs(parsed_url.query)
-        auth_code = query_params.get('code')
-        
-        if auth_code:
-            if handle_redirect(auth_code[0]):  # Pass the first code if there are multiple
-                return gr.update(visible=True), gr.update(visible=True), gr.update(visible=True)
-            else:
-                return gr.update(value="Login failed."),  # Show failure message
+    # Handle login button click
+    login_button.click(
+        login_user, 
+        inputs=[], 
+        outputs=[login_button],  # You can also update the UI to show login status
+        queue=False
+    ).then(
+        lambda token: check_login(is_logged_in(token)), 
+        inputs=[], 
+        outputs=[input_box, submit_btn]
+    )
 
     # Input submission and chat handling
     submit_btn.click(chat, inputs=[input_box, chat_history], outputs=[chat_history, input_box])
 
-# Add an event listener to check for redirects in the Gradio interface (this might require running an additional server)
 interface.launch()