合并冲突，加入更多语言

ChuanhuChatbot.py

@@ -169,6 +169,12 @@ with gr.Blocks(
                         label="实时传输回答", value=True, visible=enable_streaming_option
                     )
                     use_websearch_checkbox = gr.Checkbox(label="使用在线搜索", value=False)
+                    language_select_dropdown = gr.Dropdown(
+                        label="选择回复语言（针对搜索&索引功能）",
+                        choices=REPLY_LANGUAGES,
+                        multiselect=False,
+                        value=REPLY_LANGUAGES[0]
+                        )
                     index_files = gr.Files(label="上传索引文件", type="file", multiple=True)
 
                 with gr.Tab(label="Prompt"):
@@ -289,6 +295,7 @@ with gr.Blocks(
             model_select_dropdown,
             use_websearch_checkbox,
             index_files,
+            language_select_dropdown,
         ],
         outputs=[chatbot, history, status_display, token_count],
         show_progress=True,
@@ -340,6 +347,7 @@ with gr.Blocks(
             temperature,
             use_streaming_checkbox,
             model_select_dropdown,
+            language_select_dropdown,
         ],
         [chatbot, history, status_display, token_count],
         show_progress=True,
@@ -364,6 +372,7 @@ with gr.Blocks(
             temperature,
             gr.State(0),
             model_select_dropdown,
+            language_select_dropdown,
         ],
         [chatbot, history, status_display, token_count],
         show_progress=True,

modules/chat_func.py

@@ -264,9 +264,12 @@ def predict(
     selected_model=MODELS[0],
     use_websearch=False,
     files = None,
+    reply_language="中文",
     should_check_token_count=True,
 ):  # repetition_penalty, top_k
     logging.info("输入为：" + colorama.Fore.BLUE + f"{inputs}" + colorama.Style.RESET_ALL)
+    if reply_language == "跟随问题语言（不稳定）":
+        reply_language = "the same language as the question, such as English, 中文, 日本語, Español, Français, or Deutsch."
     if files:
         msg = "构建索引中……（这可能需要比较久的时间）"
         logging.info(msg)
@@ -274,7 +277,7 @@ def predict(
         index = construct_index(openai_api_key, file_src=files)
         msg = "索引构建完成，获取回答中……"
         yield chatbot+[(inputs, "")], history, msg, all_token_counts
-        history, chatbot, status_text = chat_ai(openai_api_key, index, inputs, history, chatbot)
+        history, chatbot, status_text = chat_ai(openai_api_key, index, inputs, history, chatbot, reply_language)
         yield chatbot, history, status_text, all_token_counts
         return
 
@@ -294,6 +297,7 @@ def predict(
             replace_today(WEBSEARCH_PTOMPT_TEMPLATE)
             .replace("{query}", inputs)
             .replace("{web_results}", "\n\n".join(web_results))
+            .replace("{reply_language}", reply_language )
         )
     else:
         link_references = ""
@@ -399,6 +403,7 @@ def retry(
     temperature,
     stream=False,
     selected_model=MODELS[0],
+    reply_language="中文",
 ):
     logging.info("重试中……")
     if len(history) == 0:
@@ -418,6 +423,7 @@ def retry(
         temperature,
         stream=stream,
         selected_model=selected_model,
+        reply_language=reply_language,
     )
     logging.info("重试中……")
     for x in iter:
@@ -435,6 +441,7 @@ def reduce_token_size(
     temperature,
     max_token_count,
     selected_model=MODELS[0],
+    reply_language="中文",
 ):
     logging.info("开始减少token数量……")
     iter = predict(
@@ -448,6 +455,7 @@ def reduce_token_size(
         temperature,
         selected_model=selected_model,
         should_check_token_count=False,
+        reply_language=reply_language,
     )
     logging.info(f"chatbot: {chatbot}")
     flag = False
@@ -463,4 +471,4 @@ def reduce_token_size(
             sum(token_count) if len(token_count) > 0 else 0,
         ), token_count
     logging.info(msg)
-    logging.info("减少token数量完毕")
+    logging.info("减少token数量完毕")

modules/llama_func.py

@@ -102,6 +102,7 @@ def chat_ai(
     question,
     context,
     chatbot,
+    reply_language,
 ):
     os.environ["OPENAI_API_KEY"] = api_key
 
@@ -116,6 +117,7 @@ def chat_ai(
         SIM_K,
         INDEX_QUERY_TEMPRATURE,
         context,
+        reply_language,
     )
     if response is None:
         status_text = "查询失败，请换个问法试试"
@@ -139,6 +141,7 @@ def ask_ai(
     sim_k=1,
     temprature=0,
     prefix_messages=[],
+    reply_language="中文",
 ):
     os.environ["OPENAI_API_KEY"] = api_key
 
@@ -153,8 +156,8 @@ def ask_ai(
     )
 
     response = None  # Initialize response variable to avoid UnboundLocalError
-    qa_prompt = QuestionAnswerPrompt(prompt_tmpl)
-    rf_prompt = RefinePrompt(refine_tmpl)
+    qa_prompt = QuestionAnswerPrompt(prompt_tmpl.replace("{reply_language}", reply_language))
+    rf_prompt = RefinePrompt(refine_tmpl.replace("{reply_language}", reply_language))
     response = index.query(
         question,
         llm_predictor=llm_predictor,

modules/presets.py

@@ -17,7 +17,7 @@ no_apikey_msg = "API key长度不是51位，请检查是否输入正确。"  # A
 no_input_msg = "请输入对话内容。"  # 未输入对话内容
 
 max_token_streaming = 3500  # 流式对话时的最大 token 数
-timeout_streaming = 5  # 流式对话时的超时时间
+timeout_streaming = 10  # 流式对话时的超时时间
 max_token_all = 3500  # 非流式对话时的最大 token 数
 timeout_all = 200  # 非流式对话时的超时时间
 enable_streaming_option = True  # 是否启用选择选择是否实时显示回答的勾选框
@@ -50,6 +50,16 @@ MODELS = [
     "gpt-4-32k-0314",
 ]  # 可选的模型
 
+REPLY_LANGUAGES = [
+    "中文",
+    "English",
+    "日本語",
+    "Español",
+    "Français",
+    "Deutsch",
+    "跟随问题语言（不稳定）"
+]
+
 
 WEBSEARCH_PTOMPT_TEMPLATE = """\
 Web search results:
@@ -59,7 +69,8 @@ Current date: {current_date}
 
 Instructions: Using the provided web search results, write a comprehensive reply to the given query. Make sure to cite results using [[number](URL)] notation after the reference. If the provided search results refer to multiple subjects with the same name, write separate answers for each subject.
 Query: {query}
-Reply in 中文"""
+Reply in {reply_language}
+"""
 
 PROMPT_TEMPLATE = """\
 Context information is below.
@@ -72,7 +83,7 @@ Make sure to cite results using [number] notation after the reference.
 If the provided context information refer to multiple subjects with the same name, write separate answers for each subject.
 Use prior knowledge only if the given context didn't provide enough information.
 Answer the question: {query_str}
-Reply in 中文
+Reply in {reply_language}
 """
 
 REFINE_TEMPLATE = """\
@@ -84,6 +95,6 @@ We have the opportunity to refine the existing answer
 {context_msg}
 ------------
 Given the new context, refine the original answer to better
-Answer in the same language as the question, such as English, 中文, 日本語, Español, Français, or Deutsch.
+Reply in {reply_language}
 If the context isn't useful, return the original answer.
 """