diff --git a/crazy_functions/高级功能函数模板.py b/crazy_functions/高级功能函数模板.py index f29e387..e9fe6bc 100644 --- a/crazy_functions/高级功能函数模板.py +++ b/crazy_functions/高级功能函数模板.py @@ -5,15 +5,15 @@ import datetime @CatchException def 高阶功能模板函数(txt, top_p, temperature, chatbot, history, systemPromptTxt, WEB_PORT): history = [] # 清空历史,以免输入溢出 - for i in range(3): + for i in range(5): currentMonth = (datetime.date.today() + datetime.timedelta(days=i)).month currentDay = (datetime.date.today() + datetime.timedelta(days=i)).day - i_say = f'今天是{currentMonth}月{currentDay}日,历史中的{currentMonth}月{currentDay}日发生了哪些大事?' + i_say = f'历史中哪些事件发生在{currentMonth}月{currentDay}日?列举两条并发送相关图片。' chatbot.append((i_say, "[Local Message] waiting gpt response.")) yield chatbot, history, '正常' # 由于请求gpt需要一段时间,我们先及时地做一次状态显示 # history = [] 每次询问不携带之前的询问历史 - gpt_say = predict_no_ui_long_connection(inputs=i_say, top_p=top_p, temperature=temperature, history=[], sys_prompt="You are a history teacher.") # 请求gpt,需要一段时间 + gpt_say = predict_no_ui_long_connection(inputs=i_say, top_p=top_p, temperature=temperature, history=[], sys_prompt="当你想发送一张照片时,请使用 Markdown ,并且 不要有反斜线, 不要用代码块。使用 Unsplash API (https://source.unsplash.com/1280x720/? < PUT YOUR QUERY HERE >)。") # 请求gpt,需要一段时间 chatbot[-1] = (i_say, gpt_say) history.append(i_say);history.append(gpt_say) diff --git a/predict.py b/predict.py index fb1eb26..c2294a0 100644 --- a/predict.py +++ b/predict.py @@ -83,7 +83,8 @@ def predict_no_ui_long_connection(inputs, top_p, temperature, history=[], sys_pr except StopIteration: break if len(chunk)==0: continue if not chunk.startswith('data:'): - raise ConnectionAbortedError("OpenAI返回了错误:" + chunk) + chunk = get_full_error(chunk.encode('utf8'), stream_response) + raise ConnectionAbortedError("OpenAI拒绝了请求:" + chunk.decode()) delta = json.loads(chunk.lstrip('data:'))['choices'][0]["delta"] if len(delta) == 0: break if "role" in delta: continue