From a5c43612bf1beaf1ae53da842b034b303a03925d Mon Sep 17 00:00:00 2001 From: Soulter <37870767+Soulter@users.noreply.github.com> Date: Wed, 19 Apr 2023 17:22:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20bing=E6=A8=A1=E5=9E=8B=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=20#70?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/provider/provider_rev_edgegpt.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/model/provider/provider_rev_edgegpt.py b/model/provider/provider_rev_edgegpt.py index a48cd8ed7..c112c9570 100644 --- a/model/provider/provider_rev_edgegpt.py +++ b/model/provider/provider_rev_edgegpt.py @@ -31,8 +31,13 @@ class ProviderRevEdgeGPT(Provider): while err_count < retry_count: try: resp = await self.bot.ask(prompt=prompt, conversation_style=ConversationStyle.creative) - # print("[RevEdgeGPT] "+str(resp)) - reply_msg = resp['item']['messages'][len(resp['item']['messages'])-1]['text'] + print("[RevEdgeGPT] "+str(resp)) + msj_obj = resp['item']['messages'][len(resp['item']['messages'])-1] + reply_msg = msj_obj['text'] + if 'sourceAttributions' in msj_obj: + reply_source = msj_obj['sourceAttributions'] + else: + reply_source = [] if 'throttling' in resp['item']: throttling = resp['item']['throttling'] # print(throttling) @@ -46,8 +51,18 @@ class ProviderRevEdgeGPT(Provider): await self.forget() err_count += 1 continue + if reply_msg is None: + # 不想答复 + return '', 0 + else: + index = 1 + if len(reply_source) > 0: + reply_msg += "\n\n信息来源:\n" + for i in reply_source: + reply_msg += f"[{str(index)}]: {i['seeMoreUrl']} | {i['providerDisplayName']}\n" + index += 1 if throttling is not None: - reply_msg += f"⌈\n{throttling['numUserMessagesInConversation']}/{throttling['maxNumUserMessagesInConversation']}⌋" + reply_msg += f"\n⌈{throttling['numUserMessagesInConversation']}/{throttling['maxNumUserMessagesInConversation']}⌋" break except BaseException as e: # raise e