From 454a74f4e132c30b7a30dbfaefbdbb4f27d281b9 Mon Sep 17 00:00:00 2001 From: Soulter <37870767+Soulter@users.noreply.github.com> Date: Sun, 14 May 2023 20:51:39 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E9=A2=9C=E8=89=B2=E6=97=A5=E5=BF=97-?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/command/command.py | 4 ++- model/provider/provider_openai_official.py | 37 ++++++++++++---------- model/provider/provider_rev_chatgpt.py | 16 ++++++---- model/provider/provider_rev_edgegpt.py | 7 ++-- 4 files changed, 37 insertions(+), 27 deletions(-) diff --git a/model/command/command.py b/model/command/command.py index 76570dc32..665c7ffd4 100644 --- a/model/command/command.py +++ b/model/command/command.py @@ -9,6 +9,8 @@ import json import util.plugin_util as putil import shutil import importlib +from util import general_utils as gu + PLATFORM_QQCHAN = 'qqchan' PLATFORM_GOCQ = 'gocq' @@ -41,7 +43,7 @@ class Command: if hit: return True, res except BaseException as e: - print(f"[Debug] {k}插件加载出现问题，原因: {str(e)}\n已安装插件: {cached_plugins.keys}\n如果你没有相关装插件的想法, 请直接忽略此报错, 不影响其他功能的运行。") + gu.log("{k}插件加载出现问题，原因: {str(e)}\n已安装插件: {cached_plugins.keys}\n如果你没有相关装插件的想法, 请直接忽略此报错, 不影响其他功能的运行。", level=gu.LEVEL_WARNING) if self.command_start_with(message, "nick"): return True, self.set_nick(message, platform) diff --git a/model/provider/provider_openai_official.py b/model/provider/provider_openai_official.py index 2f9eb3409..e462a292a 100644 --- a/model/provider/provider_openai_official.py +++ b/model/provider/provider_openai_official.py @@ -6,6 +6,7 @@ import sys from cores.database.conn import dbConn from model.provider.provider import Provider import threading +from util import general_utils as gu abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/' key_record_path = abs_path+'chatgpt_key_record' @@ -16,7 +17,7 @@ class ProviderOpenAIOfficial(Provider): if 'api_base' in cfg and cfg['api_base'] != 'none' and cfg['api_base'] != '': openai.api_base = cfg['api_base'] if cfg['key'] != '' and cfg['key'] != None: - print("[System] 读取ChatGPT Key成功") + gu.log("读取ChatGPT Key成功") self.key_list = cfg['key'] else: input("[System] 请先去完善ChatGPT的Key。详情请前往https://beta.openai.com/account/api-keys") @@ -25,7 +26,7 @@ class ProviderOpenAIOfficial(Provider): self.init_key_record() self.chatGPT_configs = cfg['chatGPTConfigs'] - print(f'[System] 加载ChatGPTConfigs: {self.chatGPT_configs}') + gu.log(f'加载ChatGPTConfigs: {self.chatGPT_configs}') self.openai_configs = cfg # 会话缓存 self.session_dict = {} @@ -39,9 +40,10 @@ class ProviderOpenAIOfficial(Provider): db1 = dbConn() for session in db1.get_all_session(): self.session_dict[session[0]] = json.loads(session[1])['data'] - print("[System] 历史记录读取成功喵") + gu.log("历史记录读取成功喵") except BaseException as e: - print("[System] 历史记录读取失败: " + str(e)) + gu.log("历史记录读取失败喵", level=gu.LEVEL_ERROR) + # 读取统计信息 if not os.path.exists(abs_path+"configs/stat"): @@ -118,9 +120,8 @@ class ProviderOpenAIOfficial(Provider): ) break except Exception as e: - print(e) if 'You exceeded' in str(e) or 'Billing hard limit has been reached' in str(e) or 'No API key provided' in str(e) or 'Incorrect API key provided' in str(e): - print("[System] 当前Key已超额或者不正常,正在切换") + gu.log("当前Key已超额或者不正常,正在切换", level=gu.LEVEL_WARNING) self.key_stat[openai.api_key]['exceed'] = True self.save_key_record() @@ -130,10 +131,12 @@ class ProviderOpenAIOfficial(Provider): raise e else: break - if 'maximum context length' in str(e): - print("token超限, 清空对应缓存") + elif 'maximum context length' in str(e): + gu.log("token超限, 清空对应缓存") self.session_dict[session_id] = [] cache_data_list, new_record, req = self.wrap(prompt, session_id) + else: + gu.log(str(e), level=gu.LEVEL_ERROR) retry+=1 if retry >= 5: raise BaseException("连接超时") @@ -192,13 +195,12 @@ class ProviderOpenAIOfficial(Provider): image_url = [] for i in range(img_num): image_url.append(response['data'][i]['url']) - print(image_url) break except Exception as e: - print(e) + gu.log(str(e), level=gu.LEVEL_ERROR) if 'You exceeded' in str(e) or 'Billing hard limit has been reached' in str( e) or 'No API key provided' in str(e) or 'Incorrect API key provided' in str(e): - print("[System] 当前Key已超额或者不正常,正在切换") + gu.log("当前Key已超额或者不正常, 正在切换", level=gu.LEVEL_WARNING) self.key_stat[openai.api_key]['exceed'] = True self.save_key_record() @@ -305,7 +307,7 @@ class ProviderOpenAIOfficial(Provider): if not self.key_stat[key]['exceed']: is_all_exceed = False openai.api_key = key - print(f"[System] 切换到Key: {key}, 已使用token: {self.key_stat[key]['used']}") + gu.log(f"切换到Key: {key}, 已使用token: {self.key_stat[key]['used']}", level=gu.LEVEL_INFO) if len(req) > 0: try: response = openai.ChatCompletion.create( @@ -314,20 +316,21 @@ class ProviderOpenAIOfficial(Provider): ) return response, True except Exception as e: - print(e) if 'You exceeded' in str(e): - print("[System] 当前Key已超额,正在切换") + gu.log("当前Key已超额, 正在切换") self.key_stat[openai.api_key]['exceed'] = True self.save_key_record() time.sleep(1) continue + else: + gu.log(str(e), level=gu.LEVEL_ERROR) else: return True if is_all_exceed: - print("[System] 所有Key已超额") + gu.log("所有Key已超额", level=gu.LEVEL_CRITICAL) return None, False else: - print("[System] 在切换key时程序异常。") + gu.log("在切换key时程序异常。", level=gu.LEVEL_ERROR) return None, False def getConfigs(self): @@ -375,7 +378,7 @@ class ProviderOpenAIOfficial(Provider): try: self.key_stat = json.load(keyfile) except Exception as e: - print(e) + gu.log(str(e), level=gu.LEVEL_ERROR) self.key_stat = {} finally: for key in self.key_list: diff --git a/model/provider/provider_rev_chatgpt.py b/model/provider/provider_rev_chatgpt.py index ce986e8a1..11233d61f 100644 --- a/model/provider/provider_rev_chatgpt.py +++ b/model/provider/provider_rev_chatgpt.py @@ -1,13 +1,16 @@ from revChatGPT.V1 import Chatbot from revChatGPT import typings from model.provider.provider import Provider +from util import general_utils as gu + class ProviderRevChatGPT(Provider): def __init__(self, config): self.rev_chatgpt = [] for i in range(0, len(config['account'])): try: - print(f"[System] 创建rev_ChatGPT负载{str(i)}中...") + gu.log(f"创建rev_ChatGPT负载{str(i)}中...", level=gu.LEVEL_INFO, tag="RevChatGPT") + if 'password' in config['account'][i]: config['account'][i]['password'] = str(config['account'][i]['password']) revstat = { @@ -16,7 +19,7 @@ class ProviderRevChatGPT(Provider): } self.rev_chatgpt.append(revstat) except BaseException as e: - print(f"[System] 创建rev_ChatGPT负载失败: {str(e)}") + gu.log(f"创建rev_ChatGPT负载{str(i)}失败: {str(e)}", level=gu.LEVEL_ERROR, tag="RevChatGPT") def forget(self) -> bool: return False @@ -42,21 +45,22 @@ class ProviderRevChatGPT(Provider): raise e err_count += 1 - print(f"[RevChatGPT] 请求出现问题: {str(e)} | 正在重试: {str(err_count)}") + gu.log(f"请求出现问题: {str(e)} | 正在重试: {str(err_count)}", level=gu.LEVEL_WARNING, tag="RevChatGPT") if err_count >= retry_count: raise e except BaseException as e: err_count += 1 - print(f"[RevChatGPT] 请求出现问题: {str(e)} | 正在重试: {str(err_count)}") + gu.log(f"请求出现问题: {str(e)} | 正在重试: {str(err_count)}", level=gu.LEVEL_WARNING, tag="RevChatGPT") if err_count >= retry_count: raise e + if resp == '': + resp = "RevChatGPT出现故障." # print("[RevChatGPT] "+str(resp)) return resp def text_chat(self, prompt): res = '' - print("[Debug] "+str(self.rev_chatgpt)) err_msg = '' cursor = 0 for revstat in self.rev_chatgpt: @@ -70,7 +74,7 @@ class ProviderRevChatGPT(Provider): # todo: 细化错误管理 except BaseException as e: revstat['busy'] = False - print(f"请求出现问题: {str(e)}") + gu.log(f"请求出现问题: {str(e)}", level=gu.LEVEL_WARNING, tag="RevChatGPT") err_msg += f"账号{cursor} - 错误原因: {str(e)}" continue else: diff --git a/model/provider/provider_rev_edgegpt.py b/model/provider/provider_rev_edgegpt.py index 1e7cec81b..93774fbff 100644 --- a/model/provider/provider_rev_edgegpt.py +++ b/model/provider/provider_rev_edgegpt.py @@ -2,6 +2,8 @@ from model.provider.provider import Provider from EdgeGPT import Chatbot, ConversationStyle import json import os +from util import general_utils as gu + class ProviderRevEdgeGPT(Provider): def __init__(self): @@ -76,13 +78,12 @@ class ProviderRevEdgeGPT(Provider): reply_msg += f"\n⌈{throttling['numUserMessagesInConversation']}/{throttling['maxNumUserMessagesInConversation']}⌋" break except BaseException as e: - # raise e - print(e) + gu.log(str(e), level=gu.LEVEL_WARNING, tag="RevEdgeGPT") err_count += 1 if err_count >= retry_count: self.busy = False raise e - print("[RevEdgeGPT] 请求出现了一些问题, 正在重试。次数"+str(err_count)) + gu.log("请求出现了一些问题, 正在重试。次数"+str(err_count), level=gu.LEVEL_WARNING, tag="RevEdgeGPT") self.busy = False # print("[RevEdgeGPT] "+str(reply_msg))