diff --git a/pkg/openai/keymgr.py b/pkg/openai/keymgr.py index 5947c0a1..1c8e9357 100644 --- a/pkg/openai/keymgr.py +++ b/pkg/openai/keymgr.py @@ -76,7 +76,7 @@ class KeysManager: # 经测算得出的理论与实际的偏差比例 salt_rate = 0.93 - self.usage[md5] += round(int((len(new_content.encode('utf-8')) - len(new_content)) / 2 + len(new_content))*salt_rate) + self.usage[md5] += ( (len(new_content.encode('utf-8')) - len(new_content)) / 2 + len(new_content) )*salt_rate self.usage[md5] = int(self.usage[md5]) diff --git a/pkg/qqbot/manager.py b/pkg/qqbot/manager.py index 1eb7f9dc..b1fdcd14 100644 --- a/pkg/qqbot/manager.py +++ b/pkg/qqbot/manager.py @@ -235,15 +235,16 @@ class QQBotManager: reply = "[bot]err:调用API失败,请重试或联系作者,或等待修复" except openai.error.RateLimitError as e: # 尝试切换api-key + current_tokens_amt = pkg.openai.manager.get_inst().key_mgr.get_usage(pkg.openai.manager.get_inst().key_mgr.get_using_key()) pkg.openai.manager.get_inst().key_mgr.set_current_exceeded() switched, name = pkg.openai.manager.get_inst().key_mgr.auto_switch() if not switched: - self.notify_admin("API调用额度超限,请向OpenAI账户充值或在config.py中更换api_key") + self.notify_admin("API调用额度超限({}),请向OpenAI账户充值或在config.py中更换api_key".format(current_tokens_amt)) reply = "[bot]err:API调用额度超额,请联系作者,或等待修复" else: openai.api_key = pkg.openai.manager.get_inst().key_mgr.get_using_key() - self.notify_admin("API调用额度超限,已切换到{}".format(name)) + self.notify_admin("API调用额度超限({}),已切换到{}".format(current_tokens_amt, name)) reply = "[bot]err:API调用额度超额,已自动切换,请重新发送消息" except openai.error.InvalidRequestError as e: self.notify_admin("{}API调用参数错误:{}\n\n这可能是由于config.py中的prompt_submit_length参数或"