andre/gpt_academic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加基础功能判空

Browse Source
This commit is contained in:
w_xiaolizu
2023-04-21 17:09:49 +08:00
parent fd6b1755c9
commit 73c6a2aeb0
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
__main__.py
View File

@ -96,7 +96,6 @@ class ChatBot(ChatBotFrame):
def draw_function_chat(self): def draw_function_chat(self):
with gr.Tab('Function'): with gr.Tab('Function'):
with gr.Accordion("基础功能区", open=True) as self.area_basic_fn: with gr.Accordion("基础功能区", open=True) as self.area_basic_fn:
gr.Markdown('> 以下功能依赖输入区内容')
with gr.Row(): with gr.Row():
for k in functional: for k in functional:
variant = functional[k]["Color"] if "Color" in functional[k] else "secondary" variant = functional[k]["Color"] if "Color" in functional[k] else "secondary"

6
crazy_functions/辅助回答.py
View File

@ -12,10 +12,10 @@ from crazy_functions.crazy_utils import request_gpt_model_in_new_thread_with_ui_
def 猜你想问(txt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, web_port): def 猜你想问(txt, llm_kwargs, plugin_kwargs, chatbot, history, system_prompt, web_port):
if txt: if txt:
show_say = txt show_say = txt
prompt = txt+'\nAfter answering the questions, list three more questions that users may ask.' prompt = txt+'\n回答完问题后，再列出用户可能提出的三个问题。'
else: else:
prompt = history[-1]+"\nAnalyze the above answers and list three more questions that users may ask." prompt = history[-1]+"\n分析上述回答，再列出用户可能提出的三个问题。"
show_say = 'Analyze the above answers and list three more questions that users may ask.' show_say = '分析上述回答，再列出用户可能提出的三个问题。'
gpt_say = yield from request_gpt_model_in_new_thread_with_ui_alive( gpt_say = yield from request_gpt_model_in_new_thread_with_ui_alive(
inputs=prompt, inputs=prompt,
inputs_show_user=show_say, inputs_show_user=show_say,

12
toolbox.py
View File

@ -32,10 +32,8 @@ def ArgsGeneralWrapper(f):
装饰器函数，用于重组输入参数，改变输入参数的顺序与结构。 装饰器函数，用于重组输入参数，改变输入参数的顺序与结构。
""" """
def decorated(cookies, max_length, llm_model, txt, top_p, temperature, def decorated(cookies, max_length, llm_model, txt, top_p, temperature,
chatbot, history, system_prompt, models, ipaddr:gr.Request, *args): chatbot, history, system_prompt, models, ipaddr: gr.Request, *args):
"""""" """"""
txt_passon = txt
if 'input加密' in models: txt_passon = func_box.encryption_str(txt)
# 引入一个有cookie的chatbot # 引入一个有cookie的chatbot
cookies.update({ cookies.update({
'top_p':top_p, 'top_p':top_p,
@ -54,6 +52,13 @@ def ArgsGeneralWrapper(f):
} }
chatbot_with_cookie = ChatBotWithCookies(cookies) chatbot_with_cookie = ChatBotWithCookies(cookies)
chatbot_with_cookie.write_list(chatbot) chatbot_with_cookie.write_list(chatbot)
txt_passon = txt
if 'input加密' in models: txt_passon = func_box.encryption_str(txt)
if txt_passon == '' and len(args) > 1:
msgs = '### Warning 输入框为空\n' \
'tips: 使用基础功能时，请在输入栏内输入需要处理的文本内容'
yield from update_ui(chatbot=chatbot_with_cookie, history=history, msg=msgs) # 刷新界面
return
yield from f(txt_passon, llm_kwargs, plugin_kwargs, chatbot_with_cookie, history, system_prompt, *args) yield from f(txt_passon, llm_kwargs, plugin_kwargs, chatbot_with_cookie, history, system_prompt, *args)
return decorated return decorated
@ -106,7 +111,6 @@ def HotReload(f):
yield from f_hot_reload(*args, **kwargs) yield from f_hot_reload(*args, **kwargs)
return decorated return decorated
####################################### 其他小工具 ##################################### ####################################### 其他小工具 #####################################
def get_reduce_token_percent(text): def get_reduce_token_percent(text):