Update app.py

app.py

@@ -48,34 +48,36 @@ def parse_text(text):
             count += 1
             items = line.split('`')
             if count % 2 == 1:
-                lines[i] = f'<pre><code class="{items[-1]}" style="display: block; white-space: pre; padding: 0 1em 1em 1em; color: #fff; background: #000;">'
+                lines[i] = f'<pre><code class="{items[-1]}">'
                 firstline = True
             else:
                 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("\'", "`\'`")
+                    # line = line.replace("&", "&amp;")
                     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;")
+                    line = line.replace("$", "&#36;")
                 lines[i] = "<br>"+line
     text = "".join(lines)
     return text
 
-def predict(inputs, top_p, temperature, openai_api_key, chatbot=[], history=[], system_prompt=initial_prompt, retry=False, summary=False):  # repetition_penalty, top_k
+def predict(inputs, top_p, temperature, openai_api_key, chatbot=[], history=[], system_prompt=initial_prompt, retry=False, summary=False, summary_on_crash = False, stream = True):  # repetition_penalty, top_k
 
-    print(f"chatbot 1: {chatbot}")
+    if summary:
+        stream = False
 
     headers = {
         "Content-Type": "application/json",
@@ -88,24 +90,25 @@ def predict(inputs, top_p, temperature, openai_api_key, chatbot=[], history=[],
 
     messages = [compose_system(system_prompt)]
     if chat_counter:
-        for data in chatbot:
+        for index in range(0, 2*chat_counter, 2):
             temp1 = {}
             temp1["role"] = "user"
-            temp1["content"] = data[0]
+            temp1["content"] = history[index]
             temp2 = {}
             temp2["role"] = "assistant"
-            temp2["content"] = data[1]
+            temp2["content"] = history[index+1]
             if temp1["content"] != "":
-                messages.append(temp1)
-                messages.append(temp2)
+                if temp2["content"] != "" or retry:
+                    messages.append(temp1)
+                    messages.append(temp2)
             else:
                 messages[-1]['content'] = temp2['content']
     if retry and chat_counter:
         messages.pop()
     elif summary:
+        history = [*[i["content"] for i in messages[-2:]], "我们刚刚聊了什么？"]
         messages.append(compose_user(
             "请帮我总结一下上述对话的内容，实现减少字数的同时，保证对话的质量。在总结中不要加入这一句话。"))
-        history = ["我们刚刚聊了什么？"]
     else:
         temp3 = {}
         temp3["role"] = "user"
@@ -119,61 +122,82 @@ def predict(inputs, top_p, temperature, openai_api_key, chatbot=[], history=[],
         "temperature": temperature,  # 1.0,
         "top_p": top_p,  # 1.0,
         "n": 1,
-        "stream": True,
+        "stream": stream,
         "presence_penalty": 0,
         "frequency_penalty": 0,
     }
 
     if not summary:
         history.append(inputs)
-    print(f"payload is - {payload}")
+    else:
+        print("精简中...")
     # make a POST request to the API endpoint using the requests.post method, passing in stream=True
     response = requests.post(API_URL, headers=headers,
                              json=payload, stream=True)
-    #response = requests.post(API_URL, headers=headers, json=payload, stream=True)
 
     token_counter = 0
     partial_words = ""
 
     counter = 0
-    chatbot.append((history[-1], ""))
-    for chunk in response.iter_lines():
-        if counter == 0:
+    if stream:
+        chatbot.append((parse_text(history[-1]), ""))
+        for chunk in response.iter_lines():
+            if counter == 0:
+                counter += 1
+                continue
             counter += 1
-            continue
-        counter += 1
-        # check whether each line is non-empty
-        if chunk:
-            # decode each line as response data is in bytes
-            try:
-                if len(json.loads(chunk.decode()[6:])['choices'][0]["delta"]) == 0:
+            # check whether each line is non-empty
+            if chunk:
+                # decode each line as response data is in bytes
+                try:
+                    if len(json.loads(chunk.decode()[6:])['choices'][0]["delta"]) == 0:
+                        break
+                except Exception as e:
+                    traceback.print_exc()
+                    print("Context 过长，正在尝试精简……")
+                    chatbot.pop()
+                    chatbot, history, status_text = next(predict(inputs, top_p, temperature, openai_api_key, chatbot, history, system_prompt, retry, summary=True, summary_on_crash=True, stream=False))
+                    yield chatbot, history, status_text
+                    if not "ERROR" in status_text:
+                        print("精简完成，正在尝试重新生成……")
+                        yield next(predict(inputs, top_p, temperature, openai_api_key, chatbot, history, system_prompt, retry, summary=False, summary_on_crash=True, stream=False))
+                    else:
+                        print("精简出错了，可能是网络原因。")
                     break
-            except Exception as e:
-                chatbot.pop()
-                chatbot.append((history[-1], f"☹️发生了错误<br>返回值：{response.text}<br>异常：{e}"))
-                history.pop()
-                yield chatbot, history
-                break
-            #print(json.loads(chunk.decode()[6:])['choices'][0]["delta"]    ["content"])
-            partial_words = partial_words + \
-                json.loads(chunk.decode()[6:])[
-                    'choices'][0]["delta"]["content"]
-            if token_counter == 0:
-                history.append(" " + partial_words)
-            else:
-                history[-1] = parse_text(partial_words)
-            chatbot[-1] = (history[-2], history[-1])
-        #   chat = [(history[i], history[i + 1]) for i in range(0, len(history)     - 1, 2) ]  # convert to tuples of list
-            token_counter += 1
-            # resembles {chatbot: chat,     state: history}
-            yield chatbot, history
+                chunkjson = json.loads(chunk.decode()[6:])
+                status_text = f"id: {chunkjson['id']}, finish_reason: {chunkjson['choices'][0]['finish_reason']}"
+                partial_words = partial_words + \
+                    json.loads(chunk.decode()[6:])[
+                        'choices'][0]["delta"]["content"]
+                if token_counter == 0:
+                    history.append(" " + partial_words)
+                else:
+                    history[-1] = partial_words
+                chatbot[-1] = (parse_text(history[-2]), parse_text(history[-1]))
+                token_counter += 1
+                yield chatbot, history, status_text
+    else:
+        try:
+            responsejson = json.loads(response.text)
+            content = responsejson["choices"][0]["message"]["content"]
+            history.append(content)
+            chatbot.append((parse_text(history[-2]), parse_text(content)))
+            status_text = "精简完成"
+        except:
+            chatbot.append((parse_text(history[-1]), "☹️发生了错误，请检查网络连接或者稍后再试。"))
+            status_text = "status: ERROR"
+        yield chatbot, history, status_text
 
 
 
 def delete_last_conversation(chatbot, history):
-    chatbot.pop()
+    if "☹️发生了错误" in chatbot[-1][1]:
+        chatbot.pop()
+        print(history)
+        return chatbot, history
     history.pop()
     history.pop()
+    print(history)
     return chatbot, history
 
 def save_chat_history(filename, system, history, chatbot):
@@ -183,6 +207,7 @@ def save_chat_history(filename, system, history, chatbot):
         filename += ".json"
     os.makedirs(HISTORY_DIR, exist_ok=True)
     json_s = {"system": system, "history": history, "chatbot": chatbot}
+    print(json_s)
     with open(os.path.join(HISTORY_DIR, filename), "w") as f:
         json.dump(json_s, f)
 
@@ -190,13 +215,14 @@ def save_chat_history(filename, system, history, chatbot):
 def load_chat_history(filename):
     with open(os.path.join(HISTORY_DIR, filename), "r") as f:
         json_s = json.load(f)
+    print(json_s)
     return filename, json_s["system"], json_s["history"], json_s["chatbot"]
 
 
 def get_file_names(dir, plain=False, filetype=".json"):
     # find all json files in the current directory and return their names
     try:
-        files = [f for f in os.listdir(dir) if f.endswith(filetype)]
+        files = sorted([f for f in os.listdir(dir) if f.endswith(filetype)])
     except FileNotFoundError:
         files = []
     if plain:
@@ -207,13 +233,16 @@ def get_file_names(dir, plain=False, filetype=".json"):
 def get_history_names(plain=False):
     return get_file_names(HISTORY_DIR, plain)
 
-def load_template(filename):
+def load_template(filename, plain=False):
     lines = []
     with open(os.path.join(TEMPLATES_DIR, filename), "r", encoding="utf8") as csvfile:
         reader = csv.reader(csvfile)
         lines = list(reader)
     lines = lines[1:]
-    return {row[0]:row[1] for row in lines}, gr.Dropdown.update(choices=[row[0] for row in lines])
+    if plain:
+        return sorted([row[0] for row in lines])
+    else:
+        return {row[0]:row[1] for row in lines}, gr.Dropdown.update(choices=sorted([row[0] for row in lines]))
 
 def get_template_names(plain=False):
     return get_file_names(TEMPLATES_DIR, plain, filetype=".csv")
@@ -236,14 +265,41 @@ def reset_textbox():
 title = """<h1 align="center">川虎ChatGPT 🚀</h1>"""
 description = """<div align=center>
 
-由Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) 开发
+由Bilibili [土川虎虎虎](https://space.bilibili.com/29125536) 和 [明昭MZhao](https://space.bilibili.com/24807452)开发
 
 访问川虎ChatGPT的 [GitHub项目](https://github.com/GaiZhenbiao/ChuanhuChatGPT) 下载最新版脚本
 
 此App使用 `gpt-3.5-turbo` 大语言模型
 </div>
 """
-with gr.Blocks() as demo:
+customCSS = """
+code {
+    display: inline;
+    white-space: break-spaces;
+    border-radius: 6px;
+    margin: 0 2px 0 2px;
+    padding: .2em .4em .1em .4em;
+    background-color: rgba(175,184,193,0.2);
+}
+pre {
+    display: block;
+    white-space: pre;
+    background-color: hsla(0, 0%, 0%, 72%);
+    border: solid 5px var(--color-border-primary) !important;
+    border-radius: 8px;
+    padding: 0 1.2rem 1.2rem;
+    margin-top: 1em !important;
+    color: #FFF;
+    box-shadow: inset 0px 8px 16px hsla(0, 0%, 0%, .2)
+}
+pre code, pre code code {
+    background-color: transparent !important;
+    margin: 0;
+    padding: 0;
+}
+"""
+
+with gr.Blocks(css=customCSS) as demo:
     gr.HTML(title)
     gr.HTML('''<center><a href="https://huggingface.co/spaces/JohnSmith9982/ChuanhuChatGPT?duplicate=true"><img src="https://bit.ly/3gLdBN6" alt="复制 Space"></a>强烈建议点击上面的按钮复制一份这个Space，在你自己的Space里运行，响应更迅速、也更安全👆</center>''')
     keyTxt = gr.Textbox(show_label=True, placeholder=f"在这里输入你的OpenAI API-key...",
@@ -266,6 +322,7 @@ with gr.Blocks() as demo:
         retryBtn = gr.Button("🔄 重新生成")
         delLastBtn = gr.Button("🗑️ 删除上条对话")
         reduceTokenBtn = gr.Button("♻️ 总结对话")
+    statusDisplay = gr.Markdown("status: ready")
     systemPromptTxt = gr.Textbox(show_label=True, placeholder=f"在这里输入System Prompt...",
                                  label="System prompt", value=initial_prompt).style(container=True)
     with gr.Accordion(label="加载Prompt模板", open=False):
@@ -278,7 +335,7 @@ with gr.Blocks() as demo:
                     templaeFileReadBtn = gr.Button("📂 读入模板")
             with gr.Row():
                 with gr.Column(scale=6):
-                    templateSelectDropdown = gr.Dropdown(label="从Prompt模板中加载", choices=[], multiselect=False)
+                    templateSelectDropdown = gr.Dropdown(label="从Prompt模板中加载", choices=load_template(get_template_names(plain=True)[0], plain=True), multiselect=False)
                 with gr.Column(scale=1):
                     templateApplyBtn = gr.Button("⬇️ 应用")
     with gr.Accordion(label="保存/加载对话历史记录(在文本框中输入文件名，点击“保存对话”按钮，历史记录文件会被存储到Python文件旁边)", open=False):
@@ -307,18 +364,18 @@ with gr.Blocks() as demo:
 
 
     txt.submit(predict, [txt, top_p, temperature, keyTxt,
-               chatbot, history, systemPromptTxt], [chatbot, history])
+               chatbot, history, systemPromptTxt], [chatbot, history, statusDisplay])
     txt.submit(reset_textbox, [], [txt])
     submitBtn.click(predict, [txt, top_p, temperature, keyTxt, chatbot,
-                    history, systemPromptTxt], [chatbot, history], show_progress=True)
+                    history, systemPromptTxt], [chatbot, history, statusDisplay], show_progress=True)
     submitBtn.click(reset_textbox, [], [txt])
     emptyBtn.click(reset_state, outputs=[chatbot, history])
     retryBtn.click(predict, [txt, top_p, temperature, keyTxt, chatbot, history,
-                   systemPromptTxt, TRUECOMSTANT], [chatbot, history], show_progress=True)
+                   systemPromptTxt, TRUECOMSTANT], [chatbot, history, statusDisplay], show_progress=True)
     delLastBtn.click(delete_last_conversation, [chatbot, history], [
                      chatbot, history], show_progress=True)
     reduceTokenBtn.click(predict, [txt, top_p, temperature, keyTxt, chatbot, history,
-                         systemPromptTxt, FALSECONSTANT, TRUECOMSTANT], [chatbot, history], show_progress=True)
+                         systemPromptTxt, FALSECONSTANT, TRUECOMSTANT], [chatbot, history, statusDisplay], show_progress=True)
     saveBtn.click(save_chat_history, [
                   saveFileName, systemPromptTxt, history, chatbot], None, show_progress=True)
     saveBtn.click(get_history_names, None, [historyFileSelectDropdown])
@@ -343,3 +400,4 @@ else:
     demo.queue().launch(share=False) # 改为 share=True 可以创建公开分享链接
     #demo.queue().launch(server_name="0.0.0.0", server_port=7860, share=False) # 可自定义端口
     #demo.queue().launch(server_name="0.0.0.0", server_port=7860,auth=("在这��填写用户名", "在这里填写密码")) # 可设置用户名与密码
+    #demo.queue().launch(auth=("在这里填写用户名", "在这里填写密码")) # 适合Nginx反向代理