From 175ea61edaa05451c15de4406710b26b1ea1efdf Mon Sep 17 00:00:00 2001 From: corolin Date: Tue, 18 Mar 2025 23:23:23 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=A3=80=E6=9F=A5=E4=BB=A5=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 此更改引入了一种新的方式来通过检查特定的环境变量是否被设置来确认最终用户许可协议（EULA）和隐私政策。如果 `EULA_AGREE` 或 `PRIVACY_AGREE` 与各自的新哈希值匹配，则认为这些协议已被确认，用户将不会被再次提示确认。此外，提示消息也已更新，告知用户这一新选项。 --- bot.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bot.py b/bot.py index e8f3ae806..e4726f14a 100644 --- a/bot.py +++ b/bot.py @@ -205,6 +205,9 @@ def check_eula(): if eula_new_hash == confirmed_content: eula_confirmed = True eula_updated = False + if eula_new_hash == os.getenv("EULA_AGREE"): + eula_confirmed = True + eula_updated = False # 检查隐私条款确认文件是否存在 if privacy_confirm_file.exists(): @@ -213,11 +216,14 @@ def check_eula(): if privacy_new_hash == confirmed_content: privacy_confirmed = True privacy_updated = False + if privacy_new_hash == os.getenv("PRIVACY_AGREE"): + privacy_confirmed = True + privacy_updated = False # 如果EULA或隐私条款有更新，提示用户重新确认 if eula_updated or privacy_updated: print("EULA或隐私条款内容已更新，请在阅读后重新确认，继续运行视为同意更新后的以上两款协议") - print('输入"同意"或"confirmed"继续运行') + print(f'输入"同意"或"confirmed"或设置环境变量"EULA_AGREE={eula_new_hash}"和"PRIVACY_AGREE={privacy_new_hash}"继续运行') while True: user_input = input().strip().lower() if user_input in ['同意', 'confirmed']: From 609aaa9be532b117f60ca36ad66da949d8aea0a0 Mon Sep 17 00:00:00 2001 From: Corolin Date: Wed, 19 Mar 2025 10:26:34 +0800 Subject: [PATCH 02/14] Update docker-image.yml --- .github/workflows/docker-image.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index c06d967ca..e88dbf63b 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -22,18 +22,18 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} + username: ${{ vars.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Determine Image Tags id: tags run: | if [[ "${{ github.ref }}" == refs/tags/* ]]; then - echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:${{ github.ref_name }},${{ secrets.DOCKERHUB_USERNAME }}/maimbot:latest" >> $GITHUB_OUTPUT + echo "tags=${{ vars.DOCKERHUB_USERNAME }}/maimbot:${{ github.ref_name }},${{ vars.DOCKERHUB_USERNAME }}/maimbot:latest" >> $GITHUB_OUTPUT elif [ "${{ github.ref }}" == "refs/heads/main" ]; then - echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main,${{ secrets.DOCKERHUB_USERNAME }}/maimbot:latest" >> $GITHUB_OUTPUT + echo "tags=${{ vars.DOCKERHUB_USERNAME }}/maimbot:main,${{ vars.DOCKERHUB_USERNAME }}/maimbot:latest" >> $GITHUB_OUTPUT elif [ "${{ github.ref }}" == "refs/heads/main-fix" ]; then - echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:main-fix" >> $GITHUB_OUTPUT + echo "tags=${{ vars.DOCKERHUB_USERNAME }}/maimbot:main-fix" >> $GITHUB_OUTPUT fi - name: Build and Push Docker Image @@ -44,5 +44,5 @@ jobs: platforms: linux/amd64,linux/arm64 tags: ${{ steps.tags.outputs.tags }} push: true - cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache - cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/maimbot:buildcache,mode=max + cache-from: type=registry,ref=${{ vars.DOCKERHUB_USERNAME }}/maimbot:buildcache + cache-to: type=registry,ref=${{ vars.DOCKERHUB_USERNAME }}/maimbot:buildcache,mode=max From 6b24cdd45a62c86a83077485c44cf3b931772596 Mon Sep 17 00:00:00 2001 From: DrSmoothl <1787882683@qq.com> Date: Wed, 19 Mar 2025 18:28:52 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=BE=A4?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5f8f75627..0c635a523 100644 --- a/README.md +++ b/README.md @@ -128,11 +128,11 @@ MaiMBot是一个开源项目，我们非常欢迎你的参与。你的贡献，无论是提交bug报告、功能需求还是代码pr，都对项目非常宝贵。我们非常感谢你的支持！🎉 但无序的讨论会降低沟通效率，进而影响问题的解决速度，因此在提交任何贡献前，请务必先阅读本项目的[贡献指南](CONTRIBUTE.md) ### 💬交流群 -- [一群](https://qm.qq.com/q/VQ3XZrWgMs) 766798517 ，建议加下面的（开发和建议相关讨论）不一定有空回复，会优先写文档和代码 -- [二群](https://qm.qq.com/q/RzmCiRtHEW) 571780722 （开发和建议相关讨论）不一定有空回复，会优先写文档和代码 -- [三群](https://qm.qq.com/q/wlH5eT8OmQ) 1035228475（开发和建议相关讨论）不一定有空回复，会优先写文档和代码 -- [四群](https://qm.qq.com/q/wlH5eT8OmQ) 729957033（开发和建议相关讨论）不一定有空回复，会优先写文档和代码 - +- [五群](https://qm.qq.com/q/JxvHZnxyec) 1022489779（开发和建议相关讨论）不一定有空回复，会优先写文档和代码 +- [一群](https://qm.qq.com/q/VQ3XZrWgMs) 766798517 【已满】（开发和建议相关讨论）不一定有空回复，会优先写文档和代码 +- [二群](https://qm.qq.com/q/RzmCiRtHEW) 571780722 【已满】（开发和建议相关讨论）不一定有空回复，会优先写文档和代码 +- [三群](https://qm.qq.com/q/wlH5eT8OmQ) 1035228475【已满】（开发和建议相关讨论）不一定有空回复，会优先写文档和代码 +- [四群](https://qm.qq.com/q/wlH5eT8OmQ) 729957033【已满】（开发和建议相关讨论）不一定有空回复，会优先写文档和代码
From 8f0cbdf1ba56c3e2f84385089452a48df425d128 Mon Sep 17 00:00:00 2001 From: UnCLAS-Prommer Date: Wed, 19 Mar 2025 21:17:31 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9qa=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E7=AE=80=E7=9B=B4=E7=81=BE=E9=9A=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/fast_q_a.md | 113 +++++++++++------------------------------------ 1 file changed, 25 insertions(+), 88 deletions(-) diff --git a/docs/fast_q_a.md b/docs/fast_q_a.md index 0c02ddce9..1f015565d 100644 --- a/docs/fast_q_a.md +++ b/docs/fast_q_a.md @@ -1,112 +1,58 @@ ## 快速更新Q&A❓ -
- - 这个文件用来记录一些常见的新手问题。 -
- ### 完整安装教程 -
- [MaiMbot简易配置教程](https://www.bilibili.com/video/BV1zsQ5YCEE6) -
- ### Api相关问题 -
- -
- - 为什么显示:"缺失必要的API KEY" ❓ -
- - - ---- - -
- ->
-> ->你需要在 [Silicon Flow Api](https://cloud.siliconflow.cn/account/ak) ->网站上注册一个账号，然后点击这个链接打开API KEY获取页面。 +>你需要在 [Silicon Flow Api](https://cloud.siliconflow.cn/account/ak) 网站上注册一个账号，然后点击这个链接打开API KEY获取页面。 > >点击 "新建API密钥" 按钮新建一个给MaiMBot使用的API KEY。不要忘了点击复制。 > >之后打开MaiMBot在你电脑上的文件根目录，使用记事本或者其他文本编辑器打开 [.env.prod](../.env.prod) ->这个文件。把你刚才复制的API KEY填入到 "SILICONFLOW_KEY=" 这个等号的右边。 +>这个文件。把你刚才复制的API KEY填入到 `SILICONFLOW_KEY=` 这个等号的右边。 > >在默认情况下，MaiMBot使用的默认Api都是硅基流动的。 -> ->
- -
- -
+--- - 我想使用硅基流动之外的Api网站，我应该怎么做 ❓ ---- - -
- ->
-> >你需要使用记事本或者其他文本编辑器打开config目录下的 [bot_config.toml](../config/bot_config.toml) ->然后修改其中的 "provider = " 字段。同时不要忘记模仿 [.env.prod](../.env.prod) ->文件的写法添加 Api Key 和 Base URL。 > ->举个例子，如果你写了 " provider = \"ABC\" "，那你需要相应的在 [.env.prod](../.env.prod) ->文件里添加形如 " ABC_BASE_URL = https://api.abc.com/v1 " 和 " ABC_KEY = sk-1145141919810 " 的字段。 +>然后修改其中的 `provider = ` 字段。同时不要忘记模仿 [.env.prod](../.env.prod) 文件的写法添加 Api Key 和 Base URL。 > ->**如果你对AI没有较深的了解，修改识图模型和嵌入模型的provider字段可能会产生bug，因为你从Api网站调用了一个并不存在的模型** +>举个例子，如果你写了 `provider = "ABC"`，那你需要相应的在 [.env.prod](../.env.prod) 文件里添加形如 `ABC_BASE_URL = https://api.abc.com/v1` 和 `ABC_KEY = sk-1145141919810` 的字段。 > ->这个时候，你需要把字段的值改回 "provider = \"SILICONFLOW\" " 以此解决bug。 +>**如果你对AI模型没有较深的了解，修改识图模型和嵌入模型的provider字段可能会产生bug，因为你从Api网站调用了一个并不存在的模型** > ->
- - -
+>这个时候，你需要把字段的值改回 `provider = "SILICONFLOW"` 以此解决此问题。 ### MongoDB相关问题 -
- - 我应该怎么清空bot内存储的表情包 ❓ ---- - -
- ->
-> >打开你的MongoDB Compass软件，你会在左上角看到这样的一个界面： > ->
-> > > >
> >点击 "CONNECT" 之后，点击展开 MegBot 标签栏 > ->
-> > > >
> >点进 "emoji" 再点击 "DELETE" 删掉所有条目，如图所示 > ->
-> > > >
@@ -116,63 +62,54 @@ >MaiMBot的所有图片均储存在 [data](../data) 文件夹内，按类型分为 [emoji](../data/emoji) 和 [image](../data/image) > >在删除服务器数据时不要忘记清空这些图片。 -> ->
- -
- -- 为什么我连接不上MongoDB服务器 ❓ --- +- 为什么我连接不上MongoDB服务器 ❓ ->
-> >这个问题比较复杂，但是你可以按照下面的步骤检查，看看具体是什么问题 > ->
-> > 1. 检查有没有把 mongod.exe 所在的目录添加到 path。 具体可参照 > ->
-> >  [CSDN-windows10设置环境变量Path详细步骤](https://blog.csdn.net/flame_007/article/details/106401215) > ->
-> >  **需要往path里填入的是 exe 所在的完整目录！不带 exe 本体** > >
> > 2. 环境变量添加完之后，可以按下`WIN+R`,在弹出的小框中输入`powershell`，回车，进入到powershell界面后，输入`mongod --version`如果有输出信息，就说明你的环境变量添加成功了。 > 接下来，直接输入`mongod --port 27017`命令(`--port`指定了端口，方便在可视化界面中连接)，如果连不上，很大可能会出现 ->``` +>```shell >"error":"NonExistentPath: Data directory \\data\\db not found. Create the missing directory or specify another path using (1) the --dbpath command line option, or (2) by adding the 'storage.dbPath' option in the configuration file." >``` >这是因为你的C盘下没有`data\db`文件夹，mongo不知道将数据库文件存放在哪，不过不建议在C盘中添加,因为这样你的C盘负担会很大，可以通过`mongod --dbpath=PATH --port 27017`来执行，将`PATH`替换成你的自定义文件夹，但是不要放在mongodb的bin文件夹下！例如，你可以在D盘中创建一个mongodata文件夹，然后命令这样写 ->```mongod --dbpath=D:\mongodata --port 27017``` -> +>```shell +>mongod --dbpath=D:\mongodata --port 27017 +>``` > >如果还是不行，有可能是因为你的27017端口被占用了 >通过命令 ->``` +>```shell > netstat -ano | findstr :27017 >``` >可以查看当前端口是否被占用，如果有输出,其一般的格式是这样的 ->``` ->TCP 127.0.0.1:27017 0.0.0.0:0 LISTENING 5764 ->TCP 127.0.0.1:27017 127.0.0.1:63387 ESTABLISHED 5764 +>```shell +> TCP 127.0.0.1:27017 0.0.0.0:0 LISTENING 5764 +> TCP 127.0.0.1:27017 127.0.0.1:63387 ESTABLISHED 5764 > TCP 127.0.0.1:27017 127.0.0.1:63388 ESTABLISHED 5764 > TCP 127.0.0.1:27017 127.0.0.1:63389 ESTABLISHED 5764 >``` >最后那个数字就是PID,通过以下命令查看是哪些进程正在占用 ->```tasklist /FI "PID eq 5764"``` ->如果是无关紧要的进程，可以通过`taskkill`命令关闭掉它，例如`Taskkill /F /PID 5764` ->如果你对命令行实在不熟悉，可以通过`Ctrl+Shift+Esc`调出任务管理器，在搜索框中输入PID，也可以找到相应的进程。 ->如果你害怕关掉重要进程，可以修改`.env.dev`中的`MONGODB_PORT`为其它值，并在启动时同时修改`--port`参数为一样的值 +>```shell +>tasklist /FI "PID eq 5764" >``` +>如果是无关紧要的进程，可以通过`taskkill`命令关闭掉它，例如`Taskkill /F /PID 5764` +> +>如果你对命令行实在不熟悉，可以通过`Ctrl+Shift+Esc`调出任务管理器，在搜索框中输入PID，也可以找到相应的进程。 +> +>如果你害怕关掉重要进程，可以修改`.env.dev`中的`MONGODB_PORT`为其它值，并在启动时同时修改`--port`参数为一样的值 +>```ini >MONGODB_HOST=127.0.0.1 >MONGODB_PORT=27017 #修改这里 >DATABASE_NAME=MegBot ->``` ->
+>``` \ No newline at end of file From e0d766611b20588a1dbf7ec8527af4b5fb5d86f4 Mon Sep 17 00:00:00 2001 From: Maple127667 <98679702+Maple127667@users.noreply.github.com> Date: Wed, 19 Mar 2025 21:21:57 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=BD=AC=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加了合并转发消息的处理，目前可以处理简单的合并转发，暂不支持嵌套转发，不支持转发内图片识别（我觉得转发内图片不该识别 --- src/plugins/chat/__init__.py | 7 ++-- src/plugins/chat/bot.py | 63 ++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) diff --git a/src/plugins/chat/__init__.py b/src/plugins/chat/__init__.py index 7a4f4c6f6..a54f781a0 100644 --- a/src/plugins/chat/__init__.py +++ b/src/plugins/chat/__init__.py @@ -92,8 +92,11 @@ async def _(bot: Bot): @msg_in.handle() async def _(bot: Bot, event: MessageEvent, state: T_State): - await chat_bot.handle_message(event, bot) - + #处理合并转发消息 + if "forward" in event.message: + await chat_bot.handle_forward_message(event , bot) + else : + await chat_bot.handle_message(event, bot) @notice_matcher.handle() async def _(bot: Bot, event: NoticeEvent, state: T_State): diff --git a/src/plugins/chat/bot.py b/src/plugins/chat/bot.py index 04d0dd27f..0e4553c5f 100644 --- a/src/plugins/chat/bot.py +++ b/src/plugins/chat/bot.py @@ -411,6 +411,69 @@ class ChatBot: await self.message_process(message_cq) + async def handle_forward_message(self, event: MessageEvent, bot: Bot) -> None: + """专用于处理合并转发的消息处理器""" + # 获取合并转发消息的详细信息 + forward_info = await bot.get_forward_msg(message_id=event.message_id) + messages = forward_info["messages"] + + # 构建合并转发消息的文本表示 + processed_messages = [] + for node in messages: + # 提取发送者昵称 + nickname = node["sender"].get("nickname", "未知用户") + + # 处理消息内容 + message_content = [] + for seg in node["message"]: + if seg["type"] == "text": + message_content.append(seg["data"]["text"]) + elif seg["type"] == "image": + message_content.append("[图片]") + elif seg["type"] =="face": + message_content.append("[表情]") + elif seg["type"] == "at": + message_content.append(f"@{seg['data'].get('qq', '未知用户')}") + else: + message_content.append(f"[{seg['type']}]") + + # 拼接为【昵称】+ 内容 + processed_messages.append(f"【{nickname}】{''.join(message_content)}") + + # 组合所有消息 + combined_message = "\n".join(processed_messages) + combined_message = f"合并转发消息内容：\n{combined_message}" + + # 构建用户信息（使用转发消息的发送者） + user_info = UserInfo( + user_id=event.user_id, + user_nickname=event.sender.nickname, + user_cardname=event.sender.card if hasattr(event.sender, "card") else None, + platform="qq", + ) + + # 构建群聊信息（如果是群聊） + group_info = None + if isinstance(event, GroupMessageEvent): + group_info = GroupInfo( + group_id=event.group_id, + group_name= None, + platform="qq" + ) + + # 创建消息对象 + message_cq = MessageRecvCQ( + message_id=event.message_id, + user_info=user_info, + raw_message=combined_message, + group_info=group_info, + reply_message=event.reply, + platform="qq", + ) + + # 进入标准消息处理流程 + await self.message_process(message_cq) + # 创建全局ChatBot实例 chat_bot = ChatBot() From 0b0bfdb48dacd36d56844756af6f89595b79a325 Mon Sep 17 00:00:00 2001 From: Maple127667 <98679702+Maple127667@users.noreply.github.com> Date: Wed, 19 Mar 2025 21:25:53 +0800 Subject: [PATCH 06/14] bug-fix --- src/plugins/chat/bot.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/chat/bot.py b/src/plugins/chat/bot.py index 0e4553c5f..e39d29f42 100644 --- a/src/plugins/chat/bot.py +++ b/src/plugins/chat/bot.py @@ -5,6 +5,7 @@ from nonebot.adapters.onebot.v11 import ( Bot, MessageEvent, PrivateMessageEvent, + GroupMessageEvent, NoticeEvent, PokeNotifyEvent, GroupRecallNoticeEvent, @@ -474,6 +475,6 @@ class ChatBot: # 进入标准消息处理流程 await self.message_process(message_cq) - + # 创建全局ChatBot实例 chat_bot = ChatBot() From 004a1f6aaa8fdf59ec637604fe5ac6ae4218be60 Mon Sep 17 00:00:00 2001 From: DrSmoothl <1787882683@qq.com> Date: Wed, 19 Mar 2025 22:28:14 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=80=E4=BD=8E?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=89=88=E6=9C=AC=E4=B8=BA0.5.13,=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E6=9B=B4=E5=A4=9A=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webui.py | 65 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/webui.py b/webui.py index 2c1760826..74750e5a1 100644 --- a/webui.py +++ b/webui.py @@ -1,14 +1,35 @@ import gradio as gr import os import toml -from src.common.logger import get_module_logger +import signal +import sys +try: + from src.common.logger import get_module_logger + logger = get_module_logger("webui") +except ImportError: + from loguru import logger + # 检查并创建日志目录 + log_dir = "logs/webui" + if not os.path.exists(log_dir): + os.makedirs(log_dir, exist_ok=True) + # 配置控制台输出格式 + logger.remove() # 移除默认的处理器 + logger.add(sys.stderr, format="{time:MM-DD HH:mm} | webui | {message}") # 添加控制台输出 + logger.add("logs/webui/{time:YYYY-MM-DD}.log", rotation="00:00", format="{time:MM-DD HH:mm} | webui | {message}") # 添加文件输出 + logger.warning("检测到src.common.logger并未导入，将使用默认loguru作为日志记录器") + logger.warning("如果你是用的是低版本(0.5.13)麦麦，请忽略此警告") import shutil import ast -import json from packaging import version -from decimal import Decimal, ROUND_DOWN +from decimal import Decimal -logger = get_module_logger("webui") +def signal_handler(signum, frame): + """处理 Ctrl+C 信号""" + logger.info("收到终止信号，正在关闭 Gradio 服务器...") + sys.exit(0) + +# 注册信号处理器 +signal.signal(signal.SIGINT, signal_handler) is_share = False debug = True @@ -22,13 +43,30 @@ if not os.path.exists(".env.prod"): raise FileNotFoundError("环境配置文件 .env.prod 不存在，请检查配置文件路径") config_data = toml.load("config/bot_config.toml") +#增加对老版本配置文件支持 +LEGACY_CONFIG_VERSION = version.parse("0.0.1") + +#增加最低支持版本 +MIN_SUPPORT_VERSION = version.parse("0.0.8") +MIN_SUPPORT_MAIMAI_VERSION = version.parse("0.5.13") + +if "inner" in config_data: + CONFIG_VERSION = config_data["inner"]["version"] + PARSED_CONFIG_VERSION = version.parse(CONFIG_VERSION) + if PARSED_CONFIG_VERSION < MIN_SUPPORT_VERSION: + logger.error("您的麦麦版本过低！！已经不再支持，请更新到最新版本！！") + logger.error("最低支持的麦麦版本：" + str(MIN_SUPPORT_MAIMAI_VERSION)) + raise Exception("您的麦麦版本过低！！已经不再支持，请更新到最新版本！！") +else: + logger.error("您的麦麦版本过低！！已经不再支持，请更新到最新版本！！") + logger.error("最低支持的麦麦版本：" + str(MIN_SUPPORT_MAIMAI_VERSION)) + raise Exception("您的麦麦版本过低！！已经不再支持，请更新到最新版本！！") + -CONFIG_VERSION = config_data["inner"]["version"] -PARSED_CONFIG_VERSION = version.parse(CONFIG_VERSION) HAVE_ONLINE_STATUS_VERSION = version.parse("0.0.9") #添加WebUI配置文件版本 -WEBUI_VERSION = version.parse("0.0.8") +WEBUI_VERSION = version.parse("0.0.9") # ============================================== # env环境配置文件读取部分 @@ -522,9 +560,14 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: gr.Markdown( value="## 当前WebUI版本: " + str(WEBUI_VERSION) ) - gr.Markdown( - value="### 配置文件版本：" + config_data["inner"]["version"] - ) + if PARSED_CONFIG_VERSION > LEGACY_CONFIG_VERSION: + gr.Markdown( + value="### 配置文件版本：" + config_data["inner"]["version"] + ) + else: + gr.Markdown( + value="### 配置文件版本：" + "LEGACY(旧版本)" + ) with gr.Tabs(): with gr.TabItem("0-环境设置"): with gr.Row(): @@ -1362,6 +1405,8 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: ) with gr.Row(): remote_status = gr.Checkbox(value=config_data['remote']['enable'], label="是否开启麦麦在线全球统计") + else: + remote_status = gr.Checkbox(value=False,visible=False) with gr.Row(): From 9ebe0369210a1af1ac349416a178de02d12619da Mon Sep 17 00:00:00 2001 From: DrSmoothl <1787882683@qq.com> Date: Wed, 19 Mar 2025 22:32:59 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=80=E4=BD=8E?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=89=88=E6=9C=AC=E4=B8=BA0.5.13,=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E6=9B=B4=E5=A4=9A=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webui.py | 1070 ++++++++++++++++++++---------------------------------- 1 file changed, 399 insertions(+), 671 deletions(-) diff --git a/webui.py b/webui.py index 7aaf7e786..1dbfba3a9 100644 --- a/webui.py +++ b/webui.py @@ -1,14 +1,35 @@ import gradio as gr import os import toml -import requests -from src.common.logger import get_module_logger +import signal +import sys +try: + from src.common.logger import get_module_logger + logger = get_module_logger("webui") +except ImportError: + from loguru import logger + # 检查并创建日志目录 + log_dir = "logs/webui" + if not os.path.exists(log_dir): + os.makedirs(log_dir, exist_ok=True) + # 配置控制台输出格式 + logger.remove() # 移除默认的处理器 + logger.add(sys.stderr, format="{time:MM-DD HH:mm} | webui | {message}") # 添加控制台输出 + logger.add("logs/webui/{time:YYYY-MM-DD}.log", rotation="00:00", format="{time:MM-DD HH:mm} | webui | {message}") # 添加文件输出 + logger.warning("检测到src.common.logger并未导入，将使用默认loguru作为日志记录器") + logger.warning("如果你是用的是低版本(0.5.13)麦麦，请忽略此警告") import shutil import ast from packaging import version from decimal import Decimal -logger = get_module_logger("webui") +def signal_handler(signum, frame): + """处理 Ctrl+C 信号""" + logger.info("收到终止信号，正在关闭 Gradio 服务器...") + sys.exit(0) + +# 注册信号处理器 +signal.signal(signal.SIGINT, signal_handler) is_share = False debug = True @@ -22,14 +43,30 @@ if not os.path.exists(".env.prod"): raise FileNotFoundError("环境配置文件 .env.prod 不存在，请检查配置文件路径") config_data = toml.load("config/bot_config.toml") +#增加对老版本配置文件支持 +LEGACY_CONFIG_VERSION = version.parse("0.0.1") + +#增加最低支持版本 +MIN_SUPPORT_VERSION = version.parse("0.0.8") +MIN_SUPPORT_MAIMAI_VERSION = version.parse("0.5.13") + +if "inner" in config_data: + CONFIG_VERSION = config_data["inner"]["version"] + PARSED_CONFIG_VERSION = version.parse(CONFIG_VERSION) + if PARSED_CONFIG_VERSION < MIN_SUPPORT_VERSION: + logger.error("您的麦麦版本过低！！已经不再支持，请更新到最新版本！！") + logger.error("最低支持的麦麦版本：" + str(MIN_SUPPORT_MAIMAI_VERSION)) + raise Exception("您的麦麦版本过低！！已经不再支持，请更新到最新版本！！") +else: + logger.error("您的麦麦版本过低！！已经不再支持，请更新到最新版本！！") + logger.error("最低支持的麦麦版本：" + str(MIN_SUPPORT_MAIMAI_VERSION)) + raise Exception("您的麦麦版本过低！！已经不再支持，请更新到最新版本！！") + -CONFIG_VERSION = config_data["inner"]["version"] -PARSED_CONFIG_VERSION = version.parse(CONFIG_VERSION) HAVE_ONLINE_STATUS_VERSION = version.parse("0.0.9") -# 添加WebUI配置文件版本 -WEBUI_VERSION = version.parse("0.0.8") - +#添加WebUI配置文件版本 +WEBUI_VERSION = version.parse("0.0.9") # ============================================== # env环境配置文件读取部分 @@ -66,7 +103,6 @@ def parse_env_config(config_file): return env_variables - # env环境配置文件保存函数 def save_to_env_file(env_variables, filename=".env.prod"): """ @@ -84,7 +120,7 @@ def save_to_env_file(env_variables, filename=".env.prod"): logger.warning(f"{filename} 不存在，无法进行备份。") # 保存新配置 - with open(filename, "w", encoding="utf-8") as f: + with open(filename, "w",encoding="utf-8") as f: for var, value in env_variables.items(): f.write(f"{var[4:]}={value}\n") # 移除env_前缀 logger.info(f"配置已保存到 {filename}") @@ -107,7 +143,6 @@ else: env_config_data["env_VOLCENGINE_KEY"] = "volc_key" save_to_env_file(env_config_data, env_config_file) - def parse_model_providers(env_vars): """ 从环境变量中解析模型提供商列表 @@ -124,7 +159,6 @@ def parse_model_providers(env_vars): providers.append(provider) return providers - def add_new_provider(provider_name, current_providers): """ 添加新的提供商到列表中 @@ -149,15 +183,14 @@ def add_new_provider(provider_name, current_providers): return updated_providers, gr.update(choices=updated_providers) - # 从环境变量中解析并更新提供商列表 MODEL_PROVIDER_LIST = parse_model_providers(env_config_data) # env读取保存结束 # ============================================== -# 获取在线麦麦数量 - +#获取在线麦麦数量 +import requests def get_online_maimbot(url="http://hyybuth.xyz:10058/api/clients/details", timeout=10): """ @@ -192,12 +225,10 @@ def get_online_maimbot(url="http://hyybuth.xyz:10058/api/clients/details", timeo logger.error("无法解析返回的JSON数据，请检查API返回内容。") return None - online_maimbot_data = get_online_maimbot() - -# ============================================== -# env环境文件中插件修改更新函数 +#============================================== +#env环境文件中插件修改更新函数 def add_item(new_item, current_list): updated_list = current_list.copy() if new_item.strip(): @@ -206,16 +237,19 @@ def add_item(new_item, current_list): updated_list, # 更新State "\n".join(updated_list), # 更新TextArea gr.update(choices=updated_list), # 更新Dropdown - ", ".join(updated_list), # 更新最终结果 + ", ".join(updated_list) # 更新最终结果 ] - def delete_item(selected_item, current_list): updated_list = current_list.copy() if selected_item in updated_list: updated_list.remove(selected_item) - return [updated_list, "\n".join(updated_list), gr.update(choices=updated_list), ", ".join(updated_list)] - + return [ + updated_list, + "\n".join(updated_list), + gr.update(choices=updated_list), + ", ".join(updated_list) + ] def add_int_item(new_item, current_list): updated_list = current_list.copy() @@ -230,10 +264,9 @@ def add_int_item(new_item, current_list): updated_list, # 更新State "\n".join(map(str, updated_list)), # 更新TextArea gr.update(choices=updated_list), # 更新Dropdown - ", ".join(map(str, updated_list)), # 更新最终结果 + ", ".join(map(str, updated_list)) # 更新最终结果 ] - def delete_int_item(selected_item, current_list): updated_list = current_list.copy() if selected_item in updated_list: @@ -242,10 +275,8 @@ def delete_int_item(selected_item, current_list): updated_list, "\n".join(map(str, updated_list)), gr.update(choices=updated_list), - ", ".join(map(str, updated_list)), + ", ".join(map(str, updated_list)) ] - - # env文件中插件值处理函数 def parse_list_str(input_str): """ @@ -262,7 +293,6 @@ def parse_list_str(input_str): cleaned = input_str.strip(" []") # 去除方括号 return [item.strip(" '\"") for item in cleaned.split(",") if item.strip()] - def format_list_to_str(lst): """ 将Python列表转换为形如["src2.plugins.chat"]的字符串格式 @@ -282,21 +312,7 @@ def format_list_to_str(lst): # env保存函数 -def save_trigger( - server_address, - server_port, - final_result_list, - t_mongodb_host, - t_mongodb_port, - t_mongodb_database_name, - t_console_log_level, - t_file_log_level, - t_default_console_log_level, - t_default_file_log_level, - t_api_provider, - t_api_base_url, - t_api_key, -): +def save_trigger(server_address, server_port, final_result_list, t_mongodb_host, t_mongodb_port, t_mongodb_database_name, t_console_log_level, t_file_log_level, t_default_console_log_level, t_default_file_log_level, t_api_provider, t_api_base_url, t_api_key): final_result_lists = format_list_to_str(final_result_list) env_config_data["env_HOST"] = server_address env_config_data["env_PORT"] = server_port @@ -319,7 +335,6 @@ def save_trigger( logger.success("配置已保存到 .env.prod 文件中") return "配置已保存" - def update_api_inputs(provider): """ 根据选择的提供商更新Base URL和API Key输入框的值 @@ -328,7 +343,6 @@ def update_api_inputs(provider): api_key = env_config_data.get(f"env_{provider}_KEY", "") return base_url, api_key - # 绑定下拉列表的change事件 @@ -348,12 +362,11 @@ def save_config_to_file(t_config_data): else: logger.warning(f"{filename} 不存在，无法进行备份。") + with open(filename, "w", encoding="utf-8") as f: toml.dump(t_config_data, f) logger.success("配置已保存到 bot_config.toml 文件中") - - -def save_bot_config(t_qqbot_qq, t_nickname, t_nickname_final_result): +def save_bot_config(t_qqbot_qq, t_nickname,t_nickname_final_result): config_data["bot"]["qq"] = int(t_qqbot_qq) config_data["bot"]["nickname"] = t_nickname config_data["bot"]["alias_names"] = t_nickname_final_result @@ -361,75 +374,45 @@ def save_bot_config(t_qqbot_qq, t_nickname, t_nickname_final_result): logger.info("Bot配置已保存") return "Bot配置已保存" - # 监听滑块的值变化，确保总和不超过 1，并显示警告 -def adjust_personality_greater_probabilities( - t_personality_1_probability, t_personality_2_probability, t_personality_3_probability -): - total = ( - Decimal(str(t_personality_1_probability)) - + Decimal(str(t_personality_2_probability)) - + Decimal(str(t_personality_3_probability)) - ) - if total > Decimal("1.0"): - warning_message = ( - f"警告: 人格1、人格2和人格3的概率总和为 {float(total):.2f}，超过了 1.0！请调整滑块使总和等于 1.0。" - ) +def adjust_personality_greater_probabilities(t_personality_1_probability, t_personality_2_probability, t_personality_3_probability): + total = Decimal(str(t_personality_1_probability)) + Decimal(str(t_personality_2_probability)) + Decimal(str(t_personality_3_probability)) + if total > Decimal('1.0'): + warning_message = f"警告: 人格1、人格2和人格3的概率总和为 {float(total):.2f}，超过了 1.0！请调整滑块使总和等于 1.0。" return warning_message return "" # 没有警告时返回空字符串 - -def adjust_personality_less_probabilities( - t_personality_1_probability, t_personality_2_probability, t_personality_3_probability -): - total = ( - Decimal(str(t_personality_1_probability)) - + Decimal(str(t_personality_2_probability)) - + Decimal(str(t_personality_3_probability)) - ) - if total < Decimal("1.0"): - warning_message = ( - f"警告: 人格1、人格2和人格3的概率总和为 {float(total):.2f}，小于 1.0！请调整滑块使总和等于 1.0。" - ) +def adjust_personality_less_probabilities(t_personality_1_probability, t_personality_2_probability, t_personality_3_probability): + total = Decimal(str(t_personality_1_probability)) + Decimal(str(t_personality_2_probability)) + Decimal(str(t_personality_3_probability)) + if total < Decimal('1.0'): + warning_message = f"警告: 人格1、人格2和人格3的概率总和为 {float(total):.2f}，小于 1.0！请调整滑块使总和等于 1.0。" return warning_message return "" # 没有警告时返回空字符串 - def adjust_model_greater_probabilities(t_model_1_probability, t_model_2_probability, t_model_3_probability): - total = ( - Decimal(str(t_model_1_probability)) + Decimal(str(t_model_2_probability)) + Decimal(str(t_model_3_probability)) - ) - if total > Decimal("1.0"): - warning_message = ( - f"警告: 选择模型1、模型2和模型3的概率总和为 {float(total):.2f}，超过了 1.0！请调整滑块使总和等于 1.0。" - ) + total = Decimal(str(t_model_1_probability)) + Decimal(str(t_model_2_probability)) + Decimal(str(t_model_3_probability)) + if total > Decimal('1.0'): + warning_message = f"警告: 选择模型1、模型2和模型3的概率总和为 {float(total):.2f}，超过了 1.0！请调整滑块使总和等于 1.0。" return warning_message return "" # 没有警告时返回空字符串 - def adjust_model_less_probabilities(t_model_1_probability, t_model_2_probability, t_model_3_probability): - total = ( - Decimal(str(t_model_1_probability)) + Decimal(str(t_model_2_probability)) + Decimal(str(t_model_3_probability)) - ) - if total < Decimal("1.0"): - warning_message = ( - f"警告: 选择模型1、模型2和模型3的概率总和为 {float(total):.2f}，小于了 1.0！请调整滑块使总和等于 1.0。" - ) + total = Decimal(str(t_model_1_probability)) + Decimal(str(t_model_2_probability)) + Decimal(str(t_model_3_probability)) + if total < Decimal('1.0'): + warning_message = f"警告: 选择模型1、模型2和模型3的概率总和为 {float(total):.2f}，小于了 1.0！请调整滑块使总和等于 1.0。" return warning_message return "" # 没有警告时返回空字符串 # ============================================== # 人格保存函数 -def save_personality_config( - t_prompt_personality_1, - t_prompt_personality_2, - t_prompt_personality_3, - t_prompt_schedule, - t_personality_1_probability, - t_personality_2_probability, - t_personality_3_probability, -): +def save_personality_config(t_prompt_personality_1, + t_prompt_personality_2, + t_prompt_personality_3, + t_prompt_schedule, + t_personality_1_probability, + t_personality_2_probability, + t_personality_3_probability): # 保存人格提示词 config_data["personality"]["prompt_personality"][0] = t_prompt_personality_1 config_data["personality"]["prompt_personality"][1] = t_prompt_personality_2 @@ -448,22 +431,20 @@ def save_personality_config( return "人格配置已保存" -def save_message_and_emoji_config( - t_min_text_length, - t_max_context_size, - t_emoji_chance, - t_thinking_timeout, - t_response_willing_amplifier, - t_response_interested_rate_amplifier, - t_down_frequency_rate, - t_ban_words_final_result, - t_ban_msgs_regex_final_result, - t_check_interval, - t_register_interval, - t_auto_save, - t_enable_check, - t_check_prompt, -): +def save_message_and_emoji_config(t_min_text_length, + t_max_context_size, + t_emoji_chance, + t_thinking_timeout, + t_response_willing_amplifier, + t_response_interested_rate_amplifier, + t_down_frequency_rate, + t_ban_words_final_result, + t_ban_msgs_regex_final_result, + t_check_interval, + t_register_interval, + t_auto_save, + t_enable_check, + t_check_prompt): config_data["message"]["min_text_length"] = t_min_text_length config_data["message"]["max_context_size"] = t_max_context_size config_data["message"]["emoji_chance"] = t_emoji_chance @@ -471,7 +452,7 @@ def save_message_and_emoji_config( config_data["message"]["response_willing_amplifier"] = t_response_willing_amplifier config_data["message"]["response_interested_rate_amplifier"] = t_response_interested_rate_amplifier config_data["message"]["down_frequency_rate"] = t_down_frequency_rate - config_data["message"]["ban_words"] = t_ban_words_final_result + config_data["message"]["ban_words"] =t_ban_words_final_result config_data["message"]["ban_msgs_regex"] = t_ban_msgs_regex_final_result config_data["emoji"]["check_interval"] = t_check_interval config_data["emoji"]["register_interval"] = t_register_interval @@ -482,65 +463,50 @@ def save_message_and_emoji_config( logger.info("消息和表情配置已保存到 bot_config.toml 文件中") return "消息和表情配置已保存" - -def save_response_model_config( - t_model_r1_probability, - t_model_r2_probability, - t_model_r3_probability, - t_max_response_length, - t_model1_name, - t_model1_provider, - t_model1_pri_in, - t_model1_pri_out, - t_model2_name, - t_model2_provider, - t_model3_name, - t_model3_provider, - t_emotion_model_name, - t_emotion_model_provider, - t_topic_judge_model_name, - t_topic_judge_model_provider, - t_summary_by_topic_model_name, - t_summary_by_topic_model_provider, - t_vlm_model_name, - t_vlm_model_provider, -): +def save_response_model_config(t_model_r1_probability, + t_model_r2_probability, + t_model_r3_probability, + t_max_response_length, + t_model1_name, + t_model1_provider, + t_model1_pri_in, + t_model1_pri_out, + t_model2_name, + t_model2_provider, + t_model3_name, + t_model3_provider, + t_emotion_model_name, + t_emotion_model_provider, + t_topic_judge_model_name, + t_topic_judge_model_provider, + t_summary_by_topic_model_name, + t_summary_by_topic_model_provider, + t_vlm_model_name, + t_vlm_model_provider): config_data["response"]["model_r1_probability"] = t_model_r1_probability config_data["response"]["model_v3_probability"] = t_model_r2_probability config_data["response"]["model_r1_distill_probability"] = t_model_r3_probability config_data["response"]["max_response_length"] = t_max_response_length - config_data["model"]["llm_reasoning"]["name"] = t_model1_name - config_data["model"]["llm_reasoning"]["provider"] = t_model1_provider - config_data["model"]["llm_reasoning"]["pri_in"] = t_model1_pri_in - config_data["model"]["llm_reasoning"]["pri_out"] = t_model1_pri_out - config_data["model"]["llm_normal"]["name"] = t_model2_name - config_data["model"]["llm_normal"]["provider"] = t_model2_provider - config_data["model"]["llm_reasoning_minor"]["name"] = t_model3_name - config_data["model"]["llm_normal"]["provider"] = t_model3_provider - config_data["model"]["llm_emotion_judge"]["name"] = t_emotion_model_name - config_data["model"]["llm_emotion_judge"]["provider"] = t_emotion_model_provider - config_data["model"]["llm_topic_judge"]["name"] = t_topic_judge_model_name - config_data["model"]["llm_topic_judge"]["provider"] = t_topic_judge_model_provider - config_data["model"]["llm_summary_by_topic"]["name"] = t_summary_by_topic_model_name - config_data["model"]["llm_summary_by_topic"]["provider"] = t_summary_by_topic_model_provider - config_data["model"]["vlm"]["name"] = t_vlm_model_name - config_data["model"]["vlm"]["provider"] = t_vlm_model_provider + config_data['model']['llm_reasoning']['name'] = t_model1_name + config_data['model']['llm_reasoning']['provider'] = t_model1_provider + config_data['model']['llm_reasoning']['pri_in'] = t_model1_pri_in + config_data['model']['llm_reasoning']['pri_out'] = t_model1_pri_out + config_data['model']['llm_normal']['name'] = t_model2_name + config_data['model']['llm_normal']['provider'] = t_model2_provider + config_data['model']['llm_reasoning_minor']['name'] = t_model3_name + config_data['model']['llm_normal']['provider'] = t_model3_provider + config_data['model']['llm_emotion_judge']['name'] = t_emotion_model_name + config_data['model']['llm_emotion_judge']['provider'] = t_emotion_model_provider + config_data['model']['llm_topic_judge']['name'] = t_topic_judge_model_name + config_data['model']['llm_topic_judge']['provider'] = t_topic_judge_model_provider + config_data['model']['llm_summary_by_topic']['name'] = t_summary_by_topic_model_name + config_data['model']['llm_summary_by_topic']['provider'] = t_summary_by_topic_model_provider + config_data['model']['vlm']['name'] = t_vlm_model_name + config_data['model']['vlm']['provider'] = t_vlm_model_provider save_config_to_file(config_data) logger.info("回复&模型设置已保存到 bot_config.toml 文件中") return "回复&模型设置已保存" - - -def save_memory_mood_config( - t_build_memory_interval, - t_memory_compress_rate, - t_forget_memory_interval, - t_memory_forget_time, - t_memory_forget_percentage, - t_memory_ban_words_final_result, - t_mood_update_interval, - t_mood_decay_rate, - t_mood_intensity_factor, -): +def save_memory_mood_config(t_build_memory_interval, t_memory_compress_rate, t_forget_memory_interval, t_memory_forget_time, t_memory_forget_percentage, t_memory_ban_words_final_result, t_mood_update_interval, t_mood_decay_rate, t_mood_intensity_factor): config_data["memory"]["build_memory_interval"] = t_build_memory_interval config_data["memory"]["memory_compress_rate"] = t_memory_compress_rate config_data["memory"]["forget_memory_interval"] = t_forget_memory_interval @@ -554,25 +520,12 @@ def save_memory_mood_config( logger.info("记忆和心情设置已保存到 bot_config.toml 文件中") return "记忆和心情设置已保存" - -def save_other_config( - t_keywords_reaction_enabled, - t_enable_advance_output, - t_enable_kuuki_read, - t_enable_debug_output, - t_enable_friend_chat, - t_chinese_typo_enabled, - t_error_rate, - t_min_freq, - t_tone_error_rate, - t_word_replace_rate, - t_remote_status, -): - config_data["keywords_reaction"]["enable"] = t_keywords_reaction_enabled - config_data["others"]["enable_advance_output"] = t_enable_advance_output - config_data["others"]["enable_kuuki_read"] = t_enable_kuuki_read - config_data["others"]["enable_debug_output"] = t_enable_debug_output - config_data["others"]["enable_friend_chat"] = t_enable_friend_chat +def save_other_config(t_keywords_reaction_enabled,t_enable_advance_output, t_enable_kuuki_read, t_enable_debug_output, t_enable_friend_chat, t_chinese_typo_enabled, t_error_rate, t_min_freq, t_tone_error_rate, t_word_replace_rate,t_remote_status): + config_data['keywords_reaction']['enable'] = t_keywords_reaction_enabled + config_data['others']['enable_advance_output'] = t_enable_advance_output + config_data['others']['enable_kuuki_read'] = t_enable_kuuki_read + config_data['others']['enable_debug_output'] = t_enable_debug_output + config_data['others']['enable_friend_chat'] = t_enable_friend_chat config_data["chinese_typo"]["enable"] = t_chinese_typo_enabled config_data["chinese_typo"]["error_rate"] = t_error_rate config_data["chinese_typo"]["min_freq"] = t_min_freq @@ -584,12 +537,9 @@ def save_other_config( logger.info("其他设置已保存到 bot_config.toml 文件中") return "其他设置已保存" - -def save_group_config( - t_talk_allowed_final_result, - t_talk_frequency_down_final_result, - t_ban_user_id_final_result, -): +def save_group_config(t_talk_allowed_final_result, + t_talk_frequency_down_final_result, + t_ban_user_id_final_result,): config_data["groups"]["talk_allowed"] = t_talk_allowed_final_result config_data["groups"]["talk_frequency_down"] = t_talk_frequency_down_final_result config_data["groups"]["ban_user_id"] = t_ban_user_id_final_result @@ -597,7 +547,6 @@ def save_group_config( logger.info("群聊设置已保存到 bot_config.toml 文件中") return "群聊设置已保存" - with gr.Blocks(title="MaimBot配置文件编辑") as app: gr.Markdown( value=""" @@ -605,9 +554,20 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: 感谢ZureTz大佬提供的人格保存部分修复！ """ ) - gr.Markdown(value="## 全球在线MaiMBot数量: " + str((online_maimbot_data or {}).get("online_clients", 0))) - gr.Markdown(value="## 当前WebUI版本: " + str(WEBUI_VERSION)) - gr.Markdown(value="### 配置文件版本：" + config_data["inner"]["version"]) + gr.Markdown( + value="## 全球在线MaiMBot数量: " + str((online_maimbot_data or {}).get('online_clients', 0)) + ) + gr.Markdown( + value="## 当前WebUI版本: " + str(WEBUI_VERSION) + ) + if PARSED_CONFIG_VERSION > LEGACY_CONFIG_VERSION: + gr.Markdown( + value="### 配置文件版本：" + config_data["inner"]["version"] + ) + else: + gr.Markdown( + value="### 配置文件版本：" + "LEGACY(旧版本)" + ) with gr.Tabs(): with gr.TabItem("0-环境设置"): with gr.Row(): @@ -621,20 +581,27 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: ) with gr.Row(): server_address = gr.Textbox( - label="服务器地址", value=env_config_data["env_HOST"], interactive=True + label="服务器地址", + value=env_config_data["env_HOST"], + interactive=True ) with gr.Row(): server_port = gr.Textbox( - label="服务器端口", value=env_config_data["env_PORT"], interactive=True + label="服务器端口", + value=env_config_data["env_PORT"], + interactive=True ) with gr.Row(): - plugin_list = parse_list_str(env_config_data["env_PLUGINS"]) + plugin_list = parse_list_str(env_config_data['env_PLUGINS']) with gr.Blocks(): list_state = gr.State(value=plugin_list.copy()) with gr.Row(): list_display = gr.TextArea( - value="\n".join(plugin_list), label="插件列表", interactive=False, lines=5 + value="\n".join(plugin_list), + label="插件列表", + interactive=False, + lines=5 ) with gr.Row(): with gr.Column(scale=3): @@ -643,161 +610,170 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): - item_to_delete = gr.Dropdown(choices=plugin_list, label="选择要删除的插件") + item_to_delete = gr.Dropdown( + choices=plugin_list, + label="选择要删除的插件" + ) delete_btn = gr.Button("删除", scale=1) final_result = gr.Text(label="修改后的列表") add_btn.click( add_item, inputs=[new_item_input, list_state], - outputs=[list_state, list_display, item_to_delete, final_result], + outputs=[list_state, list_display, item_to_delete, final_result] ) delete_btn.click( delete_item, inputs=[item_to_delete, list_state], - outputs=[list_state, list_display, item_to_delete, final_result], + outputs=[list_state, list_display, item_to_delete, final_result] ) with gr.Row(): gr.Markdown( - """MongoDB设置项\n + '''MongoDB设置项\n 保持默认即可，如果你有能力承担修改过后的后果（简称能改回来（笑））\n 可以对以下配置项进行修改\n - """ + ''' ) with gr.Row(): mongodb_host = gr.Textbox( - label="MongoDB服务器地址", value=env_config_data["env_MONGODB_HOST"], interactive=True + label="MongoDB服务器地址", + value=env_config_data["env_MONGODB_HOST"], + interactive=True ) with gr.Row(): mongodb_port = gr.Textbox( - label="MongoDB服务器端口", value=env_config_data["env_MONGODB_PORT"], interactive=True + label="MongoDB服务器端口", + value=env_config_data["env_MONGODB_PORT"], + interactive=True ) with gr.Row(): mongodb_database_name = gr.Textbox( - label="MongoDB数据库名称", value=env_config_data["env_DATABASE_NAME"], interactive=True + label="MongoDB数据库名称", + value=env_config_data["env_DATABASE_NAME"], + interactive=True ) with gr.Row(): gr.Markdown( - """日志设置\n + '''日志设置\n 配置日志输出级别\n 改完了记得保存！！！ - """ + ''' ) with gr.Row(): console_log_level = gr.Dropdown( choices=["INFO", "DEBUG", "WARNING", "ERROR", "SUCCESS"], label="控制台日志级别", value=env_config_data.get("env_CONSOLE_LOG_LEVEL", "INFO"), - interactive=True, + interactive=True ) with gr.Row(): file_log_level = gr.Dropdown( choices=["INFO", "DEBUG", "WARNING", "ERROR", "SUCCESS"], label="文件日志级别", value=env_config_data.get("env_FILE_LOG_LEVEL", "DEBUG"), - interactive=True, + interactive=True ) with gr.Row(): default_console_log_level = gr.Dropdown( choices=["INFO", "DEBUG", "WARNING", "ERROR", "SUCCESS", "NONE"], label="默认控制台日志级别", value=env_config_data.get("env_DEFAULT_CONSOLE_LOG_LEVEL", "SUCCESS"), - interactive=True, + interactive=True ) with gr.Row(): default_file_log_level = gr.Dropdown( choices=["INFO", "DEBUG", "WARNING", "ERROR", "SUCCESS", "NONE"], label="默认文件日志级别", value=env_config_data.get("env_DEFAULT_FILE_LOG_LEVEL", "DEBUG"), - interactive=True, + interactive=True ) with gr.Row(): gr.Markdown( - """API设置\n + '''API设置\n 选择API提供商并配置相应的BaseURL和Key\n 改完了记得保存！！！ - """ + ''' ) with gr.Row(): with gr.Column(scale=3): - new_provider_input = gr.Textbox(label="添加新提供商", placeholder="输入新提供商名称") + new_provider_input = gr.Textbox( + label="添加新提供商", + placeholder="输入新提供商名称" + ) add_provider_btn = gr.Button("添加提供商", scale=1) with gr.Row(): api_provider = gr.Dropdown( choices=MODEL_PROVIDER_LIST, label="选择API提供商", - value=MODEL_PROVIDER_LIST[0] if MODEL_PROVIDER_LIST else None, + value=MODEL_PROVIDER_LIST[0] if MODEL_PROVIDER_LIST else None ) with gr.Row(): api_base_url = gr.Textbox( label="Base URL", - value=env_config_data.get(f"env_{MODEL_PROVIDER_LIST[0]}_BASE_URL", "") - if MODEL_PROVIDER_LIST - else "", - interactive=True, + value=env_config_data.get(f"env_{MODEL_PROVIDER_LIST[0]}_BASE_URL", "") if MODEL_PROVIDER_LIST else "", + interactive=True ) with gr.Row(): api_key = gr.Textbox( label="API Key", - value=env_config_data.get(f"env_{MODEL_PROVIDER_LIST[0]}_KEY", "") - if MODEL_PROVIDER_LIST - else "", - interactive=True, + value=env_config_data.get(f"env_{MODEL_PROVIDER_LIST[0]}_KEY", "") if MODEL_PROVIDER_LIST else "", + interactive=True + ) + api_provider.change( + update_api_inputs, + inputs=[api_provider], + outputs=[api_base_url, api_key] ) - api_provider.change(update_api_inputs, inputs=[api_provider], outputs=[api_base_url, api_key]) with gr.Row(): - save_env_btn = gr.Button("保存环境配置", variant="primary") + save_env_btn = gr.Button("保存环境配置",variant="primary") with gr.Row(): save_env_btn.click( save_trigger, - inputs=[ - server_address, - server_port, - final_result, - mongodb_host, - mongodb_port, - mongodb_database_name, - console_log_level, - file_log_level, - default_console_log_level, - default_file_log_level, - api_provider, - api_base_url, - api_key, - ], - outputs=[gr.Textbox(label="保存结果", interactive=False)], + inputs=[server_address, server_port, final_result, mongodb_host, mongodb_port, mongodb_database_name, console_log_level, file_log_level, default_console_log_level, default_file_log_level, api_provider, api_base_url, api_key], + outputs=[gr.Textbox( + label="保存结果", + interactive=False + )] ) # 绑定添加提供商按钮的点击事件 add_provider_btn.click( add_new_provider, inputs=[new_provider_input, gr.State(value=MODEL_PROVIDER_LIST)], - outputs=[gr.State(value=MODEL_PROVIDER_LIST), api_provider], + outputs=[gr.State(value=MODEL_PROVIDER_LIST), api_provider] ).then( - lambda x: ( - env_config_data.get(f"env_{x}_BASE_URL", ""), - env_config_data.get(f"env_{x}_KEY", ""), - ), + lambda x: (env_config_data.get(f"env_{x}_BASE_URL", ""), env_config_data.get(f"env_{x}_KEY", "")), inputs=[api_provider], - outputs=[api_base_url, api_key], + outputs=[api_base_url, api_key] ) with gr.TabItem("1-Bot基础设置"): with gr.Row(): with gr.Column(scale=3): with gr.Row(): - qqbot_qq = gr.Textbox(label="QQ机器人QQ号", value=config_data["bot"]["qq"], interactive=True) + qqbot_qq = gr.Textbox( + label="QQ机器人QQ号", + value=config_data["bot"]["qq"], + interactive=True + ) with gr.Row(): - nickname = gr.Textbox(label="昵称", value=config_data["bot"]["nickname"], interactive=True) + nickname = gr.Textbox( + label="昵称", + value=config_data["bot"]["nickname"], + interactive=True + ) with gr.Row(): - nickname_list = config_data["bot"]["alias_names"] + nickname_list = config_data['bot']['alias_names'] with gr.Blocks(): nickname_list_state = gr.State(value=nickname_list.copy()) with gr.Row(): nickname_list_display = gr.TextArea( - value="\n".join(nickname_list), label="别名列表", interactive=False, lines=5 + value="\n".join(nickname_list), + label="别名列表", + interactive=False, + lines=5 ) with gr.Row(): with gr.Column(scale=3): @@ -806,37 +782,35 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): - nickname_item_to_delete = gr.Dropdown(choices=nickname_list, label="选择要删除的别名") + nickname_item_to_delete = gr.Dropdown( + choices=nickname_list, + label="选择要删除的别名" + ) nickname_delete_btn = gr.Button("删除", scale=1) nickname_final_result = gr.Text(label="修改后的列表") nickname_add_btn.click( add_item, inputs=[nickname_new_item_input, nickname_list_state], - outputs=[ - nickname_list_state, - nickname_list_display, - nickname_item_to_delete, - nickname_final_result, - ], + outputs=[nickname_list_state, nickname_list_display, nickname_item_to_delete, nickname_final_result] ) nickname_delete_btn.click( delete_item, inputs=[nickname_item_to_delete, nickname_list_state], - outputs=[ - nickname_list_state, - nickname_list_display, - nickname_item_to_delete, - nickname_final_result, - ], + outputs=[nickname_list_state, nickname_list_display, nickname_item_to_delete, nickname_final_result] ) gr.Button( - "保存Bot配置", variant="primary", elem_id="save_bot_btn", elem_classes="save_bot_btn" + "保存Bot配置", + variant="primary", + elem_id="save_bot_btn", + elem_classes="save_bot_btn" ).click( save_bot_config, - inputs=[qqbot_qq, nickname, nickname_list_state], - outputs=[gr.Textbox(label="保存Bot结果")], + inputs=[qqbot_qq, nickname,nickname_list_state], + outputs=[gr.Textbox( + label="保存Bot结果" + )] ) with gr.TabItem("2-人格设置"): with gr.Row(): @@ -932,14 +906,16 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): prompt_schedule = gr.Textbox( - label="日程生成提示词", value=config_data["personality"]["prompt_schedule"], interactive=True + label="日程生成提示词", + value=config_data["personality"]["prompt_schedule"], + interactive=True ) with gr.Row(): personal_save_btn = gr.Button( "保存人格配置", variant="primary", elem_id="save_personality_btn", - elem_classes="save_personality_btn", + elem_classes="save_personality_btn" ) with gr.Row(): personal_save_message = gr.Textbox(label="保存人格结果") @@ -960,51 +936,31 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): with gr.Row(): - min_text_length = gr.Number( - value=config_data["message"]["min_text_length"], - label="与麦麦聊天时麦麦只会回答文本大于等于此数的消息", - ) + min_text_length = gr.Number(value=config_data['message']['min_text_length'], label="与麦麦聊天时麦麦只会回答文本大于等于此数的消息") with gr.Row(): - max_context_size = gr.Number( - value=config_data["message"]["max_context_size"], label="麦麦获得的上文数量" - ) + max_context_size = gr.Number(value=config_data['message']['max_context_size'], label="麦麦获得的上文数量") with gr.Row(): - emoji_chance = gr.Slider( - minimum=0, - maximum=1, - step=0.01, - value=config_data["message"]["emoji_chance"], - label="麦麦使用表情包的概率", - ) + emoji_chance = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['message']['emoji_chance'], label="麦麦使用表情包的概率") with gr.Row(): - thinking_timeout = gr.Number( - value=config_data["message"]["thinking_timeout"], - label="麦麦正在思考时，如果超过此秒数，则停止思考", - ) + thinking_timeout = gr.Number(value=config_data['message']['thinking_timeout'], label="麦麦正在思考时，如果超过此秒数，则停止思考") with gr.Row(): - response_willing_amplifier = gr.Number( - value=config_data["message"]["response_willing_amplifier"], - label="麦麦回复意愿放大系数，一般为1", - ) + response_willing_amplifier = gr.Number(value=config_data['message']['response_willing_amplifier'], label="麦麦回复意愿放大系数，一般为1") with gr.Row(): - response_interested_rate_amplifier = gr.Number( - value=config_data["message"]["response_interested_rate_amplifier"], - label="麦麦回复兴趣度放大系数,听到记忆里的内容时放大系数", - ) + response_interested_rate_amplifier = gr.Number(value=config_data['message']['response_interested_rate_amplifier'], label="麦麦回复兴趣度放大系数,听到记忆里的内容时放大系数") with gr.Row(): - down_frequency_rate = gr.Number( - value=config_data["message"]["down_frequency_rate"], - label="降低回复频率的群组回复意愿降低系数", - ) + down_frequency_rate = gr.Number(value=config_data['message']['down_frequency_rate'], label="降低回复频率的群组回复意愿降低系数") with gr.Row(): gr.Markdown("### 违禁词列表") with gr.Row(): - ban_words_list = config_data["message"]["ban_words"] + ban_words_list = config_data['message']['ban_words'] with gr.Blocks(): ban_words_list_state = gr.State(value=ban_words_list.copy()) with gr.Row(): ban_words_list_display = gr.TextArea( - value="\n".join(ban_words_list), label="违禁词列表", interactive=False, lines=5 + value="\n".join(ban_words_list), + label="违禁词列表", + interactive=False, + lines=5 ) with gr.Row(): with gr.Column(scale=3): @@ -1014,7 +970,8 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): ban_words_item_to_delete = gr.Dropdown( - choices=ban_words_list, label="选择要删除的违禁词" + choices=ban_words_list, + label="选择要删除的违禁词" ) ban_words_delete_btn = gr.Button("删除", scale=1) @@ -1022,23 +979,13 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: ban_words_add_btn.click( add_item, inputs=[ban_words_new_item_input, ban_words_list_state], - outputs=[ - ban_words_list_state, - ban_words_list_display, - ban_words_item_to_delete, - ban_words_final_result, - ], + outputs=[ban_words_list_state, ban_words_list_display, ban_words_item_to_delete, ban_words_final_result] ) ban_words_delete_btn.click( delete_item, inputs=[ban_words_item_to_delete, ban_words_list_state], - outputs=[ - ban_words_list_state, - ban_words_list_display, - ban_words_item_to_delete, - ban_words_final_result, - ], + outputs=[ban_words_list_state, ban_words_list_display, ban_words_item_to_delete, ban_words_final_result] ) with gr.Row(): gr.Markdown("### 检测违禁消息正则表达式列表") @@ -1052,7 +999,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: """ ) with gr.Row(): - ban_msgs_regex_list = config_data["message"]["ban_msgs_regex"] + ban_msgs_regex_list = config_data['message']['ban_msgs_regex'] with gr.Blocks(): ban_msgs_regex_list_state = gr.State(value=ban_msgs_regex_list.copy()) with gr.Row(): @@ -1060,7 +1007,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: value="\n".join(ban_msgs_regex_list), label="违禁消息正则列表", interactive=False, - lines=5, + lines=5 ) with gr.Row(): with gr.Column(scale=3): @@ -1070,7 +1017,8 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): ban_msgs_regex_item_to_delete = gr.Dropdown( - choices=ban_msgs_regex_list, label="选择要删除的违禁消息正则" + choices=ban_msgs_regex_list, + label="选择要删除的违禁消息正则" ) ban_msgs_regex_delete_btn = gr.Button("删除", scale=1) @@ -1078,47 +1026,35 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: ban_msgs_regex_add_btn.click( add_item, inputs=[ban_msgs_regex_new_item_input, ban_msgs_regex_list_state], - outputs=[ - ban_msgs_regex_list_state, - ban_msgs_regex_list_display, - ban_msgs_regex_item_to_delete, - ban_msgs_regex_final_result, - ], + outputs=[ban_msgs_regex_list_state, ban_msgs_regex_list_display, ban_msgs_regex_item_to_delete, ban_msgs_regex_final_result] ) ban_msgs_regex_delete_btn.click( delete_item, inputs=[ban_msgs_regex_item_to_delete, ban_msgs_regex_list_state], - outputs=[ - ban_msgs_regex_list_state, - ban_msgs_regex_list_display, - ban_msgs_regex_item_to_delete, - ban_msgs_regex_final_result, - ], + outputs=[ban_msgs_regex_list_state, ban_msgs_regex_list_display, ban_msgs_regex_item_to_delete, ban_msgs_regex_final_result] ) with gr.Row(): - check_interval = gr.Number( - value=config_data["emoji"]["check_interval"], label="检查表情包的时间间隔" - ) + check_interval = gr.Number(value=config_data['emoji']['check_interval'], label="检查表情包的时间间隔") with gr.Row(): - register_interval = gr.Number( - value=config_data["emoji"]["register_interval"], label="注册表情包的时间间隔" - ) + register_interval = gr.Number(value=config_data['emoji']['register_interval'], label="注册表情包的时间间隔") with gr.Row(): - auto_save = gr.Checkbox(value=config_data["emoji"]["auto_save"], label="自动保存表情包") + auto_save = gr.Checkbox(value=config_data['emoji']['auto_save'], label="自动保存表情包") with gr.Row(): - enable_check = gr.Checkbox(value=config_data["emoji"]["enable_check"], label="启用表情包检查") + enable_check = gr.Checkbox(value=config_data['emoji']['enable_check'], label="启用表情包检查") with gr.Row(): - check_prompt = gr.Textbox(value=config_data["emoji"]["check_prompt"], label="表情包过滤要求") + check_prompt = gr.Textbox(value=config_data['emoji']['check_prompt'], label="表情包过滤要求") with gr.Row(): emoji_save_btn = gr.Button( "保存消息&表情包设置", variant="primary", elem_id="save_personality_btn", - elem_classes="save_personality_btn", + elem_classes="save_personality_btn" ) with gr.Row(): - emoji_save_message = gr.Textbox(label="消息&表情包设置保存结果") + emoji_save_message = gr.Textbox( + label="消息&表情包设置保存结果" + ) emoji_save_btn.click( save_message_and_emoji_config, inputs=[ @@ -1135,81 +1071,41 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: register_interval, auto_save, enable_check, - check_prompt, + check_prompt ], - outputs=[emoji_save_message], + outputs=[emoji_save_message] ) with gr.TabItem("4-回复&模型设置"): with gr.Row(): with gr.Column(scale=3): with gr.Row(): - gr.Markdown("""### 回复设置""") - with gr.Row(): - model_r1_probability = gr.Slider( - minimum=0, - maximum=1, - step=0.01, - value=config_data["response"]["model_r1_probability"], - label="麦麦回答时选择主要回复模型1 模型的概率", + gr.Markdown( + """### 回复设置""" ) with gr.Row(): - model_r2_probability = gr.Slider( - minimum=0, - maximum=1, - step=0.01, - value=config_data["response"]["model_v3_probability"], - label="麦麦回答时选择主要回复模型2 模型的概率", - ) + model_r1_probability = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['response']['model_r1_probability'], label="麦麦回答时选择主要回复模型1 模型的概率") with gr.Row(): - model_r3_probability = gr.Slider( - minimum=0, - maximum=1, - step=0.01, - value=config_data["response"]["model_r1_distill_probability"], - label="麦麦回答时选择主要回复模型3 模型的概率", - ) + model_r2_probability = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['response']['model_v3_probability'], label="麦麦回答时选择主要回复模型2 模型的概率") + with gr.Row(): + model_r3_probability = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['response']['model_r1_distill_probability'], label="麦麦回答时选择主要回复模型3 模型的概率") # 用于显示警告消息 with gr.Row(): model_warning_greater_text = gr.Markdown() model_warning_less_text = gr.Markdown() # 绑定滑块的值变化事件，确保总和必须等于 1.0 - model_r1_probability.change( - adjust_model_greater_probabilities, - inputs=[model_r1_probability, model_r2_probability, model_r3_probability], - outputs=[model_warning_greater_text], - ) - model_r2_probability.change( - adjust_model_greater_probabilities, - inputs=[model_r1_probability, model_r2_probability, model_r3_probability], - outputs=[model_warning_greater_text], - ) - model_r3_probability.change( - adjust_model_greater_probabilities, - inputs=[model_r1_probability, model_r2_probability, model_r3_probability], - outputs=[model_warning_greater_text], - ) - model_r1_probability.change( - adjust_model_less_probabilities, - inputs=[model_r1_probability, model_r2_probability, model_r3_probability], - outputs=[model_warning_less_text], - ) - model_r2_probability.change( - adjust_model_less_probabilities, - inputs=[model_r1_probability, model_r2_probability, model_r3_probability], - outputs=[model_warning_less_text], - ) - model_r3_probability.change( - adjust_model_less_probabilities, - inputs=[model_r1_probability, model_r2_probability, model_r3_probability], - outputs=[model_warning_less_text], - ) + model_r1_probability.change(adjust_model_greater_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_greater_text]) + model_r2_probability.change(adjust_model_greater_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_greater_text]) + model_r3_probability.change(adjust_model_greater_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_greater_text]) + model_r1_probability.change(adjust_model_less_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_less_text]) + model_r2_probability.change(adjust_model_less_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_less_text]) + model_r3_probability.change(adjust_model_less_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_less_text]) with gr.Row(): - max_response_length = gr.Number( - value=config_data["response"]["max_response_length"], label="麦麦回答的最大token数" - ) + max_response_length = gr.Number(value=config_data['response']['max_response_length'], label="麦麦回答的最大token数") with gr.Row(): - gr.Markdown("""### 模型设置""") + gr.Markdown( + """### 模型设置""" + ) with gr.Row(): gr.Markdown( """### 注意\n @@ -1221,160 +1117,81 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Tabs(): with gr.TabItem("1-主要回复模型"): with gr.Row(): - model1_name = gr.Textbox( - value=config_data["model"]["llm_reasoning"]["name"], label="模型1的名称" - ) + model1_name = gr.Textbox(value=config_data['model']['llm_reasoning']['name'], label="模型1的名称") with gr.Row(): - model1_provider = gr.Dropdown( - choices=MODEL_PROVIDER_LIST, - value=config_data["model"]["llm_reasoning"]["provider"], - label="模型1（主要回复模型）提供商", - ) + model1_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_reasoning']['provider'], label="模型1（主要回复模型）提供商") with gr.Row(): - model1_pri_in = gr.Number( - value=config_data["model"]["llm_reasoning"]["pri_in"], - label="模型1（主要回复模型）的输入价格（非必填，可以记录消耗）", - ) + model1_pri_in = gr.Number(value=config_data['model']['llm_reasoning']['pri_in'], label="模型1（主要回复模型）的输入价格（非必填，可以记录消耗）") with gr.Row(): - model1_pri_out = gr.Number( - value=config_data["model"]["llm_reasoning"]["pri_out"], - label="模型1（主要回复模型）的输出价格（非必填，可以记录消耗）", - ) + model1_pri_out = gr.Number(value=config_data['model']['llm_reasoning']['pri_out'], label="模型1（主要回复模型）的输出价格（非必填，可以记录消耗）") with gr.TabItem("2-次要回复模型"): with gr.Row(): - model2_name = gr.Textbox( - value=config_data["model"]["llm_normal"]["name"], label="模型2的名称" - ) + model2_name = gr.Textbox(value=config_data['model']['llm_normal']['name'], label="模型2的名称") with gr.Row(): - model2_provider = gr.Dropdown( - choices=MODEL_PROVIDER_LIST, - value=config_data["model"]["llm_normal"]["provider"], - label="模型2提供商", - ) + model2_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_normal']['provider'], label="模型2提供商") with gr.TabItem("3-次要模型"): with gr.Row(): - model3_name = gr.Textbox( - value=config_data["model"]["llm_reasoning_minor"]["name"], label="模型3的名称" - ) + model3_name = gr.Textbox(value=config_data['model']['llm_reasoning_minor']['name'], label="模型3的名称") with gr.Row(): - model3_provider = gr.Dropdown( - choices=MODEL_PROVIDER_LIST, - value=config_data["model"]["llm_reasoning_minor"]["provider"], - label="模型3提供商", - ) + model3_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_reasoning_minor']['provider'], label="模型3提供商") with gr.TabItem("4-情感&主题模型"): with gr.Row(): - gr.Markdown("""### 情感模型设置""") - with gr.Row(): - emotion_model_name = gr.Textbox( - value=config_data["model"]["llm_emotion_judge"]["name"], label="情感模型名称" + gr.Markdown( + """### 情感模型设置""" ) with gr.Row(): - emotion_model_provider = gr.Dropdown( - choices=MODEL_PROVIDER_LIST, - value=config_data["model"]["llm_emotion_judge"]["provider"], - label="情感模型提供商", + emotion_model_name = gr.Textbox(value=config_data['model']['llm_emotion_judge']['name'], label="情感模型名称") + with gr.Row(): + emotion_model_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_emotion_judge']['provider'], label="情感模型提供商") + with gr.Row(): + gr.Markdown( + """### 主题模型设置""" ) with gr.Row(): - gr.Markdown("""### 主题模型设置""") + topic_judge_model_name = gr.Textbox(value=config_data['model']['llm_topic_judge']['name'], label="主题判断模型名称") with gr.Row(): - topic_judge_model_name = gr.Textbox( - value=config_data["model"]["llm_topic_judge"]["name"], label="主题判断模型名称" - ) + topic_judge_model_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_topic_judge']['provider'], label="主题判断模型提供商") with gr.Row(): - topic_judge_model_provider = gr.Dropdown( - choices=MODEL_PROVIDER_LIST, - value=config_data["model"]["llm_topic_judge"]["provider"], - label="主题判断模型提供商", - ) + summary_by_topic_model_name = gr.Textbox(value=config_data['model']['llm_summary_by_topic']['name'], label="主题总结模型名称") with gr.Row(): - summary_by_topic_model_name = gr.Textbox( - value=config_data["model"]["llm_summary_by_topic"]["name"], label="主题总结模型名称" - ) - with gr.Row(): - summary_by_topic_model_provider = gr.Dropdown( - choices=MODEL_PROVIDER_LIST, - value=config_data["model"]["llm_summary_by_topic"]["provider"], - label="主题总结模型提供商", - ) + summary_by_topic_model_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_summary_by_topic']['provider'], label="主题总结模型提供商") with gr.TabItem("5-识图模型"): with gr.Row(): - gr.Markdown("""### 识图模型设置""") - with gr.Row(): - vlm_model_name = gr.Textbox( - value=config_data["model"]["vlm"]["name"], label="识图模型名称" + gr.Markdown( + """### 识图模型设置""" ) with gr.Row(): - vlm_model_provider = gr.Dropdown( - choices=MODEL_PROVIDER_LIST, - value=config_data["model"]["vlm"]["provider"], - label="识图模型提供商", - ) + vlm_model_name = gr.Textbox(value=config_data['model']['vlm']['name'], label="识图模型名称") + with gr.Row(): + vlm_model_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['vlm']['provider'], label="识图模型提供商") with gr.Row(): - save_model_btn = gr.Button("保存回复&模型设置", variant="primary", elem_id="save_model_btn") + save_model_btn = gr.Button("保存回复&模型设置",variant="primary", elem_id="save_model_btn") with gr.Row(): save_btn_message = gr.Textbox() save_model_btn.click( save_response_model_config, - inputs=[ - model_r1_probability, - model_r2_probability, - model_r3_probability, - max_response_length, - model1_name, - model1_provider, - model1_pri_in, - model1_pri_out, - model2_name, - model2_provider, - model3_name, - model3_provider, - emotion_model_name, - emotion_model_provider, - topic_judge_model_name, - topic_judge_model_provider, - summary_by_topic_model_name, - summary_by_topic_model_provider, - vlm_model_name, - vlm_model_provider, - ], - outputs=[save_btn_message], + inputs=[model_r1_probability,model_r2_probability,model_r3_probability,max_response_length,model1_name, model1_provider, model1_pri_in, model1_pri_out, model2_name, model2_provider, model3_name, model3_provider, emotion_model_name, emotion_model_provider, topic_judge_model_name, topic_judge_model_provider, summary_by_topic_model_name,summary_by_topic_model_provider,vlm_model_name, vlm_model_provider], + outputs=[save_btn_message] ) with gr.TabItem("5-记忆&心情设置"): with gr.Row(): with gr.Column(scale=3): with gr.Row(): - gr.Markdown("""### 记忆设置""") - with gr.Row(): - build_memory_interval = gr.Number( - value=config_data["memory"]["build_memory_interval"], - label="记忆构建间隔 单位秒,间隔越低，麦麦学习越多，但是冗余信息也会增多", + gr.Markdown( + """### 记忆设置""" ) with gr.Row(): - memory_compress_rate = gr.Number( - value=config_data["memory"]["memory_compress_rate"], - label="记忆压缩率 控制记忆精简程度 建议保持默认,调高可以获得更多信息，但是冗余信息也会增多", - ) + build_memory_interval = gr.Number(value=config_data['memory']['build_memory_interval'], label="记忆构建间隔 单位秒,间隔越低，麦麦学习越多，但是冗余信息也会增多") with gr.Row(): - forget_memory_interval = gr.Number( - value=config_data["memory"]["forget_memory_interval"], - label="记忆遗忘间隔 单位秒 间隔越低，麦麦遗忘越频繁，记忆更精简，但更难学习", - ) + memory_compress_rate = gr.Number(value=config_data['memory']['memory_compress_rate'], label="记忆压缩率 控制记忆精简程度 建议保持默认,调高可以获得更多信息，但是冗余信息也会增多") with gr.Row(): - memory_forget_time = gr.Number( - value=config_data["memory"]["memory_forget_time"], - label="多长时间后的记忆会被遗忘 单位小时 ", - ) + forget_memory_interval = gr.Number(value=config_data['memory']['forget_memory_interval'], label="记忆遗忘间隔 单位秒 间隔越低，麦麦遗忘越频繁，记忆更精简，但更难学习") with gr.Row(): - memory_forget_percentage = gr.Slider( - minimum=0, - maximum=1, - step=0.01, - value=config_data["memory"]["memory_forget_percentage"], - label="记忆遗忘比例 控制记忆遗忘程度 越大遗忘越多 建议保持默认", - ) + memory_forget_time = gr.Number(value=config_data['memory']['memory_forget_time'], label="多长时间后的记忆会被遗忘 单位小时 ") with gr.Row(): - memory_ban_words_list = config_data["memory"]["memory_ban_words"] + memory_forget_percentage = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['memory']['memory_forget_percentage'], label="记忆遗忘比例 控制记忆遗忘程度 越大遗忘越多 建议保持默认") + with gr.Row(): + memory_ban_words_list = config_data['memory']['memory_ban_words'] with gr.Blocks(): memory_ban_words_list_state = gr.State(value=memory_ban_words_list.copy()) @@ -1383,7 +1200,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: value="\n".join(memory_ban_words_list), label="不希望记忆词列表", interactive=False, - lines=5, + lines=5 ) with gr.Row(): with gr.Column(scale=3): @@ -1393,7 +1210,8 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): memory_ban_words_item_to_delete = gr.Dropdown( - choices=memory_ban_words_list, label="选择要删除的不希望记忆词" + choices=memory_ban_words_list, + label="选择要删除的不希望记忆词" ) memory_ban_words_delete_btn = gr.Button("删除", scale=1) @@ -1401,69 +1219,43 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: memory_ban_words_add_btn.click( add_item, inputs=[memory_ban_words_new_item_input, memory_ban_words_list_state], - outputs=[ - memory_ban_words_list_state, - memory_ban_words_list_display, - memory_ban_words_item_to_delete, - memory_ban_words_final_result, - ], + outputs=[memory_ban_words_list_state, memory_ban_words_list_display, memory_ban_words_item_to_delete, memory_ban_words_final_result] ) memory_ban_words_delete_btn.click( delete_item, inputs=[memory_ban_words_item_to_delete, memory_ban_words_list_state], - outputs=[ - memory_ban_words_list_state, - memory_ban_words_list_display, - memory_ban_words_item_to_delete, - memory_ban_words_final_result, - ], + outputs=[memory_ban_words_list_state, memory_ban_words_list_display, memory_ban_words_item_to_delete, memory_ban_words_final_result] ) with gr.Row(): - mood_update_interval = gr.Number( - value=config_data["mood"]["mood_update_interval"], label="心情更新间隔 单位秒" - ) + mood_update_interval = gr.Number(value=config_data['mood']['mood_update_interval'], label="心情更新间隔 单位秒") with gr.Row(): - mood_decay_rate = gr.Slider( - minimum=0, - maximum=1, - step=0.01, - value=config_data["mood"]["mood_decay_rate"], - label="心情衰减率", - ) + mood_decay_rate = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['mood']['mood_decay_rate'], label="心情衰减率") with gr.Row(): - mood_intensity_factor = gr.Number( - value=config_data["mood"]["mood_intensity_factor"], label="心情强度因子" - ) + mood_intensity_factor = gr.Number(value=config_data['mood']['mood_intensity_factor'], label="心情强度因子") with gr.Row(): - save_memory_mood_btn = gr.Button("保存记忆&心情设置", variant="primary") + save_memory_mood_btn = gr.Button("保存记忆&心情设置",variant="primary") with gr.Row(): save_memory_mood_message = gr.Textbox() with gr.Row(): save_memory_mood_btn.click( save_memory_mood_config, - inputs=[ - build_memory_interval, - memory_compress_rate, - forget_memory_interval, - memory_forget_time, - memory_forget_percentage, - memory_ban_words_list_state, - mood_update_interval, - mood_decay_rate, - mood_intensity_factor, - ], - outputs=[save_memory_mood_message], + inputs=[build_memory_interval, memory_compress_rate, forget_memory_interval, memory_forget_time, memory_forget_percentage, memory_ban_words_list_state, mood_update_interval, mood_decay_rate, mood_intensity_factor], + outputs=[save_memory_mood_message] ) with gr.TabItem("6-群组设置"): with gr.Row(): with gr.Column(scale=3): with gr.Row(): - gr.Markdown("""## 群组设置""") + gr.Markdown( + """## 群组设置""" + ) with gr.Row(): - gr.Markdown("""### 可以回复消息的群""") + gr.Markdown( + """### 可以回复消息的群""" + ) with gr.Row(): - talk_allowed_list = config_data["groups"]["talk_allowed"] + talk_allowed_list = config_data['groups']['talk_allowed'] with gr.Blocks(): talk_allowed_list_state = gr.State(value=talk_allowed_list.copy()) @@ -1472,7 +1264,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: value="\n".join(map(str, talk_allowed_list)), label="可以回复消息的群列表", interactive=False, - lines=5, + lines=5 ) with gr.Row(): with gr.Column(scale=3): @@ -1482,7 +1274,8 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): talk_allowed_item_to_delete = gr.Dropdown( - choices=talk_allowed_list, label="选择要删除的群" + choices=talk_allowed_list, + label="选择要删除的群" ) talk_allowed_delete_btn = gr.Button("删除", scale=1) @@ -1490,26 +1283,16 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: talk_allowed_add_btn.click( add_int_item, inputs=[talk_allowed_new_item_input, talk_allowed_list_state], - outputs=[ - talk_allowed_list_state, - talk_allowed_list_display, - talk_allowed_item_to_delete, - talk_allowed_final_result, - ], + outputs=[talk_allowed_list_state, talk_allowed_list_display, talk_allowed_item_to_delete, talk_allowed_final_result] ) talk_allowed_delete_btn.click( delete_int_item, inputs=[talk_allowed_item_to_delete, talk_allowed_list_state], - outputs=[ - talk_allowed_list_state, - talk_allowed_list_display, - talk_allowed_item_to_delete, - talk_allowed_final_result, - ], + outputs=[talk_allowed_list_state, talk_allowed_list_display, talk_allowed_item_to_delete, talk_allowed_final_result] ) with gr.Row(): - talk_frequency_down_list = config_data["groups"]["talk_frequency_down"] + talk_frequency_down_list = config_data['groups']['talk_frequency_down'] with gr.Blocks(): talk_frequency_down_list_state = gr.State(value=talk_frequency_down_list.copy()) @@ -1518,7 +1301,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: value="\n".join(map(str, talk_frequency_down_list)), label="降低回复频率的群列表", interactive=False, - lines=5, + lines=5 ) with gr.Row(): with gr.Column(scale=3): @@ -1528,7 +1311,8 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): talk_frequency_down_item_to_delete = gr.Dropdown( - choices=talk_frequency_down_list, label="选择要删除的群" + choices=talk_frequency_down_list, + label="选择要删除的群" ) talk_frequency_down_delete_btn = gr.Button("删除", scale=1) @@ -1536,26 +1320,16 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: talk_frequency_down_add_btn.click( add_int_item, inputs=[talk_frequency_down_new_item_input, talk_frequency_down_list_state], - outputs=[ - talk_frequency_down_list_state, - talk_frequency_down_list_display, - talk_frequency_down_item_to_delete, - talk_frequency_down_final_result, - ], + outputs=[talk_frequency_down_list_state, talk_frequency_down_list_display, talk_frequency_down_item_to_delete, talk_frequency_down_final_result] ) talk_frequency_down_delete_btn.click( delete_int_item, inputs=[talk_frequency_down_item_to_delete, talk_frequency_down_list_state], - outputs=[ - talk_frequency_down_list_state, - talk_frequency_down_list_display, - talk_frequency_down_item_to_delete, - talk_frequency_down_final_result, - ], + outputs=[talk_frequency_down_list_state, talk_frequency_down_list_display, talk_frequency_down_item_to_delete, talk_frequency_down_final_result] ) with gr.Row(): - ban_user_id_list = config_data["groups"]["ban_user_id"] + ban_user_id_list = config_data['groups']['ban_user_id'] with gr.Blocks(): ban_user_id_list_state = gr.State(value=ban_user_id_list.copy()) @@ -1564,7 +1338,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: value="\n".join(map(str, ban_user_id_list)), label="禁止回复消息的QQ号列表", interactive=False, - lines=5, + lines=5 ) with gr.Row(): with gr.Column(scale=3): @@ -1574,7 +1348,8 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): ban_user_id_item_to_delete = gr.Dropdown( - choices=ban_user_id_list, label="选择要删除的QQ号" + choices=ban_user_id_list, + label="选择要删除的QQ号" ) ban_user_id_delete_btn = gr.Button("删除", scale=1) @@ -1582,26 +1357,16 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: ban_user_id_add_btn.click( add_int_item, inputs=[ban_user_id_new_item_input, ban_user_id_list_state], - outputs=[ - ban_user_id_list_state, - ban_user_id_list_display, - ban_user_id_item_to_delete, - ban_user_id_final_result, - ], + outputs=[ban_user_id_list_state, ban_user_id_list_display, ban_user_id_item_to_delete, ban_user_id_final_result] ) ban_user_id_delete_btn.click( delete_int_item, inputs=[ban_user_id_item_to_delete, ban_user_id_list_state], - outputs=[ - ban_user_id_list_state, - ban_user_id_list_display, - ban_user_id_item_to_delete, - ban_user_id_final_result, - ], + outputs=[ban_user_id_list_state, ban_user_id_list_display, ban_user_id_item_to_delete, ban_user_id_final_result] ) with gr.Row(): - save_group_btn = gr.Button("保存群组设置", variant="primary") + save_group_btn = gr.Button("保存群组设置",variant="primary") with gr.Row(): save_group_btn_message = gr.Textbox() with gr.Row(): @@ -1612,33 +1377,25 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: talk_frequency_down_list_state, ban_user_id_list_state, ], - outputs=[save_group_btn_message], + outputs=[save_group_btn_message] ) with gr.TabItem("7-其他设置"): with gr.Row(): with gr.Column(scale=3): with gr.Row(): - gr.Markdown("""### 其他设置""") - with gr.Row(): - keywords_reaction_enabled = gr.Checkbox( - value=config_data["keywords_reaction"]["enable"], label="是否针对某个关键词作出反应" + gr.Markdown( + """### 其他设置""" ) with gr.Row(): - enable_advance_output = gr.Checkbox( - value=config_data["others"]["enable_advance_output"], label="是否开启高级输出" - ) + keywords_reaction_enabled = gr.Checkbox(value=config_data['keywords_reaction']['enable'], label="是否针对某个关键词作出反应") with gr.Row(): - enable_kuuki_read = gr.Checkbox( - value=config_data["others"]["enable_kuuki_read"], label="是否启用读空气功能" - ) + enable_advance_output = gr.Checkbox(value=config_data['others']['enable_advance_output'], label="是否开启高级输出") with gr.Row(): - enable_debug_output = gr.Checkbox( - value=config_data["others"]["enable_debug_output"], label="是否开启调试输出" - ) + enable_kuuki_read = gr.Checkbox(value=config_data['others']['enable_kuuki_read'], label="是否启用读空气功能") with gr.Row(): - enable_friend_chat = gr.Checkbox( - value=config_data["others"]["enable_friend_chat"], label="是否开启好友聊天" - ) + enable_debug_output = gr.Checkbox(value=config_data['others']['enable_debug_output'], label="是否开启调试输出") + with gr.Row(): + enable_friend_chat = gr.Checkbox(value=config_data['others']['enable_friend_chat'], label="是否开启好友聊天") if PARSED_CONFIG_VERSION > HAVE_ONLINE_STATUS_VERSION: with gr.Row(): gr.Markdown( @@ -1647,71 +1404,42 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: """ ) with gr.Row(): - remote_status = gr.Checkbox( - value=config_data["remote"]["enable"], label="是否开启麦麦在线全球统计" - ) + remote_status = gr.Checkbox(value=config_data['remote']['enable'], label="是否开启麦麦在线全球统计") + else: + remote_status = gr.Checkbox(value=False,visible=False) + with gr.Row(): - gr.Markdown("""### 中文错别字设置""") - with gr.Row(): - chinese_typo_enabled = gr.Checkbox( - value=config_data["chinese_typo"]["enable"], label="是否开启中文错别字" + gr.Markdown( + """### 中文错别字设置""" ) with gr.Row(): - error_rate = gr.Slider( - minimum=0, - maximum=1, - step=0.001, - value=config_data["chinese_typo"]["error_rate"], - label="单字替换概率", - ) + chinese_typo_enabled = gr.Checkbox(value=config_data['chinese_typo']['enable'], label="是否开启中文错别字") with gr.Row(): - min_freq = gr.Number(value=config_data["chinese_typo"]["min_freq"], label="最小字频阈值") + error_rate = gr.Slider(minimum=0, maximum=1, step=0.001, value=config_data['chinese_typo']['error_rate'], label="单字替换概率") with gr.Row(): - tone_error_rate = gr.Slider( - minimum=0, - maximum=1, - step=0.01, - value=config_data["chinese_typo"]["tone_error_rate"], - label="声调错误概率", - ) + min_freq = gr.Number(value=config_data['chinese_typo']['min_freq'], label="最小字频阈值") with gr.Row(): - word_replace_rate = gr.Slider( - minimum=0, - maximum=1, - step=0.001, - value=config_data["chinese_typo"]["word_replace_rate"], - label="整词替换概率", - ) + tone_error_rate = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['chinese_typo']['tone_error_rate'], label="声调错误概率") with gr.Row(): - save_other_config_btn = gr.Button("保存其他配置", variant="primary") + word_replace_rate = gr.Slider(minimum=0, maximum=1, step=0.001, value=config_data['chinese_typo']['word_replace_rate'], label="整词替换概率") + with gr.Row(): + save_other_config_btn = gr.Button("保存其他配置",variant="primary") with gr.Row(): save_other_config_message = gr.Textbox() with gr.Row(): if PARSED_CONFIG_VERSION <= HAVE_ONLINE_STATUS_VERSION: - remote_status = gr.Checkbox(value=False, visible=False) + remote_status = gr.Checkbox(value=False,visible=False) save_other_config_btn.click( save_other_config, - inputs=[ - keywords_reaction_enabled, - enable_advance_output, - enable_kuuki_read, - enable_debug_output, - enable_friend_chat, - chinese_typo_enabled, - error_rate, - min_freq, - tone_error_rate, - word_replace_rate, - remote_status, - ], - outputs=[save_other_config_message], + inputs=[keywords_reaction_enabled,enable_advance_output, enable_kuuki_read, enable_debug_output, enable_friend_chat, chinese_typo_enabled, error_rate, min_freq, tone_error_rate, word_replace_rate,remote_status], + outputs=[save_other_config_message] ) - app.queue().launch( # concurrency_count=511, max_size=1022 + app.queue().launch(#concurrency_count=511, max_size=1022 server_name="0.0.0.0", inbrowser=True, share=is_share, server_port=7000, debug=debug, quiet=True, - ) + ) \ No newline at end of file From 64d259ac4a3344b0b70d117635e6f7bea1b7fd5a Mon Sep 17 00:00:00 2001 From: DrSmoothl <1787882683@qq.com> Date: Wed, 19 Mar 2025 22:46:06 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=80=E4=BD=8E?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=89=88=E6=9C=AC=E4=B8=BA0.5.13,=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E6=9B=B4=E5=A4=9A=E7=9A=84=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webui.py | 1015 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 662 insertions(+), 353 deletions(-) diff --git a/webui.py b/webui.py index 1dbfba3a9..a6f62e150 100644 --- a/webui.py +++ b/webui.py @@ -103,6 +103,7 @@ def parse_env_config(config_file): return env_variables + # env环境配置文件保存函数 def save_to_env_file(env_variables, filename=".env.prod"): """ @@ -120,7 +121,7 @@ def save_to_env_file(env_variables, filename=".env.prod"): logger.warning(f"{filename} 不存在，无法进行备份。") # 保存新配置 - with open(filename, "w",encoding="utf-8") as f: + with open(filename, "w", encoding="utf-8") as f: for var, value in env_variables.items(): f.write(f"{var[4:]}={value}\n") # 移除env_前缀 logger.info(f"配置已保存到 {filename}") @@ -143,6 +144,7 @@ else: env_config_data["env_VOLCENGINE_KEY"] = "volc_key" save_to_env_file(env_config_data, env_config_file) + def parse_model_providers(env_vars): """ 从环境变量中解析模型提供商列表 @@ -159,6 +161,7 @@ def parse_model_providers(env_vars): providers.append(provider) return providers + def add_new_provider(provider_name, current_providers): """ 添加新的提供商到列表中 @@ -183,6 +186,7 @@ def add_new_provider(provider_name, current_providers): return updated_providers, gr.update(choices=updated_providers) + # 从环境变量中解析并更新提供商列表 MODEL_PROVIDER_LIST = parse_model_providers(env_config_data) @@ -225,10 +229,12 @@ def get_online_maimbot(url="http://hyybuth.xyz:10058/api/clients/details", timeo logger.error("无法解析返回的JSON数据，请检查API返回内容。") return None + online_maimbot_data = get_online_maimbot() -#============================================== -#env环境文件中插件修改更新函数 + +# ============================================== +# env环境文件中插件修改更新函数 def add_item(new_item, current_list): updated_list = current_list.copy() if new_item.strip(): @@ -237,19 +243,16 @@ def add_item(new_item, current_list): updated_list, # 更新State "\n".join(updated_list), # 更新TextArea gr.update(choices=updated_list), # 更新Dropdown - ", ".join(updated_list) # 更新最终结果 + ", ".join(updated_list), # 更新最终结果 ] + def delete_item(selected_item, current_list): updated_list = current_list.copy() if selected_item in updated_list: updated_list.remove(selected_item) - return [ - updated_list, - "\n".join(updated_list), - gr.update(choices=updated_list), - ", ".join(updated_list) - ] + return [updated_list, "\n".join(updated_list), gr.update(choices=updated_list), ", ".join(updated_list)] + def add_int_item(new_item, current_list): updated_list = current_list.copy() @@ -264,9 +267,10 @@ def add_int_item(new_item, current_list): updated_list, # 更新State "\n".join(map(str, updated_list)), # 更新TextArea gr.update(choices=updated_list), # 更新Dropdown - ", ".join(map(str, updated_list)) # 更新最终结果 + ", ".join(map(str, updated_list)), # 更新最终结果 ] + def delete_int_item(selected_item, current_list): updated_list = current_list.copy() if selected_item in updated_list: @@ -275,8 +279,10 @@ def delete_int_item(selected_item, current_list): updated_list, "\n".join(map(str, updated_list)), gr.update(choices=updated_list), - ", ".join(map(str, updated_list)) + ", ".join(map(str, updated_list)), ] + + # env文件中插件值处理函数 def parse_list_str(input_str): """ @@ -293,6 +299,7 @@ def parse_list_str(input_str): cleaned = input_str.strip(" []") # 去除方括号 return [item.strip(" '\"") for item in cleaned.split(",") if item.strip()] + def format_list_to_str(lst): """ 将Python列表转换为形如["src2.plugins.chat"]的字符串格式 @@ -312,7 +319,21 @@ def format_list_to_str(lst): # env保存函数 -def save_trigger(server_address, server_port, final_result_list, t_mongodb_host, t_mongodb_port, t_mongodb_database_name, t_console_log_level, t_file_log_level, t_default_console_log_level, t_default_file_log_level, t_api_provider, t_api_base_url, t_api_key): +def save_trigger( + server_address, + server_port, + final_result_list, + t_mongodb_host, + t_mongodb_port, + t_mongodb_database_name, + t_console_log_level, + t_file_log_level, + t_default_console_log_level, + t_default_file_log_level, + t_api_provider, + t_api_base_url, + t_api_key, +): final_result_lists = format_list_to_str(final_result_list) env_config_data["env_HOST"] = server_address env_config_data["env_PORT"] = server_port @@ -335,6 +356,7 @@ def save_trigger(server_address, server_port, final_result_list, t_mongodb_host, logger.success("配置已保存到 .env.prod 文件中") return "配置已保存" + def update_api_inputs(provider): """ 根据选择的提供商更新Base URL和API Key输入框的值 @@ -343,6 +365,7 @@ def update_api_inputs(provider): api_key = env_config_data.get(f"env_{provider}_KEY", "") return base_url, api_key + # 绑定下拉列表的change事件 @@ -362,11 +385,12 @@ def save_config_to_file(t_config_data): else: logger.warning(f"{filename} 不存在，无法进行备份。") - with open(filename, "w", encoding="utf-8") as f: toml.dump(t_config_data, f) logger.success("配置已保存到 bot_config.toml 文件中") -def save_bot_config(t_qqbot_qq, t_nickname,t_nickname_final_result): + + +def save_bot_config(t_qqbot_qq, t_nickname, t_nickname_final_result): config_data["bot"]["qq"] = int(t_qqbot_qq) config_data["bot"]["nickname"] = t_nickname config_data["bot"]["alias_names"] = t_nickname_final_result @@ -374,45 +398,75 @@ def save_bot_config(t_qqbot_qq, t_nickname,t_nickname_final_result): logger.info("Bot配置已保存") return "Bot配置已保存" + # 监听滑块的值变化，确保总和不超过 1，并显示警告 -def adjust_personality_greater_probabilities(t_personality_1_probability, t_personality_2_probability, t_personality_3_probability): - total = Decimal(str(t_personality_1_probability)) + Decimal(str(t_personality_2_probability)) + Decimal(str(t_personality_3_probability)) - if total > Decimal('1.0'): - warning_message = f"警告: 人格1、人格2和人格3的概率总和为 {float(total):.2f}，超过了 1.0！请调整滑块使总和等于 1.0。" +def adjust_personality_greater_probabilities( + t_personality_1_probability, t_personality_2_probability, t_personality_3_probability +): + total = ( + Decimal(str(t_personality_1_probability)) + + Decimal(str(t_personality_2_probability)) + + Decimal(str(t_personality_3_probability)) + ) + if total > Decimal("1.0"): + warning_message = ( + f"警告: 人格1、人格2和人格3的概率总和为 {float(total):.2f}，超过了 1.0！请调整滑块使总和等于 1.0。" + ) return warning_message return "" # 没有警告时返回空字符串 -def adjust_personality_less_probabilities(t_personality_1_probability, t_personality_2_probability, t_personality_3_probability): - total = Decimal(str(t_personality_1_probability)) + Decimal(str(t_personality_2_probability)) + Decimal(str(t_personality_3_probability)) - if total < Decimal('1.0'): - warning_message = f"警告: 人格1、人格2和人格3的概率总和为 {float(total):.2f}，小于 1.0！请调整滑块使总和等于 1.0。" + +def adjust_personality_less_probabilities( + t_personality_1_probability, t_personality_2_probability, t_personality_3_probability +): + total = ( + Decimal(str(t_personality_1_probability)) + + Decimal(str(t_personality_2_probability)) + + Decimal(str(t_personality_3_probability)) + ) + if total < Decimal("1.0"): + warning_message = ( + f"警告: 人格1、人格2和人格3的概率总和为 {float(total):.2f}，小于 1.0！请调整滑块使总和等于 1.0。" + ) return warning_message return "" # 没有警告时返回空字符串 + def adjust_model_greater_probabilities(t_model_1_probability, t_model_2_probability, t_model_3_probability): - total = Decimal(str(t_model_1_probability)) + Decimal(str(t_model_2_probability)) + Decimal(str(t_model_3_probability)) - if total > Decimal('1.0'): - warning_message = f"警告: 选择模型1、模型2和模型3的概率总和为 {float(total):.2f}，超过了 1.0！请调整滑块使总和等于 1.0。" + total = ( + Decimal(str(t_model_1_probability)) + Decimal(str(t_model_2_probability)) + Decimal(str(t_model_3_probability)) + ) + if total > Decimal("1.0"): + warning_message = ( + f"警告: 选择模型1、模型2和模型3的概率总和为 {float(total):.2f}，超过了 1.0！请调整滑块使总和等于 1.0。" + ) return warning_message return "" # 没有警告时返回空字符串 + def adjust_model_less_probabilities(t_model_1_probability, t_model_2_probability, t_model_3_probability): - total = Decimal(str(t_model_1_probability)) + Decimal(str(t_model_2_probability)) + Decimal(str(t_model_3_probability)) - if total < Decimal('1.0'): - warning_message = f"警告: 选择模型1、模型2和模型3的概率总和为 {float(total):.2f}，小于了 1.0！请调整滑块使总和等于 1.0。" + total = ( + Decimal(str(t_model_1_probability)) + Decimal(str(t_model_2_probability)) + Decimal(str(t_model_3_probability)) + ) + if total < Decimal("1.0"): + warning_message = ( + f"警告: 选择模型1、模型2和模型3的概率总和为 {float(total):.2f}，小于了 1.0！请调整滑块使总和等于 1.0。" + ) return warning_message return "" # 没有警告时返回空字符串 # ============================================== # 人格保存函数 -def save_personality_config(t_prompt_personality_1, - t_prompt_personality_2, - t_prompt_personality_3, - t_prompt_schedule, - t_personality_1_probability, - t_personality_2_probability, - t_personality_3_probability): +def save_personality_config( + t_prompt_personality_1, + t_prompt_personality_2, + t_prompt_personality_3, + t_prompt_schedule, + t_personality_1_probability, + t_personality_2_probability, + t_personality_3_probability, +): # 保存人格提示词 config_data["personality"]["prompt_personality"][0] = t_prompt_personality_1 config_data["personality"]["prompt_personality"][1] = t_prompt_personality_2 @@ -431,20 +485,22 @@ def save_personality_config(t_prompt_personality_1, return "人格配置已保存" -def save_message_and_emoji_config(t_min_text_length, - t_max_context_size, - t_emoji_chance, - t_thinking_timeout, - t_response_willing_amplifier, - t_response_interested_rate_amplifier, - t_down_frequency_rate, - t_ban_words_final_result, - t_ban_msgs_regex_final_result, - t_check_interval, - t_register_interval, - t_auto_save, - t_enable_check, - t_check_prompt): +def save_message_and_emoji_config( + t_min_text_length, + t_max_context_size, + t_emoji_chance, + t_thinking_timeout, + t_response_willing_amplifier, + t_response_interested_rate_amplifier, + t_down_frequency_rate, + t_ban_words_final_result, + t_ban_msgs_regex_final_result, + t_check_interval, + t_register_interval, + t_auto_save, + t_enable_check, + t_check_prompt, +): config_data["message"]["min_text_length"] = t_min_text_length config_data["message"]["max_context_size"] = t_max_context_size config_data["message"]["emoji_chance"] = t_emoji_chance @@ -452,7 +508,7 @@ def save_message_and_emoji_config(t_min_text_length, config_data["message"]["response_willing_amplifier"] = t_response_willing_amplifier config_data["message"]["response_interested_rate_amplifier"] = t_response_interested_rate_amplifier config_data["message"]["down_frequency_rate"] = t_down_frequency_rate - config_data["message"]["ban_words"] =t_ban_words_final_result + config_data["message"]["ban_words"] = t_ban_words_final_result config_data["message"]["ban_msgs_regex"] = t_ban_msgs_regex_final_result config_data["emoji"]["check_interval"] = t_check_interval config_data["emoji"]["register_interval"] = t_register_interval @@ -463,50 +519,65 @@ def save_message_and_emoji_config(t_min_text_length, logger.info("消息和表情配置已保存到 bot_config.toml 文件中") return "消息和表情配置已保存" -def save_response_model_config(t_model_r1_probability, - t_model_r2_probability, - t_model_r3_probability, - t_max_response_length, - t_model1_name, - t_model1_provider, - t_model1_pri_in, - t_model1_pri_out, - t_model2_name, - t_model2_provider, - t_model3_name, - t_model3_provider, - t_emotion_model_name, - t_emotion_model_provider, - t_topic_judge_model_name, - t_topic_judge_model_provider, - t_summary_by_topic_model_name, - t_summary_by_topic_model_provider, - t_vlm_model_name, - t_vlm_model_provider): + +def save_response_model_config( + t_model_r1_probability, + t_model_r2_probability, + t_model_r3_probability, + t_max_response_length, + t_model1_name, + t_model1_provider, + t_model1_pri_in, + t_model1_pri_out, + t_model2_name, + t_model2_provider, + t_model3_name, + t_model3_provider, + t_emotion_model_name, + t_emotion_model_provider, + t_topic_judge_model_name, + t_topic_judge_model_provider, + t_summary_by_topic_model_name, + t_summary_by_topic_model_provider, + t_vlm_model_name, + t_vlm_model_provider, +): config_data["response"]["model_r1_probability"] = t_model_r1_probability config_data["response"]["model_v3_probability"] = t_model_r2_probability config_data["response"]["model_r1_distill_probability"] = t_model_r3_probability config_data["response"]["max_response_length"] = t_max_response_length - config_data['model']['llm_reasoning']['name'] = t_model1_name - config_data['model']['llm_reasoning']['provider'] = t_model1_provider - config_data['model']['llm_reasoning']['pri_in'] = t_model1_pri_in - config_data['model']['llm_reasoning']['pri_out'] = t_model1_pri_out - config_data['model']['llm_normal']['name'] = t_model2_name - config_data['model']['llm_normal']['provider'] = t_model2_provider - config_data['model']['llm_reasoning_minor']['name'] = t_model3_name - config_data['model']['llm_normal']['provider'] = t_model3_provider - config_data['model']['llm_emotion_judge']['name'] = t_emotion_model_name - config_data['model']['llm_emotion_judge']['provider'] = t_emotion_model_provider - config_data['model']['llm_topic_judge']['name'] = t_topic_judge_model_name - config_data['model']['llm_topic_judge']['provider'] = t_topic_judge_model_provider - config_data['model']['llm_summary_by_topic']['name'] = t_summary_by_topic_model_name - config_data['model']['llm_summary_by_topic']['provider'] = t_summary_by_topic_model_provider - config_data['model']['vlm']['name'] = t_vlm_model_name - config_data['model']['vlm']['provider'] = t_vlm_model_provider + config_data["model"]["llm_reasoning"]["name"] = t_model1_name + config_data["model"]["llm_reasoning"]["provider"] = t_model1_provider + config_data["model"]["llm_reasoning"]["pri_in"] = t_model1_pri_in + config_data["model"]["llm_reasoning"]["pri_out"] = t_model1_pri_out + config_data["model"]["llm_normal"]["name"] = t_model2_name + config_data["model"]["llm_normal"]["provider"] = t_model2_provider + config_data["model"]["llm_reasoning_minor"]["name"] = t_model3_name + config_data["model"]["llm_normal"]["provider"] = t_model3_provider + config_data["model"]["llm_emotion_judge"]["name"] = t_emotion_model_name + config_data["model"]["llm_emotion_judge"]["provider"] = t_emotion_model_provider + config_data["model"]["llm_topic_judge"]["name"] = t_topic_judge_model_name + config_data["model"]["llm_topic_judge"]["provider"] = t_topic_judge_model_provider + config_data["model"]["llm_summary_by_topic"]["name"] = t_summary_by_topic_model_name + config_data["model"]["llm_summary_by_topic"]["provider"] = t_summary_by_topic_model_provider + config_data["model"]["vlm"]["name"] = t_vlm_model_name + config_data["model"]["vlm"]["provider"] = t_vlm_model_provider save_config_to_file(config_data) logger.info("回复&模型设置已保存到 bot_config.toml 文件中") return "回复&模型设置已保存" -def save_memory_mood_config(t_build_memory_interval, t_memory_compress_rate, t_forget_memory_interval, t_memory_forget_time, t_memory_forget_percentage, t_memory_ban_words_final_result, t_mood_update_interval, t_mood_decay_rate, t_mood_intensity_factor): + + +def save_memory_mood_config( + t_build_memory_interval, + t_memory_compress_rate, + t_forget_memory_interval, + t_memory_forget_time, + t_memory_forget_percentage, + t_memory_ban_words_final_result, + t_mood_update_interval, + t_mood_decay_rate, + t_mood_intensity_factor, +): config_data["memory"]["build_memory_interval"] = t_build_memory_interval config_data["memory"]["memory_compress_rate"] = t_memory_compress_rate config_data["memory"]["forget_memory_interval"] = t_forget_memory_interval @@ -520,12 +591,25 @@ def save_memory_mood_config(t_build_memory_interval, t_memory_compress_rate, t_f logger.info("记忆和心情设置已保存到 bot_config.toml 文件中") return "记忆和心情设置已保存" -def save_other_config(t_keywords_reaction_enabled,t_enable_advance_output, t_enable_kuuki_read, t_enable_debug_output, t_enable_friend_chat, t_chinese_typo_enabled, t_error_rate, t_min_freq, t_tone_error_rate, t_word_replace_rate,t_remote_status): - config_data['keywords_reaction']['enable'] = t_keywords_reaction_enabled - config_data['others']['enable_advance_output'] = t_enable_advance_output - config_data['others']['enable_kuuki_read'] = t_enable_kuuki_read - config_data['others']['enable_debug_output'] = t_enable_debug_output - config_data['others']['enable_friend_chat'] = t_enable_friend_chat + +def save_other_config( + t_keywords_reaction_enabled, + t_enable_advance_output, + t_enable_kuuki_read, + t_enable_debug_output, + t_enable_friend_chat, + t_chinese_typo_enabled, + t_error_rate, + t_min_freq, + t_tone_error_rate, + t_word_replace_rate, + t_remote_status, +): + config_data["keywords_reaction"]["enable"] = t_keywords_reaction_enabled + config_data["others"]["enable_advance_output"] = t_enable_advance_output + config_data["others"]["enable_kuuki_read"] = t_enable_kuuki_read + config_data["others"]["enable_debug_output"] = t_enable_debug_output + config_data["others"]["enable_friend_chat"] = t_enable_friend_chat config_data["chinese_typo"]["enable"] = t_chinese_typo_enabled config_data["chinese_typo"]["error_rate"] = t_error_rate config_data["chinese_typo"]["min_freq"] = t_min_freq @@ -537,9 +621,12 @@ def save_other_config(t_keywords_reaction_enabled,t_enable_advance_output, t_ena logger.info("其他设置已保存到 bot_config.toml 文件中") return "其他设置已保存" -def save_group_config(t_talk_allowed_final_result, - t_talk_frequency_down_final_result, - t_ban_user_id_final_result,): + +def save_group_config( + t_talk_allowed_final_result, + t_talk_frequency_down_final_result, + t_ban_user_id_final_result, +): config_data["groups"]["talk_allowed"] = t_talk_allowed_final_result config_data["groups"]["talk_frequency_down"] = t_talk_frequency_down_final_result config_data["groups"]["ban_user_id"] = t_ban_user_id_final_result @@ -547,6 +634,7 @@ def save_group_config(t_talk_allowed_final_result, logger.info("群聊设置已保存到 bot_config.toml 文件中") return "群聊设置已保存" + with gr.Blocks(title="MaimBot配置文件编辑") as app: gr.Markdown( value=""" @@ -554,20 +642,9 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: 感谢ZureTz大佬提供的人格保存部分修复！ """ ) - gr.Markdown( - value="## 全球在线MaiMBot数量: " + str((online_maimbot_data or {}).get('online_clients', 0)) - ) - gr.Markdown( - value="## 当前WebUI版本: " + str(WEBUI_VERSION) - ) - if PARSED_CONFIG_VERSION > LEGACY_CONFIG_VERSION: - gr.Markdown( - value="### 配置文件版本：" + config_data["inner"]["version"] - ) - else: - gr.Markdown( - value="### 配置文件版本：" + "LEGACY(旧版本)" - ) + gr.Markdown(value="## 全球在线MaiMBot数量: " + str((online_maimbot_data or {}).get("online_clients", 0))) + gr.Markdown(value="## 当前WebUI版本: " + str(WEBUI_VERSION)) + gr.Markdown(value="### 配置文件版本：" + config_data["inner"]["version"]) with gr.Tabs(): with gr.TabItem("0-环境设置"): with gr.Row(): @@ -581,27 +658,20 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: ) with gr.Row(): server_address = gr.Textbox( - label="服务器地址", - value=env_config_data["env_HOST"], - interactive=True + label="服务器地址", value=env_config_data["env_HOST"], interactive=True ) with gr.Row(): server_port = gr.Textbox( - label="服务器端口", - value=env_config_data["env_PORT"], - interactive=True + label="服务器端口", value=env_config_data["env_PORT"], interactive=True ) with gr.Row(): - plugin_list = parse_list_str(env_config_data['env_PLUGINS']) + plugin_list = parse_list_str(env_config_data["env_PLUGINS"]) with gr.Blocks(): list_state = gr.State(value=plugin_list.copy()) with gr.Row(): list_display = gr.TextArea( - value="\n".join(plugin_list), - label="插件列表", - interactive=False, - lines=5 + value="\n".join(plugin_list), label="插件列表", interactive=False, lines=5 ) with gr.Row(): with gr.Column(scale=3): @@ -610,170 +680,161 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): - item_to_delete = gr.Dropdown( - choices=plugin_list, - label="选择要删除的插件" - ) + item_to_delete = gr.Dropdown(choices=plugin_list, label="选择要删除的插件") delete_btn = gr.Button("删除", scale=1) final_result = gr.Text(label="修改后的列表") add_btn.click( add_item, inputs=[new_item_input, list_state], - outputs=[list_state, list_display, item_to_delete, final_result] + outputs=[list_state, list_display, item_to_delete, final_result], ) delete_btn.click( delete_item, inputs=[item_to_delete, list_state], - outputs=[list_state, list_display, item_to_delete, final_result] + outputs=[list_state, list_display, item_to_delete, final_result], ) with gr.Row(): gr.Markdown( - '''MongoDB设置项\n + """MongoDB设置项\n 保持默认即可，如果你有能力承担修改过后的后果（简称能改回来（笑））\n 可以对以下配置项进行修改\n - ''' + """ ) with gr.Row(): mongodb_host = gr.Textbox( - label="MongoDB服务器地址", - value=env_config_data["env_MONGODB_HOST"], - interactive=True + label="MongoDB服务器地址", value=env_config_data["env_MONGODB_HOST"], interactive=True ) with gr.Row(): mongodb_port = gr.Textbox( - label="MongoDB服务器端口", - value=env_config_data["env_MONGODB_PORT"], - interactive=True + label="MongoDB服务器端口", value=env_config_data["env_MONGODB_PORT"], interactive=True ) with gr.Row(): mongodb_database_name = gr.Textbox( - label="MongoDB数据库名称", - value=env_config_data["env_DATABASE_NAME"], - interactive=True + label="MongoDB数据库名称", value=env_config_data["env_DATABASE_NAME"], interactive=True ) with gr.Row(): gr.Markdown( - '''日志设置\n + """日志设置\n 配置日志输出级别\n 改完了记得保存！！！ - ''' + """ ) with gr.Row(): console_log_level = gr.Dropdown( choices=["INFO", "DEBUG", "WARNING", "ERROR", "SUCCESS"], label="控制台日志级别", value=env_config_data.get("env_CONSOLE_LOG_LEVEL", "INFO"), - interactive=True + interactive=True, ) with gr.Row(): file_log_level = gr.Dropdown( choices=["INFO", "DEBUG", "WARNING", "ERROR", "SUCCESS"], label="文件日志级别", value=env_config_data.get("env_FILE_LOG_LEVEL", "DEBUG"), - interactive=True + interactive=True, ) with gr.Row(): default_console_log_level = gr.Dropdown( choices=["INFO", "DEBUG", "WARNING", "ERROR", "SUCCESS", "NONE"], label="默认控制台日志级别", value=env_config_data.get("env_DEFAULT_CONSOLE_LOG_LEVEL", "SUCCESS"), - interactive=True + interactive=True, ) with gr.Row(): default_file_log_level = gr.Dropdown( choices=["INFO", "DEBUG", "WARNING", "ERROR", "SUCCESS", "NONE"], label="默认文件日志级别", value=env_config_data.get("env_DEFAULT_FILE_LOG_LEVEL", "DEBUG"), - interactive=True + interactive=True, ) with gr.Row(): gr.Markdown( - '''API设置\n + """API设置\n 选择API提供商并配置相应的BaseURL和Key\n 改完了记得保存！！！ - ''' + """ ) with gr.Row(): with gr.Column(scale=3): - new_provider_input = gr.Textbox( - label="添加新提供商", - placeholder="输入新提供商名称" - ) + new_provider_input = gr.Textbox(label="添加新提供商", placeholder="输入新提供商名称") add_provider_btn = gr.Button("添加提供商", scale=1) with gr.Row(): api_provider = gr.Dropdown( choices=MODEL_PROVIDER_LIST, label="选择API提供商", - value=MODEL_PROVIDER_LIST[0] if MODEL_PROVIDER_LIST else None + value=MODEL_PROVIDER_LIST[0] if MODEL_PROVIDER_LIST else None, ) with gr.Row(): api_base_url = gr.Textbox( label="Base URL", - value=env_config_data.get(f"env_{MODEL_PROVIDER_LIST[0]}_BASE_URL", "") if MODEL_PROVIDER_LIST else "", - interactive=True + value=env_config_data.get(f"env_{MODEL_PROVIDER_LIST[0]}_BASE_URL", "") + if MODEL_PROVIDER_LIST + else "", + interactive=True, ) with gr.Row(): api_key = gr.Textbox( label="API Key", - value=env_config_data.get(f"env_{MODEL_PROVIDER_LIST[0]}_KEY", "") if MODEL_PROVIDER_LIST else "", - interactive=True - ) - api_provider.change( - update_api_inputs, - inputs=[api_provider], - outputs=[api_base_url, api_key] + value=env_config_data.get(f"env_{MODEL_PROVIDER_LIST[0]}_KEY", "") + if MODEL_PROVIDER_LIST + else "", + interactive=True, ) + api_provider.change(update_api_inputs, inputs=[api_provider], outputs=[api_base_url, api_key]) with gr.Row(): - save_env_btn = gr.Button("保存环境配置",variant="primary") + save_env_btn = gr.Button("保存环境配置", variant="primary") with gr.Row(): save_env_btn.click( save_trigger, - inputs=[server_address, server_port, final_result, mongodb_host, mongodb_port, mongodb_database_name, console_log_level, file_log_level, default_console_log_level, default_file_log_level, api_provider, api_base_url, api_key], - outputs=[gr.Textbox( - label="保存结果", - interactive=False - )] + inputs=[ + server_address, + server_port, + final_result, + mongodb_host, + mongodb_port, + mongodb_database_name, + console_log_level, + file_log_level, + default_console_log_level, + default_file_log_level, + api_provider, + api_base_url, + api_key, + ], + outputs=[gr.Textbox(label="保存结果", interactive=False)], ) # 绑定添加提供商按钮的点击事件 add_provider_btn.click( add_new_provider, inputs=[new_provider_input, gr.State(value=MODEL_PROVIDER_LIST)], - outputs=[gr.State(value=MODEL_PROVIDER_LIST), api_provider] + outputs=[gr.State(value=MODEL_PROVIDER_LIST), api_provider], ).then( - lambda x: (env_config_data.get(f"env_{x}_BASE_URL", ""), env_config_data.get(f"env_{x}_KEY", "")), + lambda x: ( + env_config_data.get(f"env_{x}_BASE_URL", ""), + env_config_data.get(f"env_{x}_KEY", ""), + ), inputs=[api_provider], - outputs=[api_base_url, api_key] + outputs=[api_base_url, api_key], ) with gr.TabItem("1-Bot基础设置"): with gr.Row(): with gr.Column(scale=3): with gr.Row(): - qqbot_qq = gr.Textbox( - label="QQ机器人QQ号", - value=config_data["bot"]["qq"], - interactive=True - ) + qqbot_qq = gr.Textbox(label="QQ机器人QQ号", value=config_data["bot"]["qq"], interactive=True) with gr.Row(): - nickname = gr.Textbox( - label="昵称", - value=config_data["bot"]["nickname"], - interactive=True - ) + nickname = gr.Textbox(label="昵称", value=config_data["bot"]["nickname"], interactive=True) with gr.Row(): - nickname_list = config_data['bot']['alias_names'] + nickname_list = config_data["bot"]["alias_names"] with gr.Blocks(): nickname_list_state = gr.State(value=nickname_list.copy()) with gr.Row(): nickname_list_display = gr.TextArea( - value="\n".join(nickname_list), - label="别名列表", - interactive=False, - lines=5 + value="\n".join(nickname_list), label="别名列表", interactive=False, lines=5 ) with gr.Row(): with gr.Column(scale=3): @@ -782,35 +843,37 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): - nickname_item_to_delete = gr.Dropdown( - choices=nickname_list, - label="选择要删除的别名" - ) + nickname_item_to_delete = gr.Dropdown(choices=nickname_list, label="选择要删除的别名") nickname_delete_btn = gr.Button("删除", scale=1) nickname_final_result = gr.Text(label="修改后的列表") nickname_add_btn.click( add_item, inputs=[nickname_new_item_input, nickname_list_state], - outputs=[nickname_list_state, nickname_list_display, nickname_item_to_delete, nickname_final_result] + outputs=[ + nickname_list_state, + nickname_list_display, + nickname_item_to_delete, + nickname_final_result, + ], ) nickname_delete_btn.click( delete_item, inputs=[nickname_item_to_delete, nickname_list_state], - outputs=[nickname_list_state, nickname_list_display, nickname_item_to_delete, nickname_final_result] + outputs=[ + nickname_list_state, + nickname_list_display, + nickname_item_to_delete, + nickname_final_result, + ], ) gr.Button( - "保存Bot配置", - variant="primary", - elem_id="save_bot_btn", - elem_classes="save_bot_btn" + "保存Bot配置", variant="primary", elem_id="save_bot_btn", elem_classes="save_bot_btn" ).click( save_bot_config, - inputs=[qqbot_qq, nickname,nickname_list_state], - outputs=[gr.Textbox( - label="保存Bot结果" - )] + inputs=[qqbot_qq, nickname, nickname_list_state], + outputs=[gr.Textbox(label="保存Bot结果")], ) with gr.TabItem("2-人格设置"): with gr.Row(): @@ -906,16 +969,14 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): prompt_schedule = gr.Textbox( - label="日程生成提示词", - value=config_data["personality"]["prompt_schedule"], - interactive=True + label="日程生成提示词", value=config_data["personality"]["prompt_schedule"], interactive=True ) with gr.Row(): personal_save_btn = gr.Button( "保存人格配置", variant="primary", elem_id="save_personality_btn", - elem_classes="save_personality_btn" + elem_classes="save_personality_btn", ) with gr.Row(): personal_save_message = gr.Textbox(label="保存人格结果") @@ -936,31 +997,51 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): with gr.Row(): - min_text_length = gr.Number(value=config_data['message']['min_text_length'], label="与麦麦聊天时麦麦只会回答文本大于等于此数的消息") + min_text_length = gr.Number( + value=config_data["message"]["min_text_length"], + label="与麦麦聊天时麦麦只会回答文本大于等于此数的消息", + ) with gr.Row(): - max_context_size = gr.Number(value=config_data['message']['max_context_size'], label="麦麦获得的上文数量") + max_context_size = gr.Number( + value=config_data["message"]["max_context_size"], label="麦麦获得的上文数量" + ) with gr.Row(): - emoji_chance = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['message']['emoji_chance'], label="麦麦使用表情包的概率") + emoji_chance = gr.Slider( + minimum=0, + maximum=1, + step=0.01, + value=config_data["message"]["emoji_chance"], + label="麦麦使用表情包的概率", + ) with gr.Row(): - thinking_timeout = gr.Number(value=config_data['message']['thinking_timeout'], label="麦麦正在思考时，如果超过此秒数，则停止思考") + thinking_timeout = gr.Number( + value=config_data["message"]["thinking_timeout"], + label="麦麦正在思考时，如果超过此秒数，则停止思考", + ) with gr.Row(): - response_willing_amplifier = gr.Number(value=config_data['message']['response_willing_amplifier'], label="麦麦回复意愿放大系数，一般为1") + response_willing_amplifier = gr.Number( + value=config_data["message"]["response_willing_amplifier"], + label="麦麦回复意愿放大系数，一般为1", + ) with gr.Row(): - response_interested_rate_amplifier = gr.Number(value=config_data['message']['response_interested_rate_amplifier'], label="麦麦回复兴趣度放大系数,听到记忆里的内容时放大系数") + response_interested_rate_amplifier = gr.Number( + value=config_data["message"]["response_interested_rate_amplifier"], + label="麦麦回复兴趣度放大系数,听到记忆里的内容时放大系数", + ) with gr.Row(): - down_frequency_rate = gr.Number(value=config_data['message']['down_frequency_rate'], label="降低回复频率的群组回复意愿降低系数") + down_frequency_rate = gr.Number( + value=config_data["message"]["down_frequency_rate"], + label="降低回复频率的群组回复意愿降低系数", + ) with gr.Row(): gr.Markdown("### 违禁词列表") with gr.Row(): - ban_words_list = config_data['message']['ban_words'] + ban_words_list = config_data["message"]["ban_words"] with gr.Blocks(): ban_words_list_state = gr.State(value=ban_words_list.copy()) with gr.Row(): ban_words_list_display = gr.TextArea( - value="\n".join(ban_words_list), - label="违禁词列表", - interactive=False, - lines=5 + value="\n".join(ban_words_list), label="违禁词列表", interactive=False, lines=5 ) with gr.Row(): with gr.Column(scale=3): @@ -970,8 +1051,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): ban_words_item_to_delete = gr.Dropdown( - choices=ban_words_list, - label="选择要删除的违禁词" + choices=ban_words_list, label="选择要删除的违禁词" ) ban_words_delete_btn = gr.Button("删除", scale=1) @@ -979,13 +1059,23 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: ban_words_add_btn.click( add_item, inputs=[ban_words_new_item_input, ban_words_list_state], - outputs=[ban_words_list_state, ban_words_list_display, ban_words_item_to_delete, ban_words_final_result] + outputs=[ + ban_words_list_state, + ban_words_list_display, + ban_words_item_to_delete, + ban_words_final_result, + ], ) ban_words_delete_btn.click( delete_item, inputs=[ban_words_item_to_delete, ban_words_list_state], - outputs=[ban_words_list_state, ban_words_list_display, ban_words_item_to_delete, ban_words_final_result] + outputs=[ + ban_words_list_state, + ban_words_list_display, + ban_words_item_to_delete, + ban_words_final_result, + ], ) with gr.Row(): gr.Markdown("### 检测违禁消息正则表达式列表") @@ -999,7 +1089,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: """ ) with gr.Row(): - ban_msgs_regex_list = config_data['message']['ban_msgs_regex'] + ban_msgs_regex_list = config_data["message"]["ban_msgs_regex"] with gr.Blocks(): ban_msgs_regex_list_state = gr.State(value=ban_msgs_regex_list.copy()) with gr.Row(): @@ -1007,7 +1097,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: value="\n".join(ban_msgs_regex_list), label="违禁消息正则列表", interactive=False, - lines=5 + lines=5, ) with gr.Row(): with gr.Column(scale=3): @@ -1017,8 +1107,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): ban_msgs_regex_item_to_delete = gr.Dropdown( - choices=ban_msgs_regex_list, - label="选择要删除的违禁消息正则" + choices=ban_msgs_regex_list, label="选择要删除的违禁消息正则" ) ban_msgs_regex_delete_btn = gr.Button("删除", scale=1) @@ -1026,35 +1115,47 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: ban_msgs_regex_add_btn.click( add_item, inputs=[ban_msgs_regex_new_item_input, ban_msgs_regex_list_state], - outputs=[ban_msgs_regex_list_state, ban_msgs_regex_list_display, ban_msgs_regex_item_to_delete, ban_msgs_regex_final_result] + outputs=[ + ban_msgs_regex_list_state, + ban_msgs_regex_list_display, + ban_msgs_regex_item_to_delete, + ban_msgs_regex_final_result, + ], ) ban_msgs_regex_delete_btn.click( delete_item, inputs=[ban_msgs_regex_item_to_delete, ban_msgs_regex_list_state], - outputs=[ban_msgs_regex_list_state, ban_msgs_regex_list_display, ban_msgs_regex_item_to_delete, ban_msgs_regex_final_result] + outputs=[ + ban_msgs_regex_list_state, + ban_msgs_regex_list_display, + ban_msgs_regex_item_to_delete, + ban_msgs_regex_final_result, + ], ) with gr.Row(): - check_interval = gr.Number(value=config_data['emoji']['check_interval'], label="检查表情包的时间间隔") + check_interval = gr.Number( + value=config_data["emoji"]["check_interval"], label="检查表情包的时间间隔" + ) with gr.Row(): - register_interval = gr.Number(value=config_data['emoji']['register_interval'], label="注册表情包的时间间隔") + register_interval = gr.Number( + value=config_data["emoji"]["register_interval"], label="注册表情包的时间间隔" + ) with gr.Row(): - auto_save = gr.Checkbox(value=config_data['emoji']['auto_save'], label="自动保存表情包") + auto_save = gr.Checkbox(value=config_data["emoji"]["auto_save"], label="自动保存表情包") with gr.Row(): - enable_check = gr.Checkbox(value=config_data['emoji']['enable_check'], label="启用表情包检查") + enable_check = gr.Checkbox(value=config_data["emoji"]["enable_check"], label="启用表情包检查") with gr.Row(): - check_prompt = gr.Textbox(value=config_data['emoji']['check_prompt'], label="表情包过滤要求") + check_prompt = gr.Textbox(value=config_data["emoji"]["check_prompt"], label="表情包过滤要求") with gr.Row(): emoji_save_btn = gr.Button( "保存消息&表情包设置", variant="primary", elem_id="save_personality_btn", - elem_classes="save_personality_btn" + elem_classes="save_personality_btn", ) with gr.Row(): - emoji_save_message = gr.Textbox( - label="消息&表情包设置保存结果" - ) + emoji_save_message = gr.Textbox(label="消息&表情包设置保存结果") emoji_save_btn.click( save_message_and_emoji_config, inputs=[ @@ -1071,41 +1172,81 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: register_interval, auto_save, enable_check, - check_prompt + check_prompt, ], - outputs=[emoji_save_message] + outputs=[emoji_save_message], ) with gr.TabItem("4-回复&模型设置"): with gr.Row(): with gr.Column(scale=3): with gr.Row(): - gr.Markdown( - """### 回复设置""" + gr.Markdown("""### 回复设置""") + with gr.Row(): + model_r1_probability = gr.Slider( + minimum=0, + maximum=1, + step=0.01, + value=config_data["response"]["model_r1_probability"], + label="麦麦回答时选择主要回复模型1 模型的概率", ) with gr.Row(): - model_r1_probability = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['response']['model_r1_probability'], label="麦麦回答时选择主要回复模型1 模型的概率") + model_r2_probability = gr.Slider( + minimum=0, + maximum=1, + step=0.01, + value=config_data["response"]["model_v3_probability"], + label="麦麦回答时选择主要回复模型2 模型的概率", + ) with gr.Row(): - model_r2_probability = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['response']['model_v3_probability'], label="麦麦回答时选择主要回复模型2 模型的概率") - with gr.Row(): - model_r3_probability = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['response']['model_r1_distill_probability'], label="麦麦回答时选择主要回复模型3 模型的概率") + model_r3_probability = gr.Slider( + minimum=0, + maximum=1, + step=0.01, + value=config_data["response"]["model_r1_distill_probability"], + label="麦麦回答时选择主要回复模型3 模型的概率", + ) # 用于显示警告消息 with gr.Row(): model_warning_greater_text = gr.Markdown() model_warning_less_text = gr.Markdown() # 绑定滑块的值变化事件，确保总和必须等于 1.0 - model_r1_probability.change(adjust_model_greater_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_greater_text]) - model_r2_probability.change(adjust_model_greater_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_greater_text]) - model_r3_probability.change(adjust_model_greater_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_greater_text]) - model_r1_probability.change(adjust_model_less_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_less_text]) - model_r2_probability.change(adjust_model_less_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_less_text]) - model_r3_probability.change(adjust_model_less_probabilities, inputs=[model_r1_probability, model_r2_probability, model_r3_probability], outputs=[model_warning_less_text]) - with gr.Row(): - max_response_length = gr.Number(value=config_data['response']['max_response_length'], label="麦麦回答的最大token数") - with gr.Row(): - gr.Markdown( - """### 模型设置""" + model_r1_probability.change( + adjust_model_greater_probabilities, + inputs=[model_r1_probability, model_r2_probability, model_r3_probability], + outputs=[model_warning_greater_text], ) + model_r2_probability.change( + adjust_model_greater_probabilities, + inputs=[model_r1_probability, model_r2_probability, model_r3_probability], + outputs=[model_warning_greater_text], + ) + model_r3_probability.change( + adjust_model_greater_probabilities, + inputs=[model_r1_probability, model_r2_probability, model_r3_probability], + outputs=[model_warning_greater_text], + ) + model_r1_probability.change( + adjust_model_less_probabilities, + inputs=[model_r1_probability, model_r2_probability, model_r3_probability], + outputs=[model_warning_less_text], + ) + model_r2_probability.change( + adjust_model_less_probabilities, + inputs=[model_r1_probability, model_r2_probability, model_r3_probability], + outputs=[model_warning_less_text], + ) + model_r3_probability.change( + adjust_model_less_probabilities, + inputs=[model_r1_probability, model_r2_probability, model_r3_probability], + outputs=[model_warning_less_text], + ) + with gr.Row(): + max_response_length = gr.Number( + value=config_data["response"]["max_response_length"], label="麦麦回答的最大token数" + ) + with gr.Row(): + gr.Markdown("""### 模型设置""") with gr.Row(): gr.Markdown( """### 注意\n @@ -1117,81 +1258,160 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Tabs(): with gr.TabItem("1-主要回复模型"): with gr.Row(): - model1_name = gr.Textbox(value=config_data['model']['llm_reasoning']['name'], label="模型1的名称") + model1_name = gr.Textbox( + value=config_data["model"]["llm_reasoning"]["name"], label="模型1的名称" + ) with gr.Row(): - model1_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_reasoning']['provider'], label="模型1（主要回复模型）提供商") + model1_provider = gr.Dropdown( + choices=MODEL_PROVIDER_LIST, + value=config_data["model"]["llm_reasoning"]["provider"], + label="模型1（主要回复模型）提供商", + ) with gr.Row(): - model1_pri_in = gr.Number(value=config_data['model']['llm_reasoning']['pri_in'], label="模型1（主要回复模型）的输入价格（非必填，可以记录消耗）") + model1_pri_in = gr.Number( + value=config_data["model"]["llm_reasoning"]["pri_in"], + label="模型1（主要回复模型）的输入价格（非必填，可以记录消耗）", + ) with gr.Row(): - model1_pri_out = gr.Number(value=config_data['model']['llm_reasoning']['pri_out'], label="模型1（主要回复模型）的输出价格（非必填，可以记录消耗）") + model1_pri_out = gr.Number( + value=config_data["model"]["llm_reasoning"]["pri_out"], + label="模型1（主要回复模型）的输出价格（非必填，可以记录消耗）", + ) with gr.TabItem("2-次要回复模型"): with gr.Row(): - model2_name = gr.Textbox(value=config_data['model']['llm_normal']['name'], label="模型2的名称") + model2_name = gr.Textbox( + value=config_data["model"]["llm_normal"]["name"], label="模型2的名称" + ) with gr.Row(): - model2_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_normal']['provider'], label="模型2提供商") + model2_provider = gr.Dropdown( + choices=MODEL_PROVIDER_LIST, + value=config_data["model"]["llm_normal"]["provider"], + label="模型2提供商", + ) with gr.TabItem("3-次要模型"): with gr.Row(): - model3_name = gr.Textbox(value=config_data['model']['llm_reasoning_minor']['name'], label="模型3的名称") + model3_name = gr.Textbox( + value=config_data["model"]["llm_reasoning_minor"]["name"], label="模型3的名称" + ) with gr.Row(): - model3_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_reasoning_minor']['provider'], label="模型3提供商") + model3_provider = gr.Dropdown( + choices=MODEL_PROVIDER_LIST, + value=config_data["model"]["llm_reasoning_minor"]["provider"], + label="模型3提供商", + ) with gr.TabItem("4-情感&主题模型"): with gr.Row(): - gr.Markdown( - """### 情感模型设置""" + gr.Markdown("""### 情感模型设置""") + with gr.Row(): + emotion_model_name = gr.Textbox( + value=config_data["model"]["llm_emotion_judge"]["name"], label="情感模型名称" ) with gr.Row(): - emotion_model_name = gr.Textbox(value=config_data['model']['llm_emotion_judge']['name'], label="情感模型名称") - with gr.Row(): - emotion_model_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_emotion_judge']['provider'], label="情感模型提供商") - with gr.Row(): - gr.Markdown( - """### 主题模型设置""" + emotion_model_provider = gr.Dropdown( + choices=MODEL_PROVIDER_LIST, + value=config_data["model"]["llm_emotion_judge"]["provider"], + label="情感模型提供商", ) with gr.Row(): - topic_judge_model_name = gr.Textbox(value=config_data['model']['llm_topic_judge']['name'], label="主题判断模型名称") + gr.Markdown("""### 主题模型设置""") with gr.Row(): - topic_judge_model_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_topic_judge']['provider'], label="主题判断模型提供商") + topic_judge_model_name = gr.Textbox( + value=config_data["model"]["llm_topic_judge"]["name"], label="主题判断模型名称" + ) with gr.Row(): - summary_by_topic_model_name = gr.Textbox(value=config_data['model']['llm_summary_by_topic']['name'], label="主题总结模型名称") + topic_judge_model_provider = gr.Dropdown( + choices=MODEL_PROVIDER_LIST, + value=config_data["model"]["llm_topic_judge"]["provider"], + label="主题判断模型提供商", + ) with gr.Row(): - summary_by_topic_model_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['llm_summary_by_topic']['provider'], label="主题总结模型提供商") + summary_by_topic_model_name = gr.Textbox( + value=config_data["model"]["llm_summary_by_topic"]["name"], label="主题总结模型名称" + ) + with gr.Row(): + summary_by_topic_model_provider = gr.Dropdown( + choices=MODEL_PROVIDER_LIST, + value=config_data["model"]["llm_summary_by_topic"]["provider"], + label="主题总结模型提供商", + ) with gr.TabItem("5-识图模型"): with gr.Row(): - gr.Markdown( - """### 识图模型设置""" + gr.Markdown("""### 识图模型设置""") + with gr.Row(): + vlm_model_name = gr.Textbox( + value=config_data["model"]["vlm"]["name"], label="识图模型名称" ) with gr.Row(): - vlm_model_name = gr.Textbox(value=config_data['model']['vlm']['name'], label="识图模型名称") - with gr.Row(): - vlm_model_provider = gr.Dropdown(choices=MODEL_PROVIDER_LIST, value=config_data['model']['vlm']['provider'], label="识图模型提供商") + vlm_model_provider = gr.Dropdown( + choices=MODEL_PROVIDER_LIST, + value=config_data["model"]["vlm"]["provider"], + label="识图模型提供商", + ) with gr.Row(): - save_model_btn = gr.Button("保存回复&模型设置",variant="primary", elem_id="save_model_btn") + save_model_btn = gr.Button("保存回复&模型设置", variant="primary", elem_id="save_model_btn") with gr.Row(): save_btn_message = gr.Textbox() save_model_btn.click( save_response_model_config, - inputs=[model_r1_probability,model_r2_probability,model_r3_probability,max_response_length,model1_name, model1_provider, model1_pri_in, model1_pri_out, model2_name, model2_provider, model3_name, model3_provider, emotion_model_name, emotion_model_provider, topic_judge_model_name, topic_judge_model_provider, summary_by_topic_model_name,summary_by_topic_model_provider,vlm_model_name, vlm_model_provider], - outputs=[save_btn_message] + inputs=[ + model_r1_probability, + model_r2_probability, + model_r3_probability, + max_response_length, + model1_name, + model1_provider, + model1_pri_in, + model1_pri_out, + model2_name, + model2_provider, + model3_name, + model3_provider, + emotion_model_name, + emotion_model_provider, + topic_judge_model_name, + topic_judge_model_provider, + summary_by_topic_model_name, + summary_by_topic_model_provider, + vlm_model_name, + vlm_model_provider, + ], + outputs=[save_btn_message], ) with gr.TabItem("5-记忆&心情设置"): with gr.Row(): with gr.Column(scale=3): with gr.Row(): - gr.Markdown( - """### 记忆设置""" + gr.Markdown("""### 记忆设置""") + with gr.Row(): + build_memory_interval = gr.Number( + value=config_data["memory"]["build_memory_interval"], + label="记忆构建间隔 单位秒,间隔越低，麦麦学习越多，但是冗余信息也会增多", ) with gr.Row(): - build_memory_interval = gr.Number(value=config_data['memory']['build_memory_interval'], label="记忆构建间隔 单位秒,间隔越低，麦麦学习越多，但是冗余信息也会增多") + memory_compress_rate = gr.Number( + value=config_data["memory"]["memory_compress_rate"], + label="记忆压缩率 控制记忆精简程度 建议保持默认,调高可以获得更多信息，但是冗余信息也会增多", + ) with gr.Row(): - memory_compress_rate = gr.Number(value=config_data['memory']['memory_compress_rate'], label="记忆压缩率 控制记忆精简程度 建议保持默认,调高可以获得更多信息，但是冗余信息也会增多") + forget_memory_interval = gr.Number( + value=config_data["memory"]["forget_memory_interval"], + label="记忆遗忘间隔 单位秒 间隔越低，麦麦遗忘越频繁，记忆更精简，但更难学习", + ) with gr.Row(): - forget_memory_interval = gr.Number(value=config_data['memory']['forget_memory_interval'], label="记忆遗忘间隔 单位秒 间隔越低，麦麦遗忘越频繁，记忆更精简，但更难学习") + memory_forget_time = gr.Number( + value=config_data["memory"]["memory_forget_time"], + label="多长时间后的记忆会被遗忘 单位小时 ", + ) with gr.Row(): - memory_forget_time = gr.Number(value=config_data['memory']['memory_forget_time'], label="多长时间后的记忆会被遗忘 单位小时 ") + memory_forget_percentage = gr.Slider( + minimum=0, + maximum=1, + step=0.01, + value=config_data["memory"]["memory_forget_percentage"], + label="记忆遗忘比例 控制记忆遗忘程度 越大遗忘越多 建议保持默认", + ) with gr.Row(): - memory_forget_percentage = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['memory']['memory_forget_percentage'], label="记忆遗忘比例 控制记忆遗忘程度 越大遗忘越多 建议保持默认") - with gr.Row(): - memory_ban_words_list = config_data['memory']['memory_ban_words'] + memory_ban_words_list = config_data["memory"]["memory_ban_words"] with gr.Blocks(): memory_ban_words_list_state = gr.State(value=memory_ban_words_list.copy()) @@ -1200,7 +1420,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: value="\n".join(memory_ban_words_list), label="不希望记忆词列表", interactive=False, - lines=5 + lines=5, ) with gr.Row(): with gr.Column(scale=3): @@ -1210,8 +1430,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): memory_ban_words_item_to_delete = gr.Dropdown( - choices=memory_ban_words_list, - label="选择要删除的不希望记忆词" + choices=memory_ban_words_list, label="选择要删除的不希望记忆词" ) memory_ban_words_delete_btn = gr.Button("删除", scale=1) @@ -1219,43 +1438,69 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: memory_ban_words_add_btn.click( add_item, inputs=[memory_ban_words_new_item_input, memory_ban_words_list_state], - outputs=[memory_ban_words_list_state, memory_ban_words_list_display, memory_ban_words_item_to_delete, memory_ban_words_final_result] + outputs=[ + memory_ban_words_list_state, + memory_ban_words_list_display, + memory_ban_words_item_to_delete, + memory_ban_words_final_result, + ], ) memory_ban_words_delete_btn.click( delete_item, inputs=[memory_ban_words_item_to_delete, memory_ban_words_list_state], - outputs=[memory_ban_words_list_state, memory_ban_words_list_display, memory_ban_words_item_to_delete, memory_ban_words_final_result] + outputs=[ + memory_ban_words_list_state, + memory_ban_words_list_display, + memory_ban_words_item_to_delete, + memory_ban_words_final_result, + ], ) with gr.Row(): - mood_update_interval = gr.Number(value=config_data['mood']['mood_update_interval'], label="心情更新间隔 单位秒") + mood_update_interval = gr.Number( + value=config_data["mood"]["mood_update_interval"], label="心情更新间隔 单位秒" + ) with gr.Row(): - mood_decay_rate = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['mood']['mood_decay_rate'], label="心情衰减率") + mood_decay_rate = gr.Slider( + minimum=0, + maximum=1, + step=0.01, + value=config_data["mood"]["mood_decay_rate"], + label="心情衰减率", + ) with gr.Row(): - mood_intensity_factor = gr.Number(value=config_data['mood']['mood_intensity_factor'], label="心情强度因子") + mood_intensity_factor = gr.Number( + value=config_data["mood"]["mood_intensity_factor"], label="心情强度因子" + ) with gr.Row(): - save_memory_mood_btn = gr.Button("保存记忆&心情设置",variant="primary") + save_memory_mood_btn = gr.Button("保存记忆&心情设置", variant="primary") with gr.Row(): save_memory_mood_message = gr.Textbox() with gr.Row(): save_memory_mood_btn.click( save_memory_mood_config, - inputs=[build_memory_interval, memory_compress_rate, forget_memory_interval, memory_forget_time, memory_forget_percentage, memory_ban_words_list_state, mood_update_interval, mood_decay_rate, mood_intensity_factor], - outputs=[save_memory_mood_message] + inputs=[ + build_memory_interval, + memory_compress_rate, + forget_memory_interval, + memory_forget_time, + memory_forget_percentage, + memory_ban_words_list_state, + mood_update_interval, + mood_decay_rate, + mood_intensity_factor, + ], + outputs=[save_memory_mood_message], ) with gr.TabItem("6-群组设置"): with gr.Row(): with gr.Column(scale=3): with gr.Row(): - gr.Markdown( - """## 群组设置""" - ) + gr.Markdown("""## 群组设置""") with gr.Row(): - gr.Markdown( - """### 可以回复消息的群""" - ) + gr.Markdown("""### 可以回复消息的群""") with gr.Row(): - talk_allowed_list = config_data['groups']['talk_allowed'] + talk_allowed_list = config_data["groups"]["talk_allowed"] with gr.Blocks(): talk_allowed_list_state = gr.State(value=talk_allowed_list.copy()) @@ -1264,7 +1509,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: value="\n".join(map(str, talk_allowed_list)), label="可以回复消息的群列表", interactive=False, - lines=5 + lines=5, ) with gr.Row(): with gr.Column(scale=3): @@ -1274,8 +1519,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): talk_allowed_item_to_delete = gr.Dropdown( - choices=talk_allowed_list, - label="选择要删除的群" + choices=talk_allowed_list, label="选择要删除的群" ) talk_allowed_delete_btn = gr.Button("删除", scale=1) @@ -1283,16 +1527,26 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: talk_allowed_add_btn.click( add_int_item, inputs=[talk_allowed_new_item_input, talk_allowed_list_state], - outputs=[talk_allowed_list_state, talk_allowed_list_display, talk_allowed_item_to_delete, talk_allowed_final_result] + outputs=[ + talk_allowed_list_state, + talk_allowed_list_display, + talk_allowed_item_to_delete, + talk_allowed_final_result, + ], ) talk_allowed_delete_btn.click( delete_int_item, inputs=[talk_allowed_item_to_delete, talk_allowed_list_state], - outputs=[talk_allowed_list_state, talk_allowed_list_display, talk_allowed_item_to_delete, talk_allowed_final_result] + outputs=[ + talk_allowed_list_state, + talk_allowed_list_display, + talk_allowed_item_to_delete, + talk_allowed_final_result, + ], ) with gr.Row(): - talk_frequency_down_list = config_data['groups']['talk_frequency_down'] + talk_frequency_down_list = config_data["groups"]["talk_frequency_down"] with gr.Blocks(): talk_frequency_down_list_state = gr.State(value=talk_frequency_down_list.copy()) @@ -1301,7 +1555,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: value="\n".join(map(str, talk_frequency_down_list)), label="降低回复频率的群列表", interactive=False, - lines=5 + lines=5, ) with gr.Row(): with gr.Column(scale=3): @@ -1311,8 +1565,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): talk_frequency_down_item_to_delete = gr.Dropdown( - choices=talk_frequency_down_list, - label="选择要删除的群" + choices=talk_frequency_down_list, label="选择要删除的群" ) talk_frequency_down_delete_btn = gr.Button("删除", scale=1) @@ -1320,16 +1573,26 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: talk_frequency_down_add_btn.click( add_int_item, inputs=[talk_frequency_down_new_item_input, talk_frequency_down_list_state], - outputs=[talk_frequency_down_list_state, talk_frequency_down_list_display, talk_frequency_down_item_to_delete, talk_frequency_down_final_result] + outputs=[ + talk_frequency_down_list_state, + talk_frequency_down_list_display, + talk_frequency_down_item_to_delete, + talk_frequency_down_final_result, + ], ) talk_frequency_down_delete_btn.click( delete_int_item, inputs=[talk_frequency_down_item_to_delete, talk_frequency_down_list_state], - outputs=[talk_frequency_down_list_state, talk_frequency_down_list_display, talk_frequency_down_item_to_delete, talk_frequency_down_final_result] + outputs=[ + talk_frequency_down_list_state, + talk_frequency_down_list_display, + talk_frequency_down_item_to_delete, + talk_frequency_down_final_result, + ], ) with gr.Row(): - ban_user_id_list = config_data['groups']['ban_user_id'] + ban_user_id_list = config_data["groups"]["ban_user_id"] with gr.Blocks(): ban_user_id_list_state = gr.State(value=ban_user_id_list.copy()) @@ -1338,7 +1601,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: value="\n".join(map(str, ban_user_id_list)), label="禁止回复消息的QQ号列表", interactive=False, - lines=5 + lines=5, ) with gr.Row(): with gr.Column(scale=3): @@ -1348,8 +1611,7 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: with gr.Row(): with gr.Column(scale=3): ban_user_id_item_to_delete = gr.Dropdown( - choices=ban_user_id_list, - label="选择要删除的QQ号" + choices=ban_user_id_list, label="选择要删除的QQ号" ) ban_user_id_delete_btn = gr.Button("删除", scale=1) @@ -1357,16 +1619,26 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: ban_user_id_add_btn.click( add_int_item, inputs=[ban_user_id_new_item_input, ban_user_id_list_state], - outputs=[ban_user_id_list_state, ban_user_id_list_display, ban_user_id_item_to_delete, ban_user_id_final_result] + outputs=[ + ban_user_id_list_state, + ban_user_id_list_display, + ban_user_id_item_to_delete, + ban_user_id_final_result, + ], ) ban_user_id_delete_btn.click( delete_int_item, inputs=[ban_user_id_item_to_delete, ban_user_id_list_state], - outputs=[ban_user_id_list_state, ban_user_id_list_display, ban_user_id_item_to_delete, ban_user_id_final_result] + outputs=[ + ban_user_id_list_state, + ban_user_id_list_display, + ban_user_id_item_to_delete, + ban_user_id_final_result, + ], ) with gr.Row(): - save_group_btn = gr.Button("保存群组设置",variant="primary") + save_group_btn = gr.Button("保存群组设置", variant="primary") with gr.Row(): save_group_btn_message = gr.Textbox() with gr.Row(): @@ -1377,25 +1649,33 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: talk_frequency_down_list_state, ban_user_id_list_state, ], - outputs=[save_group_btn_message] + outputs=[save_group_btn_message], ) with gr.TabItem("7-其他设置"): with gr.Row(): with gr.Column(scale=3): with gr.Row(): - gr.Markdown( - """### 其他设置""" + gr.Markdown("""### 其他设置""") + with gr.Row(): + keywords_reaction_enabled = gr.Checkbox( + value=config_data["keywords_reaction"]["enable"], label="是否针对某个关键词作出反应" ) with gr.Row(): - keywords_reaction_enabled = gr.Checkbox(value=config_data['keywords_reaction']['enable'], label="是否针对某个关键词作出反应") + enable_advance_output = gr.Checkbox( + value=config_data["others"]["enable_advance_output"], label="是否开启高级输出" + ) with gr.Row(): - enable_advance_output = gr.Checkbox(value=config_data['others']['enable_advance_output'], label="是否开启高级输出") + enable_kuuki_read = gr.Checkbox( + value=config_data["others"]["enable_kuuki_read"], label="是否启用读空气功能" + ) with gr.Row(): - enable_kuuki_read = gr.Checkbox(value=config_data['others']['enable_kuuki_read'], label="是否启用读空气功能") + enable_debug_output = gr.Checkbox( + value=config_data["others"]["enable_debug_output"], label="是否开启调试输出" + ) with gr.Row(): - enable_debug_output = gr.Checkbox(value=config_data['others']['enable_debug_output'], label="是否开启调试输出") - with gr.Row(): - enable_friend_chat = gr.Checkbox(value=config_data['others']['enable_friend_chat'], label="是否开启好友聊天") + enable_friend_chat = gr.Checkbox( + value=config_data["others"]["enable_friend_chat"], label="是否开启好友聊天" + ) if PARSED_CONFIG_VERSION > HAVE_ONLINE_STATUS_VERSION: with gr.Row(): gr.Markdown( @@ -1404,42 +1684,71 @@ with gr.Blocks(title="MaimBot配置文件编辑") as app: """ ) with gr.Row(): - remote_status = gr.Checkbox(value=config_data['remote']['enable'], label="是否开启麦麦在线全球统计") - else: - remote_status = gr.Checkbox(value=False,visible=False) - + remote_status = gr.Checkbox( + value=config_data["remote"]["enable"], label="是否开启麦麦在线全球统计" + ) with gr.Row(): - gr.Markdown( - """### 中文错别字设置""" + gr.Markdown("""### 中文错别字设置""") + with gr.Row(): + chinese_typo_enabled = gr.Checkbox( + value=config_data["chinese_typo"]["enable"], label="是否开启中文错别字" ) with gr.Row(): - chinese_typo_enabled = gr.Checkbox(value=config_data['chinese_typo']['enable'], label="是否开启中文错别字") + error_rate = gr.Slider( + minimum=0, + maximum=1, + step=0.001, + value=config_data["chinese_typo"]["error_rate"], + label="单字替换概率", + ) with gr.Row(): - error_rate = gr.Slider(minimum=0, maximum=1, step=0.001, value=config_data['chinese_typo']['error_rate'], label="单字替换概率") + min_freq = gr.Number(value=config_data["chinese_typo"]["min_freq"], label="最小字频阈值") with gr.Row(): - min_freq = gr.Number(value=config_data['chinese_typo']['min_freq'], label="最小字频阈值") + tone_error_rate = gr.Slider( + minimum=0, + maximum=1, + step=0.01, + value=config_data["chinese_typo"]["tone_error_rate"], + label="声调错误概率", + ) with gr.Row(): - tone_error_rate = gr.Slider(minimum=0, maximum=1, step=0.01, value=config_data['chinese_typo']['tone_error_rate'], label="声调错误概率") + word_replace_rate = gr.Slider( + minimum=0, + maximum=1, + step=0.001, + value=config_data["chinese_typo"]["word_replace_rate"], + label="整词替换概率", + ) with gr.Row(): - word_replace_rate = gr.Slider(minimum=0, maximum=1, step=0.001, value=config_data['chinese_typo']['word_replace_rate'], label="整词替换概率") - with gr.Row(): - save_other_config_btn = gr.Button("保存其他配置",variant="primary") + save_other_config_btn = gr.Button("保存其他配置", variant="primary") with gr.Row(): save_other_config_message = gr.Textbox() with gr.Row(): if PARSED_CONFIG_VERSION <= HAVE_ONLINE_STATUS_VERSION: - remote_status = gr.Checkbox(value=False,visible=False) + remote_status = gr.Checkbox(value=False, visible=False) save_other_config_btn.click( save_other_config, - inputs=[keywords_reaction_enabled,enable_advance_output, enable_kuuki_read, enable_debug_output, enable_friend_chat, chinese_typo_enabled, error_rate, min_freq, tone_error_rate, word_replace_rate,remote_status], - outputs=[save_other_config_message] + inputs=[ + keywords_reaction_enabled, + enable_advance_output, + enable_kuuki_read, + enable_debug_output, + enable_friend_chat, + chinese_typo_enabled, + error_rate, + min_freq, + tone_error_rate, + word_replace_rate, + remote_status, + ], + outputs=[save_other_config_message], ) - app.queue().launch(#concurrency_count=511, max_size=1022 + app.queue().launch( # concurrency_count=511, max_size=1022 server_name="0.0.0.0", inbrowser=True, share=is_share, server_port=7000, debug=debug, quiet=True, - ) \ No newline at end of file + ) From 03db6d3bb891cc208519f5a7c9bb6d2929356248 Mon Sep 17 00:00:00 2001 From: DrSmoothl <1787882683@qq.com> Date: Wed, 19 Mar 2025 22:49:28 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E8=BF=87Ruff=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webui.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webui.py b/webui.py index a6f62e150..86215b745 100644 --- a/webui.py +++ b/webui.py @@ -3,6 +3,7 @@ import os import toml import signal import sys +import requests try: from src.common.logger import get_module_logger logger = get_module_logger("webui") @@ -15,7 +16,7 @@ except ImportError: # 配置控制台输出格式 logger.remove() # 移除默认的处理器 logger.add(sys.stderr, format="{time:MM-DD HH:mm} | webui | {message}") # 添加控制台输出 - logger.add("logs/webui/{time:YYYY-MM-DD}.log", rotation="00:00", format="{time:MM-DD HH:mm} | webui | {message}") # 添加文件输出 + logger.add("logs/webui/{time:YYYY-MM-DD}.log", rotation="00:00", format="{time:MM-DD HH:mm} | webui | {message}") logger.warning("检测到src.common.logger并未导入，将使用默认loguru作为日志记录器") logger.warning("如果你是用的是低版本(0.5.13)麦麦，请忽略此警告") import shutil @@ -194,7 +195,7 @@ MODEL_PROVIDER_LIST = parse_model_providers(env_config_data) # ============================================== #获取在线麦麦数量 -import requests + def get_online_maimbot(url="http://hyybuth.xyz:10058/api/clients/details", timeout=10): """ From 500e58641910777e703a6516f18b342cfc0bf2bd Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Thu, 20 Mar 2025 12:22:25 +0800 Subject: [PATCH 11/14] =?UTF-8?q?fix=20=E7=A7=BB=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + results/personality_result.json | 46 ------------------------ src/plugins/memory_system/draw_memory.py | 7 ++-- src/plugins/memory_system/memory.py | 2 +- 麦麦开始学习.bat | 29 ++++++++++----- 5 files changed, 27 insertions(+), 58 deletions(-) delete mode 100644 results/personality_result.json diff --git a/.gitignore b/.gitignore index 2658ecc6f..22e2612dd 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ run_dev.bat elua.confirmed # C extensions *.so +/results # Distribution / packaging .Python diff --git a/results/personality_result.json b/results/personality_result.json deleted file mode 100644 index 6424598b9..000000000 --- a/results/personality_result.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "final_scores": { - "开放性": 5.5, - "尽责性": 5.0, - "外向性": 6.0, - "宜人性": 1.5, - "神经质": 6.0 - }, - "scenarios": [ - { - "场景": "在团队项目中，你发现一个同事的工作质量明显低于预期，这可能会影响整个项目的进度。", - "评估维度": [ - "尽责性", - "宜人性" - ] - }, - { - "场景": "你被邀请参加一个完全陌生的社交活动，现场都是不认识的人。", - "评估维度": [ - "外向性", - "神经质" - ] - }, - { - "场景": "你的朋友向你推荐了一个新的艺术展览，但风格与你平时接触的完全不同。", - "评估维度": [ - "开放性", - "外向性" - ] - }, - { - "场景": "在工作中，你遇到了一个技术难题，需要学习全新的技术栈。", - "评估维度": [ - "开放性", - "尽责性" - ] - }, - { - "场景": "你的朋友因为个人原因情绪低落，向你寻求帮助。", - "评估维度": [ - "宜人性", - "神经质" - ] - } - ] -} \ No newline at end of file diff --git a/src/plugins/memory_system/draw_memory.py b/src/plugins/memory_system/draw_memory.py index 42bc28290..584985bbd 100644 --- a/src/plugins/memory_system/draw_memory.py +++ b/src/plugins/memory_system/draw_memory.py @@ -7,14 +7,17 @@ import jieba import matplotlib.pyplot as plt import networkx as nx from dotenv import load_dotenv -from src.common.logger import get_module_logger +from loguru import logger +# from src.common.logger import get_module_logger -logger = get_module_logger("draw_memory") +# logger = get_module_logger("draw_memory") # 添加项目根目录到 Python 路径 root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../..")) sys.path.append(root_path) +print(root_path) + from src.common.database import db # noqa: E402 # 加载.env.dev文件 diff --git a/src/plugins/memory_system/memory.py b/src/plugins/memory_system/memory.py index 4e4fed32f..07a7fb2ee 100644 --- a/src/plugins/memory_system/memory.py +++ b/src/plugins/memory_system/memory.py @@ -594,7 +594,7 @@ class Hippocampus: logger.info("[遗忘] 开始检查数据库... 当前Logger信息:") # logger.info(f"- Logger名称: {logger.name}") - logger.info(f"- Logger等级: {logger.level}") + # logger.info(f"- Logger等级: {logger.level}") # logger.info(f"- Logger处理器: {[handler.__class__.__name__ for handler in logger.handlers]}") # logger2 = setup_logger(LogModule.MEMORY) diff --git a/麦麦开始学习.bat b/麦麦开始学习.bat index f7391150f..f96d7cfdc 100644 --- a/麦麦开始学习.bat +++ b/麦麦开始学习.bat @@ -1,17 +1,27 @@ @echo off +chcp 65001 > nul setlocal enabledelayedexpansion -chcp 65001 cd /d %~dp0 -echo ===================================== -echo 选择Python环境: -echo 1 - venv (推荐) -echo 2 - conda -echo ===================================== -choice /c 12 /n /m "输入数字(1或2): " +title 麦麦学习系统 + +cls +echo ====================================== +echo 警告提示 +echo ====================================== +echo 1.这是一个demo系统,不完善不稳定,仅用于体验/不要塞入过长过大的文本,这会导致信息提取迟缓 +echo ====================================== + +echo. +echo ====================================== +echo 请选择Python环境: +echo 1 - venv (推荐) +echo 2 - conda +echo ====================================== +choice /c 12 /n /m "请输入数字选择(1或2): " if errorlevel 2 ( - echo ===================================== + echo ====================================== set "CONDA_ENV=" set /p CONDA_ENV="请输入要激活的 conda 环境名称: " @@ -35,11 +45,12 @@ if errorlevel 2 ( if exist "venv\Scripts\python.exe" ( venv\Scripts\python src/plugins/zhishi/knowledge_library.py ) else ( - echo ===================================== + echo ====================================== echo 错误: venv环境不存在，请先创建虚拟环境 pause exit /b 1 ) ) + endlocal pause From f8b67747dd3054d7f371cbf39b5be132b7bd7aea Mon Sep 17 00:00:00 2001 From: Oct_Autumn <53611887+Oct-autumn@users.noreply.github.com> Date: Thu, 20 Mar 2025 12:34:52 +0800 Subject: [PATCH 12/14] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 仓库迁移到组织后，更新Readme中相应的链接。 --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9558deb0d..c3939598d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 关于项目分支调整与贡献指南的重要通知 +![image](https://github.com/user-attachments/assets/d275bda7-84cc-474d-a18d-265819c64687)# 关于项目分支调整与贡献指南的重要通知
- 📂 致所有为麦麦提交过贡献，以及想要为麦麦提交贡献的朋友们！ @@ -251,10 +251,12 @@ SengokuCola~~纯编程外行，面向cursor编程，很多代码写得不好多 感谢各位大佬！ - - + + +**也感谢每一位给麦麦发展提出宝贵意见与建议的用户，感谢陪伴麦麦走到现在的你们** + ## Stargazers over time -[![Stargazers over time](https://starchart.cc/SengokuCola/MaiMBot.svg?variant=adaptive)](https://starchart.cc/SengokuCola/MaiMBot) +[![Stargazers over time](https://starchart.cc/MaiM-with-u/MaiBot.svg?variant=adaptive)](https://starchart.cc/MaiM-with-u/MaiBot) From 493525faa629a24850bff1886a556e3d745bf948 Mon Sep 17 00:00:00 2001 From: Oct_Autumn <53611887+Oct-autumn@users.noreply.github.com> Date: Thu, 20 Mar 2025 12:35:34 +0800 Subject: [PATCH 13/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c3939598d..8dea5bc15 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![image](https://github.com/user-attachments/assets/d275bda7-84cc-474d-a18d-265819c64687)# 关于项目分支调整与贡献指南的重要通知 +# 关于项目分支调整与贡献指南的重要通知
- 📂 致所有为麦麦提交过贡献，以及想要为麦麦提交贡献的朋友们！ From f688362a0f2f4a136c90d977650aad2e15dcd7e6 Mon Sep 17 00:00:00 2001 From: SengokuCola <1026294844@qq.com> Date: Thu, 20 Mar 2025 21:19:43 +0800 Subject: [PATCH 14/14] =?UTF-8?q?secret=20=E6=96=B0=E5=A2=9E=E4=BA=86?= =?UTF-8?q?=E4=BA=BA=E6=A0=BC=E6=B5=8B=E8=AF=84=E4=B8=A4=E7=A7=8D=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- results/personality_result.json | 40 ++++---- src/plugins/personality/big5_test.py | 111 +++++++++++++++++++++++ src/plugins/personality/offline_llm.py | 2 +- src/plugins/personality/questionnaire.py | 110 ++++++++++++++++++++++ src/plugins/personality/renqingziji.py | 75 +++++++++------ src/plugins/personality/scene.py | 75 +++++++++++++++ 6 files changed, 362 insertions(+), 51 deletions(-) create mode 100644 src/plugins/personality/big5_test.py create mode 100644 src/plugins/personality/questionnaire.py create mode 100644 src/plugins/personality/scene.py diff --git a/results/personality_result.json b/results/personality_result.json index 6424598b9..b6503a2e2 100644 --- a/results/personality_result.json +++ b/results/personality_result.json @@ -1,45 +1,45 @@ { "final_scores": { - "开放性": 5.5, - "尽责性": 5.0, - "外向性": 6.0, - "宜人性": 1.5, - "神经质": 6.0 + "开放性": 4.5, + "严谨性": 4.5, + "外向性": 3.5, + "宜人性": 5.0, + "神经质": 5.0 }, "scenarios": [ { - "场景": "在团队项目中，你发现一个同事的工作质量明显低于预期，这可能会影响整个项目的进度。", + "场景": "你刚刚搬到一个新的城市工作。今天是你入职的第一天，在公司的电梯里，一位同事微笑着和你打招呼：\n \n同事：「嗨！你是新来的同事吧？我是市场部的小林。」\n\n同事看起来很友善，还主动介绍说：「待会午饭时间，我们部门有几个人准备一起去楼下新开的餐厅，你要一起来吗？可以认识一下其他同事。」", "评估维度": [ - "尽责性", + "外向性", "宜人性" ] }, { - "场景": "你被邀请参加一个完全陌生的社交活动，现场都是不认识的人。", + "场景": "你正在准备一个重要的项目演示，这关系到你的晋升机会。就在演示前30分钟，你收到了主管发来的消息：\n\n主管：「临时有个变动，CEO也会来听你的演示。他对这个项目特别感兴趣。」\n\n正当你准备回复时，主管又发来一条：「对了，能不能把演示时间压缩到15分钟？CEO下午还有其他安排。你之前准备的是30分钟的版本对吧？」", "评估维度": [ - "外向性", - "神经质" + "神经质", + "开放性" ] }, { - "场景": "你的朋友向你推荐了一个新的艺术展览，但风格与你平时接触的完全不同。", + "场景": "你是团队的项目负责人，刚刚接手了一个为期两个月的重要项目。在第一次团队会议上：\n\n小王：「老大，我觉得两个月时间很充裕，我们先做着看吧，遇到问题再解决。」\n\n小张：「要不要先列个时间表？不过感觉太详细的计划也没必要，点到为止就行。」\n\n小李：「客户那边说如果能提前完成有奖励，我觉得我们可以先做快一点的部分。」", + "评估维度": [ + "严谨性", + "宜人性" + ] + }, + { + "场景": "周末下午，你的好友小美兴致勃勃地给你打电话：\n\n小美：「我刚发现一个特别有意思的沉浸式艺术展！不是传统那种挂画的展览，而是把整个空间都变成了艺术品。观众要穿特制的服装，还要带上VR眼镜，好像还有AI实时互动！」\n\n小美继续说：「虽然票价不便宜，但听说体验很独特。网上评价两极分化，有人说是前所未有的艺术革新，也有人说是哗众取宠。要不要周末一起去体验一下？」", "评估维度": [ "开放性", "外向性" ] }, { - "场景": "在工作中，你遇到了一个技术难题，需要学习全新的技术栈。", - "评估维度": [ - "开放性", - "尽责性" - ] - }, - { - "场景": "你的朋友因为个人原因情绪低落，向你寻求帮助。", + "场景": "在回家的公交车上，你遇到这样一幕：\n\n一位老奶奶颤颤巍巍地上了车，车上座位已经坐满了。她站在你旁边，看起来很疲惫。这时你听到前排两个年轻人的对话：\n\n年轻人A：「那个老太太好像站不稳，看起来挺累的。」\n\n年轻人B：「现在的老年人真是...我看她包里还有菜，肯定是去菜市场买完菜回来的，这么多人都不知道叫子女开车接送。」\n\n就在这时，老奶奶一个趔趄，差点摔倒。她扶住了扶手，但包里的东西洒了一些出来。", "评估维度": [ "宜人性", - "神经质" + "严谨性" ] } ] diff --git a/src/plugins/personality/big5_test.py b/src/plugins/personality/big5_test.py new file mode 100644 index 000000000..43b3aee0e --- /dev/null +++ b/src/plugins/personality/big5_test.py @@ -0,0 +1,111 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- + +# from .questionnaire import PERSONALITY_QUESTIONS, FACTOR_DESCRIPTIONS + +import os +import sys +from pathlib import Path + +current_dir = Path(__file__).resolve().parent +project_root = current_dir.parent.parent.parent +env_path = project_root / ".env.prod" + +root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../..")) +sys.path.append(root_path) + +from src.plugins.personality.scene import get_scene_by_factor,get_all_scenes,PERSONALITY_SCENES +from src.plugins.personality.questionnaire import PERSONALITY_QUESTIONS,FACTOR_DESCRIPTIONS +from src.plugins.personality.offline_llm import LLMModel + + + +class BigFiveTest: + def __init__(self): + self.questions = PERSONALITY_QUESTIONS + self.factors = FACTOR_DESCRIPTIONS + + def run_test(self): + """运行测试并收集答案""" + print("\n欢迎参加中国大五人格测试！") + print("\n本测试采用六级评分，请根据每个描述与您的符合程度进行打分：") + print("1 = 完全不符合") + print("2 = 比较不符合") + print("3 = 有点不符合") + print("4 = 有点符合") + print("5 = 比较符合") + print("6 = 完全符合") + print("\n请认真阅读每个描述，选择最符合您实际情况的选项。\n") + + answers = {} + for question in self.questions: + while True: + try: + print(f"\n{question['id']}. {question['content']}") + score = int(input("您的评分（1-6）: ")) + if 1 <= score <= 6: + answers[question['id']] = score + break + else: + print("请输入1-6之间的数字！") + except ValueError: + print("请输入有效的数字！") + + return self.calculate_scores(answers) + + def calculate_scores(self, answers): + """计算各维度得分""" + results = {} + factor_questions = { + "外向性": [], + "神经质": [], + "严谨性": [], + "开放性": [], + "宜人性": [] + } + + # 将题目按因子分类 + for q in self.questions: + factor_questions[q['factor']].append(q) + + # 计算每个维度的得分 + for factor, questions in factor_questions.items(): + total_score = 0 + for q in questions: + score = answers[q['id']] + # 处理反向计分题目 + if q['reverse_scoring']: + score = 7 - score # 6分量表反向计分为7减原始分 + total_score += score + + # 计算平均分 + avg_score = round(total_score / len(questions), 2) + results[factor] = { + "得分": avg_score, + "题目数": len(questions), + "总分": total_score + } + + return results + + def get_factor_description(self, factor): + """获取因子的详细描述""" + return self.factors[factor] + +def main(): + test = BigFiveTest() + results = test.run_test() + + print("\n测试结果：") + print("=" * 50) + for factor, data in results.items(): + print(f"\n{factor}:") + print(f"平均分: {data['得分']} (总分: {data['总分']}, 题目数: {data['题目数']})") + print("-" * 30) + description = test.get_factor_description(factor) + print("维度说明:", description['description'][:100] + "...") + print("\n特征词:", ", ".join(description['trait_words'])) + print("=" * 50) + +if __name__ == "__main__": + main() diff --git a/src/plugins/personality/offline_llm.py b/src/plugins/personality/offline_llm.py index e4dc23f93..db51ca00f 100644 --- a/src/plugins/personality/offline_llm.py +++ b/src/plugins/personality/offline_llm.py @@ -11,7 +11,7 @@ logger = get_module_logger("offline_llm") class LLMModel: - def __init__(self, model_name="deepseek-ai/DeepSeek-V3", **kwargs): + def __init__(self, model_name="Pro/deepseek-ai/DeepSeek-V3", **kwargs): self.model_name = model_name self.params = kwargs self.api_key = os.getenv("SILICONFLOW_KEY") diff --git a/src/plugins/personality/questionnaire.py b/src/plugins/personality/questionnaire.py new file mode 100644 index 000000000..4afff1185 --- /dev/null +++ b/src/plugins/personality/questionnaire.py @@ -0,0 +1,110 @@ +# 人格测试问卷题目 王孟成, 戴晓阳, & 姚树桥. (2011). 中国大五人格问卷的初步编制Ⅲ:简式版的制定及信效度检验. 中国临床心理学杂志, 19(04), Article 04. +# 王孟成, 戴晓阳, & 姚树桥. (2010). 中国大五人格问卷的初步编制Ⅰ:理论框架与信度分析. 中国临床心理学杂志, 18(05), Article 05. + +PERSONALITY_QUESTIONS = [ + # 神经质维度 (F1) + {"id": 1, "content": "我常担心有什么不好的事情要发生", "factor": "神经质", "reverse_scoring": False}, + {"id": 2, "content": "我常感到害怕", "factor": "神经质", "reverse_scoring": False}, + {"id": 3, "content": "有时我觉得自己一无是处", "factor": "神经质", "reverse_scoring": False}, + {"id": 4, "content": "我很少感到忧郁或沮丧", "factor": "神经质", "reverse_scoring": True}, + {"id": 5, "content": "别人一句漫不经心的话，我常会联系在自己身上", "factor": "神经质", "reverse_scoring": False}, + {"id": 6, "content": "在面对压力时，我有种快要崩溃的感觉", "factor": "神经质", "reverse_scoring": False}, + {"id": 7, "content": "我常担忧一些无关紧要的事情", "factor": "神经质", "reverse_scoring": False}, + {"id": 8, "content": "我常常感到内心不踏实", "factor": "神经质", "reverse_scoring": False}, + + # 严谨性维度 (F2) + {"id": 9, "content": "在工作上，我常只求能应付过去便可", "factor": "严谨性", "reverse_scoring": True}, + {"id": 10, "content": "一旦确定了目标，我会坚持努力地实现它", "factor": "严谨性", "reverse_scoring": False}, + {"id": 11, "content": "我常常是仔细考虑之后才做出决定", "factor": "严谨性", "reverse_scoring": False}, + {"id": 12, "content": "别人认为我是个慎重的人", "factor": "严谨性", "reverse_scoring": False}, + {"id": 13, "content": "做事讲究逻辑和条理是我的一个特点", "factor": "严谨性", "reverse_scoring": False}, + {"id": 14, "content": "我喜欢一开头就把事情计划好", "factor": "严谨性", "reverse_scoring": False}, + {"id": 15, "content": "我工作或学习很勤奋", "factor": "严谨性", "reverse_scoring": False}, + {"id": 16, "content": "我是个倾尽全力做事的人", "factor": "严谨性", "reverse_scoring": False}, + + # 宜人性维度 (F3) + {"id": 17, "content": "尽管人类社会存在着一些阴暗的东西（如战争、罪恶、欺诈），我仍然相信人性总的来说是善良的", "factor": "宜人性", "reverse_scoring": False}, + {"id": 18, "content": "我觉得大部分人基本上是心怀善意的", "factor": "宜人性", "reverse_scoring": False}, + {"id": 19, "content": "虽然社会上有骗子，但我觉得大部分人还是可信的", "factor": "宜人性", "reverse_scoring": False}, + {"id": 20, "content": "我不太关心别人是否受到不公正的待遇", "factor": "宜人性", "reverse_scoring": True}, + {"id": 21, "content": "我时常觉得别人的痛苦与我无关", "factor": "宜人性", "reverse_scoring": True}, + {"id": 22, "content": "我常为那些遭遇不幸的人感到难过", "factor": "宜人性", "reverse_scoring": False}, + {"id": 23, "content": "我是那种只照顾好自己，不替别人担忧的人", "factor": "宜人性", "reverse_scoring": True}, + {"id": 24, "content": "当别人向我诉说不幸时，我常感到难过", "factor": "宜人性", "reverse_scoring": False}, + + # 开放性维度 (F4) + {"id": 25, "content": "我的想象力相当丰富", "factor": "开放性", "reverse_scoring": False}, + {"id": 26, "content": "我头脑中经常充满生动的画面", "factor": "开放性", "reverse_scoring": False}, + {"id": 27, "content": "我对许多事情有着很强的好奇心", "factor": "开放性", "reverse_scoring": False}, + {"id": 28, "content": "我喜欢冒险", "factor": "开放性", "reverse_scoring": False}, + {"id": 29, "content": "我是个勇于冒险，突破常规的人", "factor": "开放性", "reverse_scoring": False}, + {"id": 30, "content": "我身上具有别人没有的冒险精神", "factor": "开放性", "reverse_scoring": False}, + {"id": 31, "content": "我渴望学习一些新东西，即使它们与我的日常生活无关", "factor": "开放性", "reverse_scoring": False}, + {"id": 32, "content": "我很愿意也很容易接受那些新事物、新观点、新想法", "factor": "开放性", "reverse_scoring": False}, + + # 外向性维度 (F5) + {"id": 33, "content": "我喜欢参加社交与娱乐聚会", "factor": "外向性", "reverse_scoring": False}, + {"id": 34, "content": "我对人多的聚会感到乏味", "factor": "外向性", "reverse_scoring": True}, + {"id": 35, "content": "我尽量避免参加人多的聚会和嘈杂的环境", "factor": "外向性", "reverse_scoring": True}, + {"id": 36, "content": "在热闹的聚会上，我常常表现主动并尽情玩耍", "factor": "外向性", "reverse_scoring": False}, + {"id": 37, "content": "有我在的场合一般不会冷场", "factor": "外向性", "reverse_scoring": False}, + {"id": 38, "content": "我希望成为领导者而不是被领导者", "factor": "外向性", "reverse_scoring": False}, + {"id": 39, "content": "在一个团体中，我希望处于领导地位", "factor": "外向性", "reverse_scoring": False}, + {"id": 40, "content": "别人多认为我是一个热情和友好的人", "factor": "外向性", "reverse_scoring": False} +] + +# 因子维度说明 +FACTOR_DESCRIPTIONS = { + "外向性": { + "description": "反映个体神经系统的强弱和动力特征。外向性主要表现为个体在人际交往和社交活动中的倾向性，包括对社交活动的兴趣、对人群的态度、社交互动中的主动程度以及在群体中的影响力。高分者倾向于积极参与社交活动，乐于与人交往，善于表达自我，并往往在群体中发挥领导作用；低分者则倾向于独处，不喜欢热闹的社交场合，表现出内向、安静的特征。", + "trait_words": ["热情", "活力", "社交", "主动"], + "subfactors": { + "合群性": "个体愿意与他人聚在一起，即接近人群的倾向；高分表现乐群、好交际，低分表现封闭、独处", + "热情": "个体对待别人时所表现出的态度；高分表现热情好客，低分表现冷淡", + "支配性": "个体喜欢指使、操纵他人，倾向于领导别人的特点；高分表现好强、发号施令，低分表现顺从、低调", + "活跃": "个体精力充沛，活跃、主动性等特点；高分表现活跃，低分表现安静" + } + }, + "神经质": { + "description": "反映个体情绪的状态和体验内心苦恼的倾向性。这个维度主要关注个体在面对压力、挫折和日常生活挑战时的情绪稳定性和适应能力。它包含了对焦虑、抑郁、愤怒等负面情绪的敏感程度，以及个体对这些情绪的调节和控制能力。高分者容易体验负面情绪，对压力较为敏感，情绪波动较大；低分者则表现出较强的情绪稳定性，能够较好地应对压力和挫折。", + "trait_words": ["稳定", "沉着", "从容", "坚韧"], + "subfactors": { + "焦虑": "个体体验焦虑感的个体差异；高分表现坐立不安，低分表现平静", + "抑郁": "个体体验抑郁情感的个体差异；高分表现郁郁寡欢，低分表现平静", + "敏感多疑": "个体常常关注自己的内心活动，行为和过于意识人对自己的看法、评价；高分表现敏感多疑，低分表现淡定、自信", + "脆弱性": "个体在危机或困难面前无力、脆弱的特点；高分表现无能、易受伤、逃避，低分表现坚强", + "愤怒-敌意": "个体准备体验愤怒，及相关情绪的状态；高分表现暴躁易怒，低分表现平静" + } + }, + "严谨性": { + "description": "反映个体在目标导向行为上的组织、坚持和动机特征。这个维度体现了个体在工作、学习等目标性活动中的自我约束和行为管理能力。它涉及到个体的责任感、自律性、计划性、条理性以及完成任务的态度。高分者往往表现出强烈的责任心、良好的组织能力、谨慎的决策风格和持续的努力精神；低分者则可能表现出随意性强、缺乏规划、做事马虎或易放弃的特点。", + "trait_words": ["负责", "自律", "条理", "勤奋"], + "subfactors": { + "责任心": "个体对待任务和他人认真负责，以及对自己承诺的信守；高分表现有责任心、负责任，低分表现推卸责任、逃避处罚", + "自我控制": "个体约束自己的能力，及自始至终的坚持性；高分表现自制、有毅力，低分表现冲动、无毅力", + "审慎性": "个体在采取具体行动前的心理状态；高分表现谨慎、小心，低分表现鲁莽、草率", + "条理性": "个体处理事务和工作的秩序，条理和逻辑性；高分表现整洁、有秩序，低分表现混乱、遗漏", + "勤奋": "个体工作和学习的努力程度及为达到目标而表现出的进取精神；高分表现勤奋、刻苦，低分表现懒散" + } + }, + "开放性": { + "description": "反映个体对新异事物、新观念和新经验的接受程度，以及在思维和行为方面的创新倾向。这个维度体现了个体在认知和体验方面的广度、深度和灵活性。它包括对艺术的欣赏能力、对知识的求知欲、想象力的丰富程度，以及对冒险和创新的态度。高分者往往具有丰富的想象力、广泛的兴趣、开放的思维方式和创新的倾向；低分者则倾向于保守、传统，喜欢熟悉和常规的事物。", + "trait_words": ["创新", "好奇", "艺术", "冒险"], + "subfactors": { + "幻想": "个体富于幻想和想象的水平；高分表现想象力丰富，低分表现想象力匮乏", + "审美": "个体对于艺术和美的敏感与热爱程度；高分表现富有艺术气息，低分表现一般对艺术不敏感", + "好奇心": "个体对未知事物的态度；高分表现兴趣广泛、好奇心浓，低分表现兴趣少、无好奇心", + "冒险精神": "个体愿意尝试有风险活动的个体差异；高分表现好冒险，低分表现保守", + "价值观念": "个体对新事物、新观念、怪异想法的态度；高分表现开放、坦然接受新事物，低分则相反" + } + }, + "宜人性": { + "description": "反映个体在人际关系中的亲和倾向，体现了对他人的关心、同情和合作意愿。这个维度主要关注个体与他人互动时的态度和行为特征，包括对他人的信任程度、同理心水平、助人意愿以及在人际冲突中的处理方式。高分者通常表现出友善、富有同情心、乐于助人的特质，善于与他人建立和谐关系；低分者则可能表现出较少的人际关注，在社交互动中更注重自身利益，较少考虑他人感受。", + "trait_words": ["友善", "同理", "信任", "合作"], + "subfactors": { + "信任": "个体对他人和/或他人言论的相信程度；高分表现信任他人，低分表现怀疑", + "体贴": "个体对别人的兴趣和需要的关注程度；高分表现体贴、温存，低分表现冷漠、不在乎", + "同情": "个体对处于不利地位的人或物的态度；高分表现富有同情心，低分表现冷漠" + } + } +} \ No newline at end of file diff --git a/src/plugins/personality/renqingziji.py b/src/plugins/personality/renqingziji.py index 53d31cbf6..b2938a59f 100644 --- a/src/plugins/personality/renqingziji.py +++ b/src/plugins/personality/renqingziji.py @@ -5,16 +5,19 @@ from pathlib import Path from dotenv import load_dotenv import sys +''' +第一种方案：基于情景评估的人格测定 +''' current_dir = Path(__file__).resolve().parent -# 获取项目根目录（上三层目录） project_root = current_dir.parent.parent.parent -# env.dev文件路径 env_path = project_root / ".env.prod" root_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "../../..")) sys.path.append(root_path) -from src.plugins.personality.offline_llm import LLMModel # noqa E402 +from src.plugins.personality.scene import get_scene_by_factor,get_all_scenes,PERSONALITY_SCENES +from src.plugins.personality.questionnaire import PERSONALITY_QUESTIONS,FACTOR_DESCRIPTIONS +from src.plugins.personality.offline_llm import LLMModel # 加载环境变量 if env_path.exists(): @@ -25,29 +28,32 @@ else: print("将使用默认配置") -class PersonalityEvaluator: +class PersonalityEvaluator_direct: def __init__(self): - self.personality_traits = {"开放性": 0, "尽责性": 0, "外向性": 0, "宜人性": 0, "神经质": 0} - self.scenarios = [ - { - "场景": "在团队项目中，你发现一个同事的工作质量明显低于预期，这可能会影响整个项目的进度。", - "评估维度": ["尽责性", "宜人性"], - }, - {"场景": "你被邀请参加一个完全陌生的社交活动，现场都是不认识的人。", "评估维度": ["外向性", "神经质"]}, - { - "场景": "你的朋友向你推荐了一个新的艺术展览，但风格与你平时接触的完全不同。", - "评估维度": ["开放性", "外向性"], - }, - {"场景": "在工作中，你遇到了一个技术难题，需要学习全新的技术栈。", "评估维度": ["开放性", "尽责性"]}, - {"场景": "你的朋友因为个人原因情绪低落，向你寻求帮助。", "评估维度": ["宜人性", "神经质"]}, - ] + self.personality_traits = {"开放性": 0, "严谨性": 0, "外向性": 0, "宜人性": 0, "神经质": 0} + self.scenarios = [] + + # 为每个人格特质获取对应的场景 + for trait in PERSONALITY_SCENES: + scene = get_scene_by_factor(trait) + # 为每个场景添加评估维度 + # 主维度是当前特质，次维度随机选择一个其他特质 + other_traits = [t for t in PERSONALITY_SCENES if t != trait] + import random + secondary_trait = random.choice(other_traits) + + self.scenarios.append({ + "场景": scene["scenario"], + "评估维度": [trait, secondary_trait] + }) + self.llm = LLMModel() def evaluate_response(self, scenario: str, response: str, dimensions: List[str]) -> Dict[str, float]: """ 使用 DeepSeek AI 评估用户对特定场景的反应 """ - prompt = f"""请根据以下场景和用户描述，评估用户在大五人格模型中的相关维度得分（0-10分）。 + prompt = f"""请根据以下场景和用户描述，评估用户在大五人格模型中的相关维度得分（1-6分）。 场景：{scenario} 用户描述：{response} @@ -59,14 +65,22 @@ class PersonalityEvaluator: "维度2": 分数 }} -评估标准： +评分标准： +1 = 非常不符合 +2 = 比较不符合 +3 = 有点不符合 +4 = 有点符合 +5 = 比较符合 +6 = 非常符合 + +评估维度说明： - 开放性：对新事物的接受程度和创造性思维 -- 尽责性：计划性、组织性和责任感 +- 严谨性：计划性、组织性和责任感 - 外向性：社交倾向和能量水平 - 宜人性：同理心、合作性和友善程度 - 神经质：情绪稳定性和压力应对能力 -请确保分数在0-10之间，并给出合理的评估理由。""" +请确保分数在1-6之间，并给出合理的评估理由。""" try: ai_response, _ = self.llm.generate_response(prompt) @@ -76,25 +90,26 @@ class PersonalityEvaluator: if start_idx != -1 and end_idx != 0: json_str = ai_response[start_idx:end_idx] scores = json.loads(json_str) - # 确保所有分数在0-10之间 - return {k: max(0, min(10, float(v))) for k, v in scores.items()} + # 确保所有分数在1-6之间 + return {k: max(1, min(6, float(v))) for k, v in scores.items()} else: print("AI响应格式不正确，使用默认评分") - return {dim: 5.0 for dim in dimensions} + return {dim: 3.5 for dim in dimensions} except Exception as e: print(f"评估过程出错：{str(e)}") - return {dim: 5.0 for dim in dimensions} + return {dim: 3.5 for dim in dimensions} def main(): print("欢迎使用人格形象创建程序！") print("接下来，您将面对一系列场景。请根据您想要创建的角色形象，描述在该场景下可能的反应。") print("每个场景都会评估不同的人格维度，最终得出完整的人格特征评估。") + print("评分标准：1=非常不符合，2=比较不符合，3=有点不符合，4=有点符合，5=比较符合，6=非常符合") print("\n准备好了吗？按回车键开始...") input() - evaluator = PersonalityEvaluator() - final_scores = {"开放性": 0, "尽责性": 0, "外向性": 0, "宜人性": 0, "神经质": 0} + evaluator = PersonalityEvaluator_direct() + final_scores = {"开放性": 0, "严谨性": 0, "外向性": 0, "宜人性": 0, "神经质": 0} dimension_counts = {trait: 0 for trait in final_scores.keys()} for i, scenario_data in enumerate(evaluator.scenarios, 1): @@ -119,7 +134,7 @@ def main(): print("\n当前评估结果：") print("-" * 30) for dimension, score in scores.items(): - print(f"{dimension}: {score}/10") + print(f"{dimension}: {score}/6") if i < len(evaluator.scenarios): print("\n按回车键继续下一个场景...") @@ -133,7 +148,7 @@ def main(): print("\n最终人格特征评估结果：") print("-" * 30) for trait, score in final_scores.items(): - print(f"{trait}: {score}/10") + print(f"{trait}: {score}/6") # 保存结果 result = {"final_scores": final_scores, "scenarios": evaluator.scenarios} diff --git a/src/plugins/personality/scene.py b/src/plugins/personality/scene.py new file mode 100644 index 000000000..1059ab94e --- /dev/null +++ b/src/plugins/personality/scene.py @@ -0,0 +1,75 @@ +from typing import Dict, List + +PERSONALITY_SCENES = { + "外向性": { + "scenario": """你刚刚搬到一个新的城市工作。今天是你入职的第一天，在公司的电梯里，一位同事微笑着和你打招呼： + +同事：「嗨！你是新来的同事吧？我是市场部的小林。」 + +同事看起来很友善，还主动介绍说：「待会午饭时间，我们部门有几个人准备一起去楼下新开的餐厅，你要一起来吗？可以认识一下其他同事。」""", + "explanation": "这个场景通过职场社交情境，观察个体对于新环境、新社交圈的态度和反应倾向。" + }, + + "神经质": { + "scenario": """你正在准备一个重要的项目演示，这关系到你的晋升机会。就在演示前30分钟，你收到了主管发来的消息： + +主管：「临时有个变动，CEO也会来听你的演示。他对这个项目特别感兴趣。」 + +正当你准备回复时，主管又发来一条：「对了，能不能把演示时间压缩到15分钟？CEO下午还有其他安排。你之前准备的是30分钟的版本对吧？」""", + "explanation": "这个场景通过突发的压力情境，观察个体在面对计划外变化时的情绪反应和调节能力。" + }, + + "严谨性": { + "scenario": """你是团队的项目负责人，刚刚接手了一个为期两个月的重要项目。在第一次团队会议上： + +小王：「老大，我觉得两个月时间很充裕，我们先做着看吧，遇到问题再解决。」 + +小张：「要不要先列个时间表？不过感觉太详细的计划也没必要，点到为止就行。」 + +小李：「客户那边说如果能提前完成有奖励，我觉得我们可以先做快一点的部分。」""", + "explanation": "这个场景通过项目管理情境，体现个体在工作方法、计划性和责任心方面的特征。" + }, + + "开放性": { + "scenario": """周末下午，你的好友小美兴致勃勃地给你打电话： + +小美：「我刚发现一个特别有意思的沉浸式艺术展！不是传统那种挂画的展览，而是把整个空间都变成了艺术品。观众要穿特制的服装，还要带上VR眼镜，好像还有AI实时互动！」 + +小美继续说：「虽然票价不便宜，但听说体验很独特。网上评价两极分化，有人说是前所未有的艺术革新，也有人说是哗众取宠。要不要周末一起去体验一下？」""", + "explanation": "这个场景通过新型艺术体验，反映个体对创新事物的接受程度和尝试意愿。" + }, + + "宜人性": { + "scenario": """在回家的公交车上，你遇到这样一幕： + +一位老奶奶颤颤巍巍地上了车，车上座位已经坐满了。她站在你旁边，看起来很疲惫。这时你听到前排两个年轻人的对话： + +年轻人A：「那个老太太好像站不稳，看起来挺累的。」 + +年轻人B：「现在的老年人真是...我看她包里还有菜，肯定是去菜市场买完菜回来的，这么多人都不知道叫子女开车接送。」 + +就在这时，老奶奶一个趔趄，差点摔倒。她扶住了扶手，但包里的东西洒了一些出来。""", + "explanation": "这个场景通过公共场合的助人情境，体现个体的同理心和对他人需求的关注程度。" + } +} + +def get_scene_by_factor(factor: str) -> Dict: + """ + 根据人格因子获取对应的情景测试 + + Args: + factor (str): 人格因子名称 + + Returns: + Dict: 包含情景描述的字典 + """ + return PERSONALITY_SCENES.get(factor, None) + +def get_all_scenes() -> Dict: + """ + 获取所有情景测试 + + Returns: + Dict: 所有情景测试的字典 + """ + return PERSONALITY_SCENES