diff --git a/bot/chatgpt/chat_gpt_bot.py b/bot/chatgpt/chat_gpt_bot.py index a1b41ec..a0b4bbc 100644 --- a/bot/chatgpt/chat_gpt_bot.py +++ b/bot/chatgpt/chat_gpt_bot.py @@ -127,7 +127,7 @@ class ChatGPTBot(Bot): def create_img(self, query, retry_count=0): try: if conf().get('rate_limit_dalle') and not self.tb4dalle.get_token(): - return "请求太快了,请休息一下再问我吧" + return False, "请求太快了,请休息一下再问我吧" logger.info("[OPEN_AI] image_query={}".format(query)) response = openai.Image.create( prompt=query, #图片描述 diff --git a/channel/terminal/terminal_channel.py b/channel/terminal/terminal_channel.py index 1c9a61d..7e8ad35 100644 --- a/channel/terminal/terminal_channel.py +++ b/channel/terminal/terminal_channel.py @@ -1,9 +1,10 @@ +from bridge.context import * from channel.channel import Channel import sys class TerminalChannel(Channel): def startup(self): - context = {"from_user_id": "User"} + context = Context() print("\nPlease input your question") while True: try: @@ -12,12 +13,13 @@ class TerminalChannel(Channel): print("\nExiting...") sys.exit() + context.type = ContextType.TEXT + context['session_id'] = "User" + context.content = prompt print("Bot:") sys.stdout.flush() - for res in super().build_reply_content(prompt, context): - print(res, end="") - sys.stdout.flush() - print("\n") + res = super().build_reply_content(prompt, context).content + print(res) def get_input(self, prompt):