解决用户输入中的HTML被渲染的问题

modules/overwrites.py

@@ -30,11 +30,12 @@ def postprocess(
     """
     if y is None or y == []:
         return []
-    tag_regex = re.compile(r"^<\w+>[^<]+</\w+>")
-    if tag_regex.search(y[-1][1]):
-        y[-1] = (convert_user(y[-1][0]), y[-1][1])
-    else:
-        y[-1] = (convert_user(y[-1][0]), convert_mdtext(y[-1][1]))
+    user, bot = y[-1]
+    if not detect_converted_mark(user):
+        user = convert_asis(user)
+    if not detect_converted_mark(bot):
+        bot = convert_mdtext(bot)
+    y[-1] = (user, bot)
     return y
 
 with open("./assets/custom.js", "r", encoding="utf-8") as f, open("./assets/Kelpy-Codos.js", "r", encoding="utf-8") as f2:

modules/presets.py

@@ -100,6 +100,8 @@ Reply in {reply_language}
 If the context isn't useful, return the original answer.
 """
 
+ALREADY_CONVERTED_MARK = "<!-- ALREADY CONVERTED BY PARSER. -->"
+
 small_and_beautiful_theme = gr.themes.Soft(
         primary_hue=gr.themes.Color(
             c50="#02C160",

modules/utils.py

@@ -9,6 +9,7 @@ import hashlib
 import csv
 import requests
 import re
+import html
 
 import gradio as gr
 from pypinyin import lazy_pinyin
@@ -105,16 +106,22 @@ def convert_mdtext(md_text):
         if code.strip():
             # _, code = detect_language(code)  # 暂时去除代码高亮功能，因为在大段代码的情况下会出现问题
             # code = code.replace("\n\n", "\n") # 暂时去除代码中的空行，因为在大段代码的情况下会出现问题
-            code = f"```{code}\n\n```"
+            code = f"\n```{code}\n\n```"
             code = markdown_to_html_with_syntax_highlight(code)
             result.append(code)
     result = "".join(result)
+    result += ALREADY_CONVERTED_MARK
     return result
 
 
-def convert_user(userinput):
-    userinput = userinput.replace("\n", "<br>")
-    return f"<pre>{userinput}</pre>"
+def convert_asis(userinput):
+    return f"<pre>{html.escape(userinput)}</pre>"+ALREADY_CONVERTED_MARK
+
+def detect_converted_mark(userinput):
+    if userinput.endswith(ALREADY_CONVERTED_MARK):
+        return True
+    else:
+        return False
 
 
 def detect_language(code):