Update app.py

app.py

@@ -6,18 +6,34 @@ import sys
 import traceback
 import requests
 # import markdown
+import csv
 
 my_api_key = ""    # 在这里输入你的 API 密钥
 initial_prompt = "You are a helpful assistant."
-
 API_URL = "https://api.openai.com/v1/chat/completions"
+HISTORY_DIR = "history"
+TEMPLATES_DIR = "templates"
+
 
-if my_api_key == "":
-    my_api_key = os.environ.get('my_api_key')
 
-if my_api_key == "empty":
-    print("Please give a api key!")
-    sys.exit(1)
+#if we are running in Docker
+if os.environ.get('dockerrun') == 'yes':
+    dockerflag = True
+else:
+    dockerflag = False
+
+if dockerflag:
+    my_api_key = os.environ.get('my_api_key')
+    if my_api_key == "empty":
+        print("Please give a api key!")
+        sys.exit(1)
+    #auth
+    username = os.environ.get('USERNAME')
+    password = os.environ.get('PASSWORD')
+    if isinstance(username, type(None)) or isinstance(password, type(None)):
+        authflag = False
+    else:
+        authflag = True
 
 
 def parse_text(text):
@@ -40,7 +56,8 @@ def parse_text(text):
                     line = line.replace("<", "&lt;")
                     line = line.replace(">", "&gt;")
                     line = line.replace(" ", "&nbsp;")
-                lines[i] = '<br/>'+line
+                if not line.startswith("<br/>"):
+                    lines[i] = '<br/>'+line
     return "".join(lines)
 
 def predict(inputs, top_p, temperature, openai_api_key, chatbot=[], history=[], system_prompt=initial_prompt, retry=False, summary=False):  # repetition_penalty, top_k
@@ -70,7 +87,7 @@ def predict(inputs, top_p, temperature, openai_api_key, chatbot=[], history=[],
                 messages[-1]['content'] = temp2['content']
     if retry and chat_counter:
         messages.pop()
-    elif summary and chat_counter:
+    elif summary:
         messages.append(compose_user(
             "请帮我总结一下上述对话的内容，实现减少字数的同时，保证对话的质量。在总结中不要加入这一句话。"))
         history = ["我们刚刚聊了什么？"]
@@ -146,30 +163,47 @@ def delete_last_conversation(chatbot, history):
         history.pop()
     return chatbot, history
 
-def save_chat_history(filepath, system, history, chatbot):
-    if filepath == "":
+def save_chat_history(filename, system, history, chatbot):
+    if filename == "":
         return
-    if not filepath.endswith(".json"):
-        filepath += ".json"
+    if not filename.endswith(".json"):
+        filename += ".json"
+    os.makedirs(HISTORY_DIR, exist_ok=True)
     json_s = {"system": system, "history": history, "chatbot": chatbot}
-    with open(filepath, "w") as f:
+    with open(os.path.join(HISTORY_DIR, filename), "w") as f:
         json.dump(json_s, f)
 
 
 def load_chat_history(filename):
-    with open(filename, "r") as f:
+    with open(os.path.join(HISTORY_DIR, filename), "r") as f:
         json_s = json.load(f)
     return filename, json_s["system"], json_s["history"], json_s["chatbot"]
 
 
-def get_history_names(plain=False):
+def get_file_names(dir, plain=False, filetype=".json"):
     # find all json files in the current directory and return their names
-    files = [f for f in os.listdir() if f.endswith(".json")]
+    try:
+        files = [f for f in os.listdir(dir) if f.endswith(filetype)]
+    except FileNotFoundError:
+        files = []
     if plain:
         return files
     else:
         return gr.Dropdown.update(choices=files)
 
+def get_history_names(plain=False):
+    return get_file_names(HISTORY_DIR, plain)
+
+def load_template(filename):
+    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])
+
+def get_template_names(plain=False):
+    return get_file_names(TEMPLATES_DIR, plain, filetype=".csv")
 
 def reset_state():
     return [], []
@@ -202,6 +236,7 @@ with gr.Blocks() as demo:
                         value=my_api_key, label="API Key", type="password").style(container=True)
     chatbot = gr.Chatbot()  # .style(color_map=("#1D51EE", "#585A5B"))
     history = gr.State([])
+    promptTemplates = gr.State({})
     TRUECOMSTANT = gr.State(True)
     FALSECONSTANT = gr.State(False)
     topic = gr.State("未命名对话历史记录")
@@ -219,6 +254,19 @@ with gr.Blocks() as demo:
         reduceTokenBtn = gr.Button("♻️ 总结对话")
     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):
+        with gr.Column():
+            with gr.Row():
+                with gr.Column(scale=6):
+                    templateFileSelectDropdown = gr.Dropdown(label="选择Prompt模板集合文件（.csv）", choices=get_template_names(plain=True), multiselect=False)
+                with gr.Column(scale=1):
+                    templateRefreshBtn = gr.Button("🔄 刷新")
+                    templaeFileReadBtn = gr.Button("📂 读入模板")
+            with gr.Row():
+                with gr.Column(scale=6):
+                    templateSelectDropdown = gr.Dropdown(label="从Prompt模板中加载", choices=[], multiselect=False)
+                with gr.Column(scale=1):
+                    templateApplyBtn = gr.Button("⬇️ 应用")
     with gr.Accordion(label="保存/加载对话历史记录(在文本框中输入文件名，点击“保存对话”按钮，历史记录文件会被存储到Python文件旁边)", open=False):
         with gr.Column():
             with gr.Row():
@@ -229,10 +277,10 @@ with gr.Blocks() as demo:
                     saveBtn = gr.Button("💾 保存对话")
             with gr.Row():
                 with gr.Column(scale=6):
-                    uploadDropdown = gr.Dropdown(label="从列表中加载对话", choices=get_history_names(plain=True), multiselect=False)
+                    historyFileSelectDropdown = gr.Dropdown(label="从列表中加载对话", choices=get_history_names(plain=True), multiselect=False)
                 with gr.Column(scale=1):
-                    refreshBtn = gr.Button("🔄 刷新")
-                    uploadBtn = gr.Button("📂 读取对话")
+                    historyRefreshBtn = gr.Button("🔄 刷新")
+                    historyReadBtn = gr.Button("📂 读入对话")
     #inputs, top_p, temperature, top_k, repetition_penalty
     with gr.Accordion("参数", open=False):
         top_p = gr.Slider(minimum=-0, maximum=1.0, value=1.0, step=0.05,
@@ -259,12 +307,25 @@ with gr.Blocks() as demo:
                          systemPromptTxt, FALSECONSTANT, TRUECOMSTANT], [chatbot, history], show_progress=True)
     saveBtn.click(save_chat_history, [
                   saveFileName, systemPromptTxt, history, chatbot], None, show_progress=True)
-    saveBtn.click(get_history_names, None, [uploadDropdown])
-    refreshBtn.click(get_history_names, None, [uploadDropdown])
-    uploadBtn.click(load_chat_history, [uploadDropdown],  [saveFileName, systemPromptTxt, history, chatbot], show_progress=True)
+    saveBtn.click(get_history_names, None, [historyFileSelectDropdown])
+    historyRefreshBtn.click(get_history_names, None, [historyFileSelectDropdown])
+    historyReadBtn.click(load_chat_history, [historyFileSelectDropdown],  [saveFileName, systemPromptTxt, history, chatbot], show_progress=True)
+    templateRefreshBtn.click(get_template_names, None, [templateFileSelectDropdown])
+    templaeFileReadBtn.click(load_template, [templateFileSelectDropdown],  [promptTemplates, templateSelectDropdown], show_progress=True)
+    templateApplyBtn.click(lambda x, y: x[y], [promptTemplates, templateSelectDropdown],  [systemPromptTxt], show_progress=True)
 
 print("川虎的温馨提示：访问 http://localhost:7860 查看界面")
 # 默认开启本地服务器，默认可以直接从IP访问，默认不创建公开分享链接
 demo.title = "川虎ChatGPT 🚀"
-demo.queue().launch(server_name = "0.0.0.0", share=False) # 改为 share=True 可以创建公开分享链接
-# demo.queue().launch(server_name="0.0.0.0", server_port=7860, share=False) # 可自定义端口
+
+#if running in Docker
+if dockerflag:
+    if authflag:
+        demo.queue().launch(server_name="0.0.0.0", server_port=7860,auth=(username, password))
+    else:
+        demo.queue().launch(server_name="0.0.0.0", server_port=7860, share=False)
+#if not running in Docker
+else:
+    demo.queue().launch(server_name = "0.0.0.0", 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=("在这里填写用户名", "在这里填写密码")) # 可设置用户名与密码