Update app.py

app.py

@@ -1,22 +1,13 @@
-import json
 import gradio as gr
 # import openai
 import os
 import sys
-import traceback
-import requests
-# import markdown
-import csv
+from utils import *
 
 my_api_key = ""    # 在这里输入你的 API 密钥
 HIDE_MY_KEY = False # 如果你想在UI中隐藏你的 API 密钥，将此值设置为 True
 
-initial_prompt = "You are a helpful assistant."
-API_URL = "https://api.openai.com/v1/chat/completions"
-HISTORY_DIR = "history"
-TEMPLATES_DIR = "templates"
-
-
+gr.Chatbot.postprocess = postprocess
 
 #if we are running in Docker
 if os.environ.get('dockerrun') == 'yes':
@@ -24,6 +15,8 @@ if os.environ.get('dockerrun') == 'yes':
 else:
     dockerflag = False
 
+authflag = False
+
 if dockerflag:
     my_api_key = os.environ.get('my_api_key')
     if my_api_key == "empty":
@@ -32,237 +25,19 @@ if dockerflag:
     #auth
     username = os.environ.get('USERNAME')
     password = os.environ.get('PASSWORD')
-    if isinstance(username, type(None)) or isinstance(password, type(None)):
-        authflag = False
-    else:
+    if not (isinstance(username, type(None)) or isinstance(password, type(None))):
         authflag = True
-
-
-def parse_text(text):
-    lines = text.split("\n")
-    lines = [line for line in lines if line != ""]
-    count = 0
-    firstline = False
-    for i, line in enumerate(lines):
-        if "```" in line:
-            count += 1
-            items = line.split('`')
-            if count % 2 == 1:
-                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("`", "\`")
-                    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("-", "&#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, summary_on_crash = False, stream = True):  # repetition_penalty, top_k
-
-    if summary:
-        stream = False
-
-    headers = {
-        "Content-Type": "application/json",
-        "Authorization": f"Bearer {openai_api_key}"
-    }
-
-    chat_counter = len(history) // 2
-
-    print(f"chat_counter - {chat_counter}")
-
-    messages = [compose_system(system_prompt)]
-    if chat_counter:
-        for index in range(0, 2*chat_counter, 2):
-            temp1 = {}
-            temp1["role"] = "user"
-            temp1["content"] = history[index]
-            temp2 = {}
-            temp2["role"] = "assistant"
-            temp2["content"] = history[index+1]
-            if temp1["content"] != "":
-                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(
-            "请帮我总结一下上述对话的内容，实现减少字数的同时，保证对话的质量。在总结中不要加入这一句话。"))
-    else:
-        temp3 = {}
-        temp3["role"] = "user"
-        temp3["content"] = inputs
-        messages.append(temp3)
-        chat_counter += 1
-    # messages
-    payload = {
-        "model": "gpt-3.5-turbo",
-        "messages": messages,  # [{"role": "user", "content": f"{inputs}"}],
-        "temperature": temperature,  # 1.0,
-        "top_p": top_p,  # 1.0,
-        "n": 1,
-        "stream": stream,
-        "presence_penalty": 0,
-        "frequency_penalty": 0,
-    }
-
-    if not summary:
-        history.append(inputs)
-    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)
-
-    token_counter = 0
-    partial_words = ""
-
-    counter = 0
-    if stream:
-        chatbot.append((parse_text(history[-1]), ""))
-        for chunk in response.iter_lines():
-            if counter == 0:
-                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:
-                        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
-                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):
-    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):
-    if filename == "":
-        return
-    if not filename.endswith(".json"):
-        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)
-
-
-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 = sorted([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, mode=0):
-    lines = []
-    with open(os.path.join(TEMPLATES_DIR, filename), "r", encoding="utf8") as csvfile:
-        reader = csv.reader(csvfile)
-        lines = list(reader)
-    lines = lines[1:]
-    if mode == 1:
-        return sorted([row[0] for row in lines])
-    elif mode == 2:
-        return {row[0]:row[1] 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")
-
-def reset_state():
-    return [], []
-
-
-def compose_system(system_prompt):
-    return {"role": "system", "content": system_prompt}
-
-
-def compose_user(user_input):
-    return {"role": "user", "content": user_input}
-
-
-def reset_textbox():
-    return gr.update(value='')
+else:
+    if os.path.exists("api_key.txt"):
+        with open("api_key.txt", "r") as f:
+            my_api_key = f.read().strip()
+    if os.path.exists("auth.json"):
+        with open("auth.json", "r") as f:
+            auth = json.load(f)
+            username = auth["username"]
+            password = auth["password"]
+            if username != "" and password != "":
+                authflag = True
 
 title = """<h1 align="center">川虎ChatGPT 🚀</h1>"""
 description = """<div align=center>
@@ -399,7 +174,10 @@ if dockerflag:
         demo.queue().launch(server_name="0.0.0.0", server_port=7860, share=False)
 #if not running in Docker
 else:
-    demo.queue().launch(share=False) # 改为 share=True 可以创建公开分享链接
+    if authflag:
+        demo.queue().launch(share=False, auth=(username, password))
+    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反向代理