Update app.py

app.py

@@ -122,35 +122,39 @@ def render_message(history):
     <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;">"""
 
-    seen_messages = set()  # Track (role, message) pairs to avoid duplicates
-
+    seen_messages = set()
     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))
-            user_message_html = markdown.markdown(escape_html(user_message), extensions=["fenced_code", "codehilite"])
+        if user_message and user_message not in seen_messages:
+            seen_messages.add(user_message)
+            user_message_html = escape_and_format(user_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;'>{user_message_html}</div>
+            <div style='display: flex; align-items: center; margin-bottom: 10px;'>
+                <img src='{user_pic}' style='width: 40px; height: 40px; border-radius: 50%; margin-right: 10px;'>
+                <span style='color: white; white-space: pre-wrap;'>{user_message_html}</span>
             </div>"""
 
-        if assistant_message and ("assistant", assistant_message) not in seen_messages:
-            seen_messages.add(("assistant", assistant_message))
-            assistant_message_html = markdown.markdown(escape_html(assistant_message), extensions=["fenced_code", "codehilite"])
+        if assistant_message and assistant_message not in seen_messages:
+            seen_messages.add(assistant_message)
+            assistant_message_html = escape_and_format(assistant_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;'>{assistant_message_html}</div>
+            <div style='display: flex; align-items: center; margin-bottom: 10px;'>
+                <img src='{assistant_pic}' style='width: 40px; height: 40px; border-radius: 50%; margin-right: 10px;'>
+                <span style='color: white; white-space: pre-wrap;'>{assistant_message_html}</span>
             </div>"""
 
     messages_html += "</div></div>"
     return messages_html
 
 
+def escape_and_format(text):
+    text = (
+        text.replace("**", "<b>").replace("__", "</b>") 
+        .replace("`", "<code>").replace("```", "</code>")  
+        .replace("\n", "<br>") 
+    )
+
+    return ''.join(f"&#{ord(char)};" if char not in ('<', '>', '<br>', '<b>', '</b>', '<code>', '</code>') else char for char in text)
 
-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
 
 css="""
 .chatbox {height: 400px; overflow: auto; border: 1px solid #262626; padding: 10px; background-color: #171717; display: flex;  flex-direction: column-reverse;}