update using gr.ChatInterface

app.py

@@ -50,6 +50,43 @@ provider_dict = {
     'GetGpt': GetGpt
 }
 
+def change_prompt_set(prompt_set_name):
+    return gr.Dropdown.update(choices=list(prompt_set_list[prompt_set_name].keys()))
+
+def change_prompt(prompt_set_name, prompt_name):
+    return gr.update(value=prompt_set_list[prompt_set_name][prompt_name])
+
+def user(user_message, history):
+    return gr.update(value="", interactive=False), history + [[user_message, None]]
+
+def bot(message, history, model_name, provider_name, system_msg):
+    response = ''
+
+    if len(system_msg)>3000:
+        system_msg = system_msg[:2000] + system_msg[-1000:]
+
+    global template, memory
+    llm.model_name = model_name
+    llm.provider_name = provider_name
+    prompt = PromptTemplate(
+                        input_variables=["chat_history", "human_input"], template=template.format(system_instruction=system_msg)
+                    )
+    llm_chain = LLMChain(
+                        llm=llm,
+                        prompt=prompt,
+                        verbose=False,
+                        memory=memory,
+                    )
+    bot_msg = llm_chain.run(message)
+    for c in bot_msg:
+        response += c
+        yield response
+
+def empty_chat():
+    global memory
+    memory = ConversationBufferWindowMemory(k=10, memory_key="chat_history")
+    return None
+
 prompt_set_list = {}
 for prompt_file in os.listdir("prompt_set"):
     key = prompt_file
@@ -76,88 +113,24 @@ with gr.Blocks() as demo:
     Chatbot:"""
 
     memory = ConversationBufferWindowMemory(k=10, memory_key="chat_history")
-
-    chatbot = gr.Chatbot([[None, None]], label='AI')
-    msg = gr.Textbox(value="", label='请输入：')
     with gr.Row():
-        clear = gr.Button("清空对话", scale=2)
-        chat_mode = gr.Checkbox(value=True, label='聊天模式', interactive=True, scale=1)
+        model_name = gr.Dropdown(['gpt-3.5-turbo', 'gpt-4'], value='gpt-3.5-turbo', label='模型')
+        provider = gr.Dropdown(provider_dict.keys(), value='GetGpt', label='提供者', min_width=20)
     system_msg = gr.Textbox(value="你是一名助手，可以解答问题。", label='系统提示')
+    gr.ChatInterface(bot,
+                     additional_inputs=[
+                                model_name,
+                                provider,
+                                system_msg]
+                    )
     with gr.Row():
         default_prompt_set = "1 中文提示词.json"
         prompt_set_name = gr.Dropdown(prompt_set_list.keys(), value=default_prompt_set, label='提示词集合')
         prompt_name = gr.Dropdown(prompt_set_list[default_prompt_set].keys(), label='提示词', min_width=20)
-    with gr.Row():
-        model_name = gr.Dropdown(['gpt-3.5-turbo', 'gpt-4'], value='gpt-3.5-turbo', label='模型')
-        provider_name  =  gr.Dropdown(provider_dict.keys(), value='GetGpt', label='提供者', min_width=20)
-
-    def change_prompt_set(prompt_set_name):
-        return gr.Dropdown.update(choices=list(prompt_set_list[prompt_set_name].keys()))
-
-    def change_prompt(prompt_set_name, prompt_name):
-        return gr.update(value=prompt_set_list[prompt_set_name][prompt_name])
 
-    def user(user_message, history):
-        return gr.update(value="", interactive=False), history + [[user_message, None]]
-
-    def bot(history, model_name, provider_name, system_msg, chat_mode):
-        history[-1][1] = ''
-        if len(system_msg)>3000:
-            system_msg = system_msg[:2000] + system_msg[-1000:]
-
-        if chat_mode:
-            global template, memory
-            llm.model_name = model_name
-            llm.provider_name = provider_name
-            prompt = PromptTemplate(
-                                input_variables=["chat_history", "human_input"], template=template.format(system_instruction=system_msg)
-                            )
-            llm_chain = LLMChain(
-                                llm=llm,
-                                prompt=prompt,
-                                verbose=False,
-                                memory=memory,
-                            )
-            bot_msg = llm_chain.run(history[-1][0])
-            for c in bot_msg:
-                history[-1][1] += c
-            yield history
-        else:
-            prompt = """
-            请你仔细阅读以下提示，然后针对用户的话进行回答。
-            提示：
-            ```
-            {}
-            ```
-            用户最新的话：
-            ```
-            {}
-            ```
-            请回答：
-            """
-            bot_msg = g4f.ChatCompletion.create(model=model_name, 
-                                            provider=provider_dict[provider_name], 
-                                            messages=[{"role": "user", 
-                                                        "content": prompt.format(system_msg,
-                                                                                history[-1][0])}],
-                                            stream=True)
-            for c in bot_msg:
-                history[-1][1] += c
-            yield history
-
-    def empty_chat():
-        global memory
-        memory = ConversationBufferWindowMemory(k=10, memory_key="chat_history")
-        return None
-    response = msg.submit(user, [msg, chatbot], [msg, chatbot], queue=False).then(
-        bot, [chatbot, model_name, provider_name, system_msg, chat_mode], chatbot
-    )
     prompt_set_name.select(change_prompt_set, prompt_set_name, prompt_name)
     prompt_name.select(change_prompt, [prompt_set_name, prompt_name], system_msg)
 
-    response.then(lambda: gr.update(interactive=True), None, [msg], queue=False)
-    clear.click(empty_chat, None, [chatbot], queue=False)
-
 demo.title = "AI Chat"
 demo.queue()
 demo.launch()