Update app.py

app.py

@@ -127,8 +127,10 @@ def render_message(history):
 
     seen_messages = set()  # Track (role, message) pairs to avoid duplicates
 
+    # Tags and attributes explicitly allowed
     allowed_tags = [
-        'p', 'strong', 'em', 'ul', 'ol', 'li', 'a', 'code', 'pre', 'br', 'blockquote', 'hr', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'img'
+        'p', 'strong', 'em', 'ul', 'ol', 'li', 'a', 'code', 'pre', 'br', 'blockquote', 'hr', 
+        'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'img'
     ]
     allowed_attributes = {
         '*': ['class', 'style'],
@@ -136,14 +138,18 @@ def render_message(history):
         'img': ['src', 'alt', 'title', 'width', 'height']
     }
 
+    # Iterate through history and render each message
     for user_message, assistant_message, user_profile, assistant_profile, user_pic, assistant_pic in history:
         if user_message and ("user", user_message) not in seen_messages:
             seen_messages.add(("user", user_message))
+            # Render markdown -> sanitize output
             user_message_html = markdown.markdown(
-                escape_html(user_message),
+                user_message,  # Process markdown
                 extensions=["fenced_code", "codehilite"]
             )
-            user_message_html = bleach.clean(user_message_html, tags=allowed_tags, attributes=allowed_attributes, strip=True)
+            user_message_html = bleach.clean(
+                user_message_html, tags=allowed_tags, attributes=allowed_attributes, strip=True
+            )
             messages_html += f"""
             <div style='display: flex; flex-direction: column; align-items: flex-start; margin-bottom: 10px;'>
                 <img src='{user_pic}' style='width: 40px; height: 40px; border-radius: 50%; margin-bottom: 5px;'>
@@ -152,11 +158,14 @@ def render_message(history):
 
         if assistant_message and ("assistant", assistant_message) not in seen_messages:
             seen_messages.add(("assistant", assistant_message))
+            # Render markdown -> sanitize output
             assistant_message_html = markdown.markdown(
-                escape_html(assistant_message),
+                assistant_message,  # Process markdown
                 extensions=["fenced_code", "codehilite"]
             )
-            assistant_message_html = bleach.clean(assistant_message_html, tags=allowed_tags, attributes=allowed_attributes, strip=True)
+            assistant_message_html = bleach.clean(
+                assistant_message_html, tags=allowed_tags, attributes=allowed_attributes, strip=True
+            )
             messages_html += f"""
             <div style='display: flex; flex-direction: column; align-items: flex-start; margin-bottom: 10px;'>
                 <img src='{assistant_pic}' style='width: 40px; height: 40px; border-radius: 50%; margin-bottom: 5px;'>
@@ -167,6 +176,7 @@ def render_message(history):
     return messages_html
 
 
+
 def escape_html(unsafe_text):
     escaped_text = ''.join(f"&#{ord(char)};" if char not in ('\n', '\r') else '<br>' for char in unsafe_text)
     return escaped_text
@@ -269,35 +279,30 @@ with gr.Blocks(css=css) as demo:
     
     
     def authorize_and_proceed(user, api_key):
-        auth_result = authorize(user, api_key, PRIMARY_SYSTEM_INSTRUCTIONS)
+        if authorize(user, api_key, PRIMARY_SYSTEM_INSTRUCTIONS):
+            gr.Info("Loading, please wait.")
+            messages_html, history = load_conversation(api_key)
 
-        if auth_result == 403:  
             return (
-                gr.update(visible=False),  
-                gr.update(visible=False), 
-                gr.update(visible=True),   
-                [],                       
+            gr.update(visible=False), 
+            gr.update(visible=True),  
+            messages_html,
+            history
             )
-        elif auth_result: 
-            gr.Info("Loading, please wait.")
-            messages_html, history = load_conversation(api_key)
+        elif authorize(user, api_key, PRIMARY_SYSTEM_INSTRUCTIONS) == 403: 
             return (
                 gr.update(visible=False),  
-                gr.update(visible=True),   
-                gr.update(visible=False),  
-                messages_html,            
-                history                    
+                gr.update(visible=False), 
+                gr.update(visible=True), 
             )
         else:
+            gr.Warning("Incorrect userid/token")
             return (
-                gr.update(visible=True),   
-                gr.update(visible=False),
-                gr.update(visible=False),  
-                "",                        
-                []                        
+                gr.update(visible=True),  
+                gr.update(visible=False), 
+                auth_status.update(value="Invalid userid/token")
             )
 
-
     def save_custom_instructions(api_key, custom_instructions):
         if api_key in sessions:
             gr.Info("Instructions updated, we recommend to start the new conversation to make it more efficient.")
@@ -310,7 +315,7 @@ with gr.Blocks(css=css) as demo:
 
     
 
-    auth_button.click(authorize_and_proceed, inputs=[api_user_input, api_key_input], outputs=[auth_view, chat_view, blacklist_view, chatbot_output, history_state])
+    auth_button.click(authorize_and_proceed, inputs=[api_user_input, api_key_input], outputs=[auth_view, chat_view, chatbot_output, history_state])
     save_instructions_btn.click(save_custom_instructions, inputs=[api_key_input, system_instructions_input], outputs=auth_status)
     demo.launch(show_api=False)
 if __name__ == "__main__":