From dfa8621a1ad27aa3035d0503826f9ea37a09e698 Mon Sep 17 00:00:00 2001 From: Rock Chin <1010553892@qq.com> Date: Tue, 10 Jan 2023 14:54:50 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=85=A8=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E4=BC=B0=E7=AE=97=E5=8A=9F=E8=83=BD=20(#81)?= =?UTF-8?q?=20(#96)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.py | 1 - pkg/database/manager.py | 48 ------------------ pkg/openai/keymgr.py | 59 +---------------------- pkg/openai/manager.py | 11 ----- pkg/openai/{pricing.py => pricing.bak.py} | 3 ++ pkg/openai/session.py | 16 ------ pkg/qqbot/filter.py | 1 + pkg/qqbot/process.py | 21 -------- 8 files changed, 5 insertions(+), 155 deletions(-) rename pkg/openai/{pricing.py => pricing.bak.py} (88%) diff --git a/main.py b/main.py index 61b94fe6..2954e28f 100644 --- a/main.py +++ b/main.py @@ -204,7 +204,6 @@ def stop(): qqbot_inst = pkg.utils.context.get_qqbot_manager() assert isinstance(qqbot_inst, pkg.qqbot.manager.QQBotManager) - pkg.utils.context.get_openai_manager().key_mgr.dump_fee() for session in pkg.openai.session.sessions: logging.info('持久化session: %s', session) pkg.openai.session.sessions[session].persistence() diff --git a/pkg/database/manager.py b/pkg/database/manager.py index 725970b5..a51ab509 100644 --- a/pkg/database/manager.py +++ b/pkg/database/manager.py @@ -50,15 +50,6 @@ class DatabaseManager: ) """) - # self.execute(""" - # create table if not exists `api_key_usage`( - # `id` INTEGER PRIMARY KEY AUTOINCREMENT, - # `key_md5` varchar(255) not null, - # `timestamp` bigint not null, - # `usage` bigint not null - # ) - # """) - self.execute(""" create table if not exists `account_fee`( `id` INTEGER PRIMARY KEY AUTOINCREMENT, @@ -281,45 +272,6 @@ class DatabaseManager: usage[key_md5] = usage_count return usage - def dump_api_key_fee(self, api_keys: dict, fee: dict): - logging.debug("dumping api key fee...") - logging.debug(api_keys) - logging.debug(fee) - for api_key in api_keys: - # 计算key的md5值 - key_md5 = hashlib.md5(api_keys[api_key].encode('utf-8')).hexdigest() - # 获取使用量 - fee_count = 0 - if key_md5 in fee: - fee_count = fee[key_md5] - # 将使用量存进数据库 - # 先检查是否已存在 - self.execute(""" - select count(*) from `account_fee` where `key_md5` = '{}'""".format(key_md5)) - result = self.cursor.fetchone() - if result[0] == 0: - # 不存在则插入 - self.execute(""" - insert into `account_fee` (`key_md5`, `fee`,`timestamp`) values ('{}', {}, {}) - """.format(key_md5, fee_count, int(time.time()))) - else: - # 存在则更新，timestamp设置为当前 - self.execute(""" - update `account_fee` set `fee` = {}, `timestamp` = {} where `key_md5` = '{}' - """.format(fee_count, int(time.time()), key_md5)) - - def load_api_key_fee(self): - self.execute(""" - select `key_md5`, `fee` from `account_fee` - """) - results = self.cursor.fetchall() - fee = {} - for result in results: - key_md5 = result[0] - fee_count = result[1] - fee[key_md5] = fee_count - return fee - def dump_usage_json(self, usage: dict): json_str = json.dumps(usage) self.execute(""" diff --git a/pkg/openai/keymgr.py b/pkg/openai/keymgr.py index 9c1e9d2f..ed89a680 100644 --- a/pkg/openai/keymgr.py +++ b/pkg/openai/keymgr.py @@ -12,10 +12,6 @@ class KeysManager: # api-key的使用量 # 其中键为api-key的md5值，值为使用量 - fee = {} - - api_key_fee_threshold = 18.0 - using_key = "" alerted = [] @@ -34,11 +30,6 @@ class KeysManager: # if hasattr(config, 'api_key_usage_threshold'): # self.api_key_usage_threshold = config.api_key_usage_threshold - config = pkg.utils.context.get_config() - if hasattr(config, 'api_key_fee_threshold'): - self.api_key_fee_threshold = config.api_key_fee_threshold - self.load_fee() - if type(api_key) is dict: self.api_key = api_key elif type(api_key) is str: @@ -59,16 +50,11 @@ class KeysManager: # 根据tested自动切换到可用的api-key # 返回是否切换成功, 切换后的api-key的别名 def auto_switch(self) -> (bool, str): - self.dump_fee() for key_name in self.api_key: if self.api_key[key_name] not in self.exceeded: self.using_key = self.api_key[key_name] logging.info("使用api-key:" + key_name) return True, key_name - # if self.get_fee(self.api_key[key_name]) < self.api_key_fee_threshold: - # self.using_key = self.api_key[key_name] - # logging.info("使用api-key:" + key_name) - # return True, key_name self.using_key = list(self.api_key.values())[0] logging.info("使用api-key:" + list(self.api_key.keys())[0]) @@ -85,53 +71,10 @@ class KeysManager: # self.usage[md5] = self.api_key_usage_threshold # self.fee[md5] = self.api_key_fee_threshold self.exceeded.append(self.using_key) - self.dump_fee() def get_key_name(self, api_key): """根据api-key获取其别名""" for key_name in self.api_key: if self.api_key[key_name] == api_key: return key_name - return "" - - def get_fee(self, api_key): - md5 = hashlib.md5(api_key.encode('utf-8')).hexdigest() - if md5 not in self.fee: - self.fee[md5] = 0 - return self.fee[md5] - - def report_fee(self, fee: float) -> bool: - logging.debug("report fee:" + str(fee)) - - md5 = hashlib.md5(self.using_key.encode('utf-8')).hexdigest() - if md5 not in self.fee: - self.fee[md5] = 0 - - self.fee[md5] += fee - - config = pkg.utils.context.get_config() - if self.fee[md5] >= self.api_key_fee_threshold and \ - hasattr(config, 'auto_switch_api_key') and config.auto_switch_api_key: - switch_result, key_name = self.auto_switch() - - # 检查是否切换到新的 - if switch_result: - if key_name not in self.alerted: - # 通知管理员 - pkg.utils.context.get_qqbot_manager().notify_admin("api-key已切换到:" + key_name) - self.alerted.append(key_name) - return True - else: - if key_name not in self.alerted: - # 通知管理员 - pkg.utils.context.get_qqbot_manager().notify_admin("api-key已用完，无未使用的api-key可供切换") - self.alerted.append(key_name) - return False - return False - - def dump_fee(self): - pkg.utils.context.get_database_manager().dump_api_key_fee(api_keys=self.api_key, fee=self.fee) - - def load_fee(self): - self.fee = pkg.utils.context.get_database_manager().load_api_key_fee() - logging.info("load fee:" + str(self.fee)) + return "" \ No newline at end of file diff --git a/pkg/openai/manager.py b/pkg/openai/manager.py index 5208fce5..0f48ed54 100644 --- a/pkg/openai/manager.py +++ b/pkg/openai/manager.py @@ -3,7 +3,6 @@ import logging import openai import pkg.openai.keymgr -import pkg.openai.pricing as pricing import pkg.utils.context import pkg.audit.gatherer @@ -43,11 +42,6 @@ class OpenAIInteract: self.audit_mgr.report_text_model_usage(config.completion_api_params['model'], prompt + response['choices'][0]['text']) - switched = self.key_mgr.report_fee(pricing.language_base_price(config.completion_api_params['model'], - prompt + response['choices'][0]['text'])) - if switched: - openai.api_key = self.key_mgr.get_using_key() - return response def request_image(self, prompt): @@ -63,10 +57,5 @@ class OpenAIInteract: self.audit_mgr.report_image_model_usage(params['size']) - switched = self.key_mgr.report_fee(pricing.image_price(params['size'])) - - if switched: - openai.api_key = self.key_mgr.get_using_key() - return response diff --git a/pkg/openai/pricing.py b/pkg/openai/pricing.bak.py similarity index 88% rename from pkg/openai/pricing.py rename to pkg/openai/pricing.bak.py index 26455bb9..8a46978b 100644 --- a/pkg/openai/pricing.py +++ b/pkg/openai/pricing.bak.py @@ -1,3 +1,6 @@ +# 计费模块 +# 已弃用 https://github.com/RockChinQ/QChatGPT/issues/81 + import logging pricing = { diff --git a/pkg/openai/session.py b/pkg/openai/session.py index 813f0982..b773197a 100644 --- a/pkg/openai/session.py +++ b/pkg/openai/session.py @@ -51,22 +51,6 @@ def dump_session(session_name: str): del sessions[session_name] -# def blocked_func(lock: threading.Lock): -# -# def decorator(func): -# def wrapper(*args, **kwargs): -# print('lock acquire,{}'.format(lock)) -# lock.acquire() -# try: -# return func(*args, **kwargs) -# finally: -# lock.release() -# -# return wrapper -# -# return decorator - - # 通用的OpenAI API交互session # session内部保留了对话的上下文， # 收到用户消息后，将上下文提交给OpenAI API生成回复 diff --git a/pkg/qqbot/filter.py b/pkg/qqbot/filter.py index 2f622e74..7cbca39b 100644 --- a/pkg/qqbot/filter.py +++ b/pkg/qqbot/filter.py @@ -1,3 +1,4 @@ +# 敏感词过滤模块 import re diff --git a/pkg/qqbot/process.py b/pkg/qqbot/process.py index e2707ada..e66494ae 100644 --- a/pkg/qqbot/process.py +++ b/pkg/qqbot/process.py @@ -212,27 +212,6 @@ def process_message(launcher_type: str, launcher_id: int, text_message: str, mes to_send = session.undo() text_message = to_send is_message = True - elif cmd == 'fee': - api_keys = pkg.utils.context.get_openai_manager().key_mgr.api_key - reply_str = "[bot]api-key费用情况(估算):(阈值:{})\n\n".format( - pkg.utils.context.get_openai_manager().key_mgr.api_key_fee_threshold) - - using_key_name = "" - for api_key in api_keys: - reply_str += "{}:\n - {}美元 {}%\n".format(api_key, - round( - pkg.utils.context.get_openai_manager().key_mgr.get_fee( - api_keys[api_key]), 6), - round( - pkg.utils.context.get_openai_manager().key_mgr.get_fee( - api_keys[ - api_key]) / pkg.utils.context.get_openai_manager().key_mgr.api_key_fee_threshold * 100, - 3)) - if api_keys[api_key] == pkg.utils.context.get_openai_manager().key_mgr.using_key: - using_key_name = api_key - reply_str += "\n当前使用:{}".format(using_key_name) - - reply = [reply_str] elif cmd == 'usage': reply_str = "[bot]各api-key使用情况:\n\n"