From 983bc3da3c9681d471a678c83f9883c02df3b8e9 Mon Sep 17 00:00:00 2001 From: Rock Chin <1010553892@qq.com> Date: Thu, 18 May 2023 20:10:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E5=BB=B6=E8=BF=9F=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config-template.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config-template.py b/config-template.py index f7df2096..4cc394c3 100644 --- a/config-template.py +++ b/config-template.py @@ -241,6 +241,14 @@ process_message_timeout = 30 # 回复消息时是否显示[GPT]前缀 show_prefix = False +# 回复前的强制延迟时间，降低机器人被腾讯风控概率 +# *此机制对命令和消息、私聊及群聊均生效 +# 每次处理时从以下的范围取一个随机秒数， +# 当此次消息处理时间低于此秒数时，将会强制延迟至此秒数 +# 例如：[2, 5]，则每次处理时会随机取一个2-5秒的随机数，若处理时间低于此随机数，则强制延迟至此随机秒数 +# 若您不需要此功能，请将force_delay_range设置为[0, 0] +force_delay_range = [2, 5] + # 应用长消息处理策略的阈值 # 当回复消息长度超过此值时，将使用长消息处理策略 blob_message_threshold = 256 From c51dffef3a1f9f3ebb85daa4e6a414e9d40d5aa4 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 18 May 2023 12:10:33 +0000 Subject: [PATCH 2/5] Update override-all.json --- override-all.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/override-all.json b/override-all.json index b99b91c0..23f402b4 100644 --- a/override-all.json +++ b/override-all.json @@ -67,6 +67,10 @@ "include_image_description": true, "process_message_timeout": 30, "show_prefix": false, + "force_delay_range": [ + 2, + 5 + ], "blob_message_threshold": 256, "blob_message_strategy": "forward", "wait_last_done": true, From 820a7b78fc4f85f4c4ba96a8972a7464d0f3f6de Mon Sep 17 00:00:00 2001 From: Rock Chin <1010553892@qq.com> Date: Thu, 18 May 2023 20:12:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E5=A4=84=E7=90=86=E8=BF=87?= =?UTF-8?q?=E7=A8=8B=E6=94=AF=E6=8C=81=E5=BC=BA=E5=88=B6=E5=BB=B6=E8=BF=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/qqbot/process.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkg/qqbot/process.py b/pkg/qqbot/process.py index 545886d1..5af3c084 100644 --- a/pkg/qqbot/process.py +++ b/pkg/qqbot/process.py @@ -80,6 +80,10 @@ def process_message(launcher_type: str, launcher_id: int, text_message: str, mes text_message = text_message.strip() + + # 为强制消息延迟计时 + start_time = time.time() + # 处理消息 try: @@ -168,4 +172,23 @@ def process_message(launcher_type: str, launcher_id: int, text_message: str, mes finally: pkg.openai.session.get_session(session_name).release_response_lock() + # 检查延迟时间 + if config.force_delay_range[1] == 0: + delay_time = 0 + else: + import random + + # 从延迟范围中随机取一个值(浮点) + rdm = random.uniform(config.force_delay_range[0], config.force_delay_range[1]) + + spent = time.time() - start_time + + # 如果花费时间小于延迟时间，则延迟 + delay_time = rdm - spent if rdm - spent > 0 else 0 + + # 延迟 + if delay_time > 0: + logging.info("[风控] 强制延迟{:.2f}秒(如需关闭，请到config.py修改force_delay_range字段)".format(delay_time)) + time.sleep(delay_time) + return MessageChain(reply) From 77d5585b7c561a550c8f988c0edf4c9804123e1b Mon Sep 17 00:00:00 2001 From: Rock Chin <1010553892@qq.com> Date: Thu, 18 May 2023 20:13:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E5=BB=B6=E8=BF=9F=E9=BB=98=E8=AE=A4=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config-template.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config-template.py b/config-template.py index 4cc394c3..2588ca35 100644 --- a/config-template.py +++ b/config-template.py @@ -245,9 +245,9 @@ show_prefix = False # *此机制对命令和消息、私聊及群聊均生效 # 每次处理时从以下的范围取一个随机秒数， # 当此次消息处理时间低于此秒数时，将会强制延迟至此秒数 -# 例如：[2, 5]，则每次处理时会随机取一个2-5秒的随机数，若处理时间低于此随机数，则强制延迟至此随机秒数 +# 例如：[1.5, 3]，则每次处理时会随机取一个1.5-3秒的随机数，若处理时间低于此随机数，则强制延迟至此随机秒数 # 若您不需要此功能，请将force_delay_range设置为[0, 0] -force_delay_range = [2, 5] +force_delay_range = [1.5, 3] # 应用长消息处理策略的阈值 # 当回复消息长度超过此值时，将使用长消息处理策略 From 37eb74338f01e906e25346eac06f600d8fe29dce Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Thu, 18 May 2023 12:14:19 +0000 Subject: [PATCH 5/5] Update override-all.json --- override-all.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/override-all.json b/override-all.json index 23f402b4..298f9b61 100644 --- a/override-all.json +++ b/override-all.json @@ -68,8 +68,8 @@ "process_message_timeout": 30, "show_prefix": false, "force_delay_range": [ - 2, - 5 + 1.5, + 3 ], "blob_message_threshold": 256, "blob_message_strategy": "forward",