From 095bd95044cec18ec9f405e8d537b28f1cbcbf59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=80=A7=E8=83=BD=E6=88=A6=E9=97=98=E3=83=AD?= =?UTF-8?q?=E3=83=9C?= <86878459+Kx-Y@users.noreply.github.com> Date: Sun, 2 Mar 2025 13:11:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=BAswitch=5Fconv=E7=9A=84index?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=B7=BB=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/astrbot/main.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/astrbot/main.py b/packages/astrbot/main.py index 84719b7c0..2e20e16b1 100644 --- a/packages/astrbot/main.py +++ b/packages/astrbot/main.py @@ -565,7 +565,11 @@ UID: {user_id} 此 ID 可用于设置管理员。/op 授权管理员, /deo @filter.command("switch") async def switch_conv(self, message: AstrMessageEvent, index: int = None): '''通过 /ls 前面的序号切换对话''' - + + if type(index) != int: + message.set_result(MessageEventResult().message("类型错误,请输入数字对话序号。")) + return + provider = self.context.get_using_provider() if provider and provider.meta().type == 'dify': assert isinstance(provider, ProviderDify) @@ -991,4 +995,4 @@ UID: {user_id} 此 ID 可用于设置管理员。/op 授权管理员, /deo # if results: # req.system_prompt += "\nHere are documents that related to user's query: \n" # for result in results: - # req.system_prompt += f"- {result}\n"7 \ No newline at end of file + # req.system_prompt += f"- {result}\n"7 From a2443c4ac1a083553fc7c8ce83b8229a298eaa6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=80=A7=E8=83=BD=E6=88=A6=E9=97=98=E3=83=AD?= =?UTF-8?q?=E3=83=9C?= <86878459+Kx-Y@users.noreply.github.com> Date: Sun, 2 Mar 2025 13:30:34 +0800 Subject: [PATCH 2/3] Update main.py --- packages/astrbot/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/astrbot/main.py b/packages/astrbot/main.py index 2e20e16b1..6bbb9555a 100644 --- a/packages/astrbot/main.py +++ b/packages/astrbot/main.py @@ -566,7 +566,7 @@ UID: {user_id} 此 ID 可用于设置管理员。/op 授权管理员, /deo async def switch_conv(self, message: AstrMessageEvent, index: int = None): '''通过 /ls 前面的序号切换对话''' - if type(index) != int: + if not isinstance(index,int): message.set_result(MessageEventResult().message("类型错误,请输入数字对话序号。")) return From f9db97c6b0666a331e2699eaf0d32d0b04dd6f63 Mon Sep 17 00:00:00 2001 From: Soulter <37870767+Soulter@users.noreply.github.com> Date: Sun, 2 Mar 2025 13:36:17 +0800 Subject: [PATCH 3/3] Update main.py --- packages/astrbot/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/astrbot/main.py b/packages/astrbot/main.py index 6bbb9555a..90f92c2c8 100644 --- a/packages/astrbot/main.py +++ b/packages/astrbot/main.py @@ -566,7 +566,7 @@ UID: {user_id} 此 ID 可用于设置管理员。/op 授权管理员, /deo async def switch_conv(self, message: AstrMessageEvent, index: int = None): '''通过 /ls 前面的序号切换对话''' - if not isinstance(index,int): + if not isinstance(index, int): message.set_result(MessageEventResult().message("类型错误,请输入数字对话序号。")) return