Upload app.py

app.py

@@ -1030,7 +1030,7 @@ def chapterExtension(
     user_input, chatbot, max_length, top_p, temperature, history, past_key_values
 ):
     
-      
+ 
     user_input = chapterExtensionins+ user_input
 
     yield from predict(
@@ -1042,9 +1042,123 @@ def chapterExtension(
         temperature,
         history,        
         past_key_values,
-    ) 
+    )
+def noNet(
+    user_input, chatbot, max_length, top_p, temperature, history, past_key_values
+): 
+    yield from predict(
+        RETRY_FLAG,  # type: ignore
+        user_input,
+        chatbot=[],
+        max_length=4000,
+        top_p=0.6,
+        temperature=0.85,
+        history=[],        
+        past_key_values=None,
+    )
+
+def predictex(
+    predict_function,
+    inputs,
+    outputs
+):
+    predict_function(user_input, chatbot, max_length, top_p, temperature, history, past_key_values)
+    outputs=[chatbot, history, past_key_values]
+
+def execute(
+    user_input, chatbot, max_length, top_p, temperature, history, past_key_values
+):
+    response = chatbot[-1][1]
+    print("Response:", response)  # 添加打印语句以输出 response 的值
+    if "不需要" in response:
+        print("Executing 不连网...") 
+        predictex(
+            noNet,
+            inputs=[
+                user_input,
+                chatbot,
+                max_length,
+                top_p,
+                temperature,
+                history,        
+                past_key_values,
+            ],
+            # outputs = [chatbot, history, last_user_message, user_message]
+            outputs=[chatbot, history, past_key_values],
+        )
+        print("chatbot", chatbot) 
+    else:
+        print("Executing 连网...") 
+        predictex(
+            GGSearch,
+            inputs=[
+                user_input,
+                chatbot,
+                max_length,
+                top_p,
+                temperature,
+                history,        
+                past_key_values,
+            ],
+            # outputs = [chatbot, history, last_user_message, user_message]
+            outputs=[chatbot, history, past_key_values],
+        )
+
+# 是否联网搜索函数
+def netOrNotnet(
+    user_input, chatbot, max_length, top_p, temperature, history, past_key_values
+):
+    user_input_original = user_input
+    user_input_prompt = '请判断这个指令:“' + user_input + '”是否需要通过网络搜索才能准确完成，你只需要回答"是"或者"否",不要其它多余的内容'
+    
+    response, history = model.chat(tokenizer, user_input_prompt, history=[])
+    if '否' in response or '不需要' in response:
+        NET = True        
+    else:
+        NET = False
+    print(user_input_original)
+    print(response)
+    print(NET)
+    if NET:
+        yield from predict(
+            RETRY_FLAG,# type: ignore
+            user_input_original,
+            chatbot,
+            max_length,
+            top_p,
+            temperature,
+            history=[],        
+            past_key_values=None,
+
+        )
+
+    else:
+        yield from GGSearch(
+            user_input_original,
+            chatbot,
+            max_length,
+            top_p,
+            temperature,
+            history=[],        
+            past_key_values=None,
+        )
+
+
+    # Update the chatbot and history variables after each execution
+    chatbot = chatbot[:-1] + [chatbot[-1]]
+    return chatbot, history, past_key_values    
+    
+    # 调用 execute 并传递 response
+    execute(
+        user_input_original,
+        chatbot,
+        max_length,
+        top_p,
+        temperature,
+        history,
+        past_key_values
+    )
 
-                    
  
 with gr.Blocks(title="🐰Bofan Ai🐰", theme=gr.themes.Soft(text_size="sm")) as demo:
     # gr.HTML("""<h1 align="center">ChatGLM2-6B-int4</h1>""")
@@ -1090,6 +1204,9 @@ with gr.Blocks(title="🐰Bofan Ai🐰", theme=gr.themes.Soft(text_size="sm")) a
             with gr.Column(min_width=32, scale=1):
                 with gr.Row():
                     submitBtn = gr.Button("发送Submit", variant="primary")
+                    GGSearchBtn = gr.Button("🐞联网搜索", variant="secondary") 
+                    netOrNotnetBtn = gr.Button("联网意图识别🙏韩帅DEBUG🙏", variant="secondary")
+                with gr.Row():
                     deleteBtn = gr.Button("删除最后一条对话", variant="secondary")
                     retryBtn = gr.Button("重新生成Regenerate", variant="secondary")
                 with gr.Row():
@@ -1112,7 +1229,7 @@ with gr.Blocks(title="🐰Bofan Ai🐰", theme=gr.themes.Soft(text_size="sm")) a
                 with gr.Row():
                     fitnessAskBtn = gr.Button("🥼健康咨询", variant="primary")
                     mindAskBtn = gr.Button("😶‍🌫️心理咨询", variant="primary")
-                    GGSearchBtn = gr.Button("🐞联网搜索", variant="primary")                                  
+                                                     
         with gr.Column(scale=1):
             gr.HTML("""<h3 align="center">🍀您好，除健康咨询和心理咨询外，其它功能使用前，请先清空历史，并输入问题。🍀</h3>""")
             emptyBtn = gr.Button("清空对话Clear History")
@@ -1524,7 +1641,7 @@ with gr.Blocks(title="🐰Bofan Ai🐰", theme=gr.themes.Soft(text_size="sm")) a
 
     mxOutlineBtn.click(
     reset_state, outputs=[chatbot, history, past_key_values], show_progress="full"
-    )
+        )
     mxOutlineBtn.click(
         mxOutline,
         inputs=[
@@ -1553,9 +1670,23 @@ with gr.Blocks(title="🐰Bofan Ai🐰", theme=gr.themes.Soft(text_size="sm")) a
         ],
         # outputs = [chatbot, history, last_user_message, user_message]
         outputs=[chatbot, history, past_key_values],
-    ) 
-    
-    deleteBtn.click(delete_last_turn, [chatbot, history], [chatbot, history])
+        )
+
+  
+    netOrNotnetBtn.click(
+        netOrNotnet,
+        inputs=[
+            user_input,
+            chatbot,
+            max_length,
+            top_p,
+            temperature,
+            history,
+            past_key_values,
+        ],
+        # outputs = [chatbot, history, last_user_message, user_message]
+        outputs=[chatbot, history, past_key_values],
+        )
 
     with gr.Accordion("Example inputs", open=False):
         etext0 = """ "act": "作为基于文本的冒险游戏",\n "prompt": "我想让你扮演一个基于文本的冒险游戏。我在这个基于文本的冒险游戏中扮演一个角色。请尽可能具体地描述角色所看到的内容和环境，并在游戏输出1、2、3让用户选择进行回复，而不是其它方式。我将输入命令来告诉角色该做什么，而你需要回复角色的行动结果以推动游戏的进行。我的第一个命令是'醒来'，请从这里开始故事 “ """