增加基础功能判空
This commit is contained in:
@ -96,7 +96,6 @@ class ChatBot(ChatBotFrame):
|
||||
def draw_function_chat(self):
|
||||
with gr.Tab('Function'):
|
||||
with gr.Accordion("基础功能区", open=True) as self.area_basic_fn:
|
||||
gr.Markdown('> 以下功能依赖输入区内容')
|
||||
with gr.Row():
|
||||
for k in functional:
|
||||
variant = functional[k]["Color"] if "Color" in functional[k] else "secondary"
|
||||
|
||||
@ -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):
|
||||
if txt:
|
||||
show_say = txt
|
||||
prompt = txt+'\nAfter answering the questions, list three more questions that users may ask.'
|
||||
prompt = txt+'\n回答完问题后,再列出用户可能提出的三个问题。'
|
||||
else:
|
||||
prompt = history[-1]+"\nAnalyze the above answers and list three more questions that users may ask."
|
||||
show_say = 'Analyze the above answers and list three more questions that users may ask.'
|
||||
prompt = history[-1]+"\n分析上述回答,再列出用户可能提出的三个问题。"
|
||||
show_say = '分析上述回答,再列出用户可能提出的三个问题。'
|
||||
gpt_say = yield from request_gpt_model_in_new_thread_with_ui_alive(
|
||||
inputs=prompt,
|
||||
inputs_show_user=show_say,
|
||||
|
||||
12
toolbox.py
12
toolbox.py
@ -32,10 +32,8 @@ def ArgsGeneralWrapper(f):
|
||||
装饰器函数,用于重组输入参数,改变输入参数的顺序与结构。
|
||||
"""
|
||||
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
|
||||
cookies.update({
|
||||
'top_p':top_p,
|
||||
@ -54,6 +52,13 @@ def ArgsGeneralWrapper(f):
|
||||
}
|
||||
chatbot_with_cookie = ChatBotWithCookies(cookies)
|
||||
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)
|
||||
return decorated
|
||||
|
||||
@ -106,7 +111,6 @@ def HotReload(f):
|
||||
yield from f_hot_reload(*args, **kwargs)
|
||||
return decorated
|
||||
|
||||
|
||||
####################################### 其他小工具 #####################################
|
||||
|
||||
def get_reduce_token_percent(text):
|
||||
|
||||
Reference in New Issue
Block a user