Update app.py

app.py

@@ -119,51 +119,64 @@ def respond(message, api_key, max_tokens, top_p, temperature):
 
 
 
-import markdown
-import bleach
-
-# Allowed Markdown and HTML tags
-allowed_tags = [
-    "p", "strong", "em", "ul", "ol", "li", "a", "code", "pre", "br", "blockquote", "h1", "h2", "h3", "h4", "h5", "h6"
-]
-allowed_attributes = {
-    "a": ["href", "title"],
-    "img": ["src", "alt", "title", "width", "height"]
-}
 
 def render_message(history):
     messages_html = """
     <div id="chatbox-container" class="chatbox" style="height: 400px; overflow: auto; border: 1px solid #262626; padding: 10px; background-color: #171717; display: flex; flex-direction: column-reverse;">
         <div id="messages" style="display: block; margin-bottom: 10px;">"""
 
-    for message_tuple in history:
-        if len(message_tuple) >= 4:
-            user_message, assistant_message, user_pic, assistant_pic = message_tuple[:4]  # Safely unpack first 4 items
-
-            if user_message:
-                sanitized_message = bleach.clean(user_message, tags=allowed_tags, attributes=allowed_attributes, strip=True)
-                rendered_message = markdown.markdown(sanitized_message)
-                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;'>
-                    <div style='color: white; white-space: pre-wrap;'>{rendered_message}</div>
-                </div>"""
-
-            if assistant_message:
-                sanitized_message = bleach.clean(assistant_message, tags=allowed_tags, attributes=allowed_attributes, strip=True)
-                rendered_message = markdown.markdown(sanitized_message)
-                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;'>
-                    <div style='color: white; white-space: pre-wrap;'>{rendered_message}</div>
-                </div>"""
-        else:
-            print(f"Skipping invalid entry in history: {message_tuple}")
+    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'
+    ]
+    allowed_attributes = {
+        '*': ['class', 'style'],
+        'a': ['href', 'title'],
+        '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(
+                user_message,  # Process markdown
+                extensions=["fenced_code", "codehilite"]
+            )
+            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;'>
+                <div style='color: white; white-space: pre-wrap;'>{user_message_html}</div>
+            </div>"""
+
+        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(
+                assistant_message,  # Process markdown
+                extensions=["fenced_code", "codehilite"]
+            )
+            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;'>
+                <div style='color: white; white-space: pre-wrap;'>{assistant_message_html}</div>
+            </div>"""
 
     messages_html += "</div></div>"
     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