From b495a11d1fb597dc4b0ce656c2419338cbb04a66 Mon Sep 17 00:00:00 2001 From: Soulter <37870767+Soulter@users.noreply.github.com> Date: Mon, 13 Mar 2023 18:45:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8E=A5=E5=85=A5=E7=99=BE=E5=BA=A6?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AE=A1=E6=A0=B8=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/baidu_aip_judge.py | 26 +++++++++++++++++++++ configs/config.yaml | 24 ++++++++++--------- cores/qqbot/core.py | 49 ++++++++++++++++++++++++++++----------- 3 files changed, 75 insertions(+), 24 deletions(-) create mode 100644 addons/baidu_aip_judge.py diff --git a/addons/baidu_aip_judge.py b/addons/baidu_aip_judge.py new file mode 100644 index 000000000..2b80cb14a --- /dev/null +++ b/addons/baidu_aip_judge.py @@ -0,0 +1,26 @@ +from aip import AipContentCensor + +class BaiduJudge: + def __init__(self, baidu_configs) -> None: + if 'app_id' in baidu_configs and 'api_key' in baidu_configs and 'secret_key' in baidu_configs: + self.app_id = str(baidu_configs['app_id']) + self.api_key = baidu_configs['api_key'] + self.secret_key = baidu_configs['secret_key'] + self.client = AipContentCensor(self.app_id, self.api_key, self.secret_key) + else: + raise ValueError("Baidu configs error! 请填写百度内容审核服务相关配置！") + def judge(self, text): + res = self.client.textCensorUserDefined(text) + if 'conclusionType' not in res: + return False, "百度审核服务未知错误" + if res['conclusionType'] == 1: + return True, "合规" + else: + if 'data' not in res: + return False, "百度审核服务未知错误" + count = len(res['data']) + info = f"百度审核服务发现 {count} 处违规：\n" + for i in res['data']: + info += f"{i['msg']}；\n" + info += "\n判断结果："+res['conclusion'] + return False, info \ No newline at end of file diff --git a/configs/config.yaml b/configs/config.yaml index 5c433c65f..63916d699 100644 --- a/configs/config.yaml +++ b/configs/config.yaml @@ -12,13 +12,13 @@ openai: # 这里是GPT配置，语言模型默认使用gpt-3.5-turbo chatGPTConfigs: model: gpt-3.5-turbo - max_tokens: 1500 + max_tokens: 3000 temperature: 0.9 top_p: 1 frequency_penalty: 0 presence_penalty: 0 - total_tokens_limit: 2800 + total_tokens_limit: 5000 # QQ开放平台的appid和令牌 # q.qq.com @@ -28,31 +28,35 @@ qqbot: # 设置是否一个人一个会话 uniqueSessionMode: false - # QChannelBot 的版本，请勿修改此字段，否则可能产生一些bug -version: 2.5 RealChatGPT Ver. - +version: 2.7 ChineseVeryGood Ver. # [Beta] 转储历史记录时间间隔(分钟) dump_history_interval: 10 - # 一个用户只能在time秒内发送count条消息 limit: time: 60 count: 5 # 公告 notice: "此机器人由Github项目QQChannelChatGPT驱动。" - # 是否打开私信功能 # 设置为true则频道成员可以私聊机器人。 # 设置为false则频道成员不能私聊机器人。 direct_message_mode: true # 系统代理 -# http_proxy: mask -# https_proxy: mask +# http_proxy: http://localhost:7890 +# https_proxy: http://localhost:7890 ################外带程序（插件）################ +# 百度内容审核服务 +# 新用户免费5万次调用。https://ai.baidu.com/ +baidu_aip: + enable: false + app_id: + api_key: + secret_key: + # 逆向ChatGPT库 # https://github.com/acheong08/ChatGPT # 优点：免费（无免费额度限制）； @@ -82,8 +86,6 @@ direct_message_mode: true rev_ChatGPT: enable: false account: - - access_token: - # - session_token: xxxxxxxx - email: d.o.m.her.ry61.7@gmail.com password: 11111111 - email: ca.it.li.nal.o.i.si.o91@gmail.com diff --git a/cores/qqbot/core.py b/cores/qqbot/core.py index c898d3283..1a4e89484 100644 --- a/cores/qqbot/core.py +++ b/cores/qqbot/core.py @@ -15,6 +15,7 @@ import util.unfit_words as uw import os import sys from cores.qqbot.personality import personalities +from addons.baidu_aip_judge import BaiduJudge history_dump_interval = 10 @@ -73,6 +74,9 @@ rev_chatgpt = [] # gpt配置信息 gpt_config = {} +# 百度内容审核实例 +baidu_judge = None + def new_sub_thread(func, args=()): thread = threading.Thread(target=func, args=args, daemon=True) thread.start() @@ -158,7 +162,7 @@ def upload(): 'Content-Type': 'application/json' } key_stat = chatgpt.get_key_stat() - d = {"data": {"guild_count": guild_count, "guild_msg_count": guild_msg_count, "guild_direct_msg_count": guild_direct_msg_count, "session_count": session_count, 'addr': addr, 'winver': version, 'key_stat':key_stat}} + d = {"data": {'version': version, "guild_count": guild_count, "guild_msg_count": guild_msg_count, "guild_direct_msg_count": guild_direct_msg_count, "session_count": session_count, 'addr': addr, 'key_stat':key_stat}} d = json.dumps(d).encode("utf-8") res = requests.put(f'https://uqfxtww1.lc-cn-n1-shared.com/1.1/classes/bot_record/{object_id}', headers = headers, data = d) if json.loads(res.text)['code'] == 1: @@ -178,7 +182,7 @@ def upload(): 初始化机器人 ''' def initBot(cfg, prov): - global chatgpt, provider, rev_chatgpt + global chatgpt, provider, rev_chatgpt, baidu_judge global now_personality, gpt_config, config, uniqueSession, history_dump_interval, frequency_count, frequency_time,announcement, direct_message_mode, version provider = prov @@ -238,6 +242,15 @@ def initBot(cfg, prov): if 'openai' in cfg and 'chatGPTConfigs' in cfg['openai']: gpt_config = cfg['openai']['chatGPTConfigs'] + # 百度内容审核 + if 'baidu_aip' in cfg and 'enable' in cfg['baidu_aip'] and cfg['baidu_aip']['enable']: + try: + baidu_judge = BaiduJudge(cfg['baidu_aip']) + print("[System] 百度内容审核初始化成功") + except BaseException as e: + input("[System] 百度内容审核初始化失败: " + str(e)) + exit() + # 统计上传 if is_upload_log: # 读取object_id @@ -492,11 +505,12 @@ def oper_msg(message, at=False, msg_ref = None): # 这里是预设，你可以按需更改 if qq_msg.strip() == 'hello' or qq_msg.strip() == '你好' or qq_msg.strip() == '': - send_qq_msg(message, f"你好呀~", msg_ref=msg_ref) + send_qq_msg(message, f"你好呀🥰，输入/help查看指令噢", msg_ref=msg_ref) return # if qq_msg.strip() == '傻逼' or qq_msg.strip() == 'sb': # send_qq_msg(message, f"好好好") # return + # if '喜多' in qq_msg: # send_qq_msg(message, 'http://rn2ztkeap.hn-bkt.clouddn.com/xd1.gif', True) # if '台湾' in qq_msg or 'taiwan' in qq_msg: @@ -627,17 +641,30 @@ def oper_msg(message, at=False, msg_ref = None): print("[System-Err] Rev ChatGPT API错误。原因如下:\n"+str(e)) send_qq_msg(message, f"Rev ChatGPT API错误。原因如下：\n{str(e)} \n前往官方频道反馈~") return + + # 记录日志 + logf.write("[GPT] "+ str(chatgpt_res)+'\n') + logf.flush() + # 敏感过滤 + # 过滤不合适的词 + judged_res = chatgpt_res + for i in uw.unfit_words: + if i in chatgpt_res: + judged_res = chatgpt_res.replace(i, "***") + # 百度内容审核服务二次审核 + if baidu_judge != None: + check, msg = baidu_judge.judge(judged_res) + if not check: + send_qq_msg(message, f"你的提问得到的回复【百度内容审核】未通过，不予回复。\n\n{msg}", msg_ref=msg_ref) + return # 发送qq信息 try: # 防止被qq频道过滤消息 - gap_chatgpt_res = chatgpt_res.replace(".", " . ") - # 过滤不合适的词 - for i in uw.unfit_words: - if i in gap_chatgpt_res: - gap_chatgpt_res = gap_chatgpt_res.replace(i, "***") - # 发送信息 + gap_chatgpt_res = judged_res.replace(".", " . ") send_qq_msg(message, ''+gap_chatgpt_res, msg_ref=msg_ref) + # 发送信息 + except BaseException as e: print("QQ频道API错误: \n"+str(e)) f_res = "" @@ -653,10 +680,6 @@ def oper_msg(message, at=False, msg_ref = None): send_qq_msg(message, ''+f_res, msg_ref=msg_ref) # send(message, f"QQ频道API错误：{str(e)}\n下面是格式化后的回答：\n{f_res}") - # 记录日志 - logf.write("[GPT] "+ str(chatgpt_res)+'\n') - logf.flush() - ''' 获取统计信息