update code block

app.py

@@ -16,6 +16,8 @@ user_key = ""    # 在这里输入你的 API 密钥
 # password = os.environ.get('pass')
 
 API_URL = "https://api.openai.com/v1/chat/completions"
+API_URL = "https://openai.hex.im/v1/chat/completions"
+API_URL = "https://yuns.deno.dev/v1/chat/completions"
 HISTORY_DIR = "history"
 TEMPLATES_DIR = "templates"
 
@@ -25,9 +27,7 @@ def gen_sys_prompt():
     tz = pytz.timezone('Asia/Shanghai')
     now = datetime.datetime.now(tz)
     timestamp = now.strftime("%Y年%m月%d日 %H:%M:%S")
-    sys_prompt = f"""现在是{timestamp}，因此有些答案可能已经过时。
-你的目的是如实解答用户问题，对于不知道的问题，你需要回复你不知道。
-表格的效果展示直接以HTML格式输出而非markdown格式。"""
+    sys_prompt = f"你的目的是如实解答用户问题，对于不知道的问题，你需要回复你不知道。现在是{timestamp}，有些信息可能已经过时。表格的效果展示直接以HTML格式输出而非markdown格式。"
     return sys_prompt
 
 # get timestamp
@@ -147,42 +147,44 @@ if dockerflag:
 def parse_text(text):
     lines = text.split("\n")
     lines = [line for line in lines if line != ""]
-    count = 0
-    firstline = False
+    count = 0 # locate the start & end of the code block
+    in_code_block = False  # track if we're currently in a code block
+
     for i, line in enumerate(lines):
+
+        # code block indicator
         if "```" in line:
             count += 1
             items = line.split('`')
-            if count % 2 == 1:
+            if count % 2 == 1: # start
                 lines[i] = f"<pre><code class='language-{items[-1]}'>"
-                firstline = True
-            else:
+                in_code_block = True
+            else: # end
                 lines[i] = f'</code></pre>'
-        else:
-            if i > 0:
-                if count % 2 == 1:
-                    line = line.replace("&", "&amp;")
-                    # line = line.replace("\"", "`\"`")
-                    # line = line.replace("\'", "`\'`")
-                    line = line.replace("<", "&lt;")
-                    line = line.replace(">", "&gt;")
-                    line = line.replace(" ", "&nbsp;")
-                    line = line.replace("*", "&ast;")
-                    line = line.replace("_", "&lowbar;")
-                    line = line.replace("#", "&#35;")
-                    line = line.replace("-", "&#45;")
-                    line = line.replace(".", "&#46;")
-                    line = line.replace("!", "&#33;")
-                    line = line.replace("(", "&#40;")
-                    line = line.replace(")", "&#41;")
-                lines[i] = line + "\n"
-    text = "".join(lines)[:-1]
+                in_code_block = False
+        
+        # normal text
+        elif in_code_block:
+            line = line.replace("&", "&amp;")
+            # line = line.replace("\"", "`\"`")
+            # line = line.replace("\'", "`\'`")
+            line = line.replace("<", "&lt;")
+            line = line.replace(">", "&gt;")
+            line = line.replace(" ", "&nbsp;")
+            line = line.replace("*", "&ast;")
+            line = line.replace("_", "&lowbar;")
+            line = line.replace("#", "&#35;")
+            line = line.replace("-", "&#45;")
+            line = line.replace(".", "&#46;")
+            line = line.replace("!", "&#33;")
+            line = line.replace("(", "&#40;")
+            line = line.replace(")", "&#41;")
+            lines[i] = line + "<br>"
+
+    text = "".join(lines)
     return text
 
 
-# 事件：发送消息
-# def sent_message(inputs, top_p, temperature, max_tokens, user_key, session_id, chat_id, chatbot=[], history=[], system_prompt=gen_sys_prompt, regenerate=False, summary=False):
-
 
 # 请求API
 def openai_request(inputs, top_p, temperature, max_tokens, user_key, session_id, chat_id, chatbot=[], history=[], system_prompt=gen_sys_prompt, regenerate=False, summary=False):  # repetition_penalty, top_k
@@ -319,9 +321,9 @@ def openai_request(inputs, top_p, temperature, max_tokens, user_key, session_id,
                 chat_id=chat_id,
                 api_key=api_key,
                 round=chat_round,
-                system=system_prompt.replace("'","\'").replace('"','\"'),
-                user=inputs.replace("'","\'").replace('"','\"'),
-                assistant=history_write,
+                system=system_prompt.replace("'","\'").replace('"','\"').replace('\n',''),
+                user=inputs.replace("'","\'").replace('"','\"').replace('\n',''),
+                assistant=history_write.replace('\n',''),
                 messages='',
                 payload=paras,
                 username=logged_in_user

styles.css

@@ -10,11 +10,14 @@ footer {visibility: hidden;}
 /* 表格 */
 table {
     margin: 1em 0;
-    border-collapse: collapse;
+    border-collapse: separate;
+    border-spacing: 0px 0px;
+    border: 1px solid #333;
     empty-cells: show;
+    width: 100%;
 }
 td,th {
-    border: 1.2px solid #697070 !important;
+    border: 1px solid #697070 !important;
     padding: 0.2em;
 }
 thead {
@@ -23,6 +26,9 @@ thead {
 thead th {
     padding: .5em .2em;
 }
+tbody td {
+    text-indent: .5em;
+}
 /* 行内代码 */
 code {
     display: inline;