Release v2.3.0

[Refactor&Feat] 命令节点权限控制

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,42 @@
+name: 漏洞反馈
+description: 报错或漏洞请使用这个模板创建，不使用此模板创建的异常、漏洞相关issue将被直接关闭
+title: "[Bug]: "
+labels: ["bug?"]
+body:
+  - type: dropdown
+    attributes:
+      label: 部署方式
+      description: "主程序使用的部署方式"
+      options:
+        - 手动部署
+        - 安装器部署
+        - 一键安装包部署
+        - Docker部署
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 系统环境
+      description: 操作系统、系统架构。
+      placeholder: 例如： CentOS x64、Windows11
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Python环境
+      description: 运行程序的Python版本
+      placeholder: 例如： Python 3.10
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 异常情况
+      description: 完整描述异常情况，什么时候发生的、发生了什么
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 报错信息
+      description: 请提供完整的**控制台**报错信息（若有）
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,21 @@
+name: 需求建议
+title: "[Feature]: "
+labels: ["enhancement"]
+description: "新功能或现有功能优化请使用这个模板；不符合类别的issue将被直接关闭"
+body:
+  - type: dropdown
+    attributes:
+      label: 这是一个？
+      description: 新功能建议还是现有功能优化
+      options:
+        - 新功能
+        - 现有功能优化
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: 详细描述
+      description: 详细描述，越详细越好
+    validations:
+      required: true
+      

.github/ISSUE_TEMPLATE/漏洞反馈.md

@@ -1,24 +0,0 @@
----
-name: 漏洞反馈
-about: 报错或漏洞请使用这个模板创建，不使用此模板创建的异常、漏洞相关issue将被直接关闭
-title: "[BUG]"
-labels: 'bug'
-assignees: ''
-
----
-
-请认真按照实际情况填写以下信息！！！！
-
-**运行环境**
-- 部署方式：
-    手动部署/自动部署/Docker部署
-- 系统环境：
-    例如： Centos x64
-- Python环境（仅手动部署填写）：
-    例如： Python 3.10.9
-
-**描述漏洞**  
-什么时候发生的，mirai还是主程序，越详细越好
-
-**完整报错信息**  
-完整的报错信息

.github/ISSUE_TEMPLATE/需求建议.md

@@ -1,10 +0,0 @@
----
-name: 需求建议
-about: 软件优化建议请使用这个模板创建
-title: "[ENHANCE]"
-labels: 'enhancement'
-assignees: ''
-
----
-
-不是需求建议请勿填写此模板！！！！

.github/workflows/update-cmdpriv-template.yml

@@ -0,0 +1,54 @@
+name: Update cmdpriv-template
+
+on:
+  push:
+    paths:
+      - 'pkg/qqbot/cmds/**'
+  pull_request:
+    types: [closed]
+    paths:
+      - 'pkg/qqbot/cmds/**'
+
+jobs:
+  update-cmdpriv-template:
+    if: github.event.pull_request.merged == true || github.event_name == 'push'
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install --upgrade  yiri-mirai openai colorlog func_timeout dulwich Pillow
+      
+    - name: Generate Files
+      run: |
+        python main.py
+
+    - name: Run generate_cmdpriv_template.py
+      run: python3 generate_cmdpriv_template.py
+
+    - name: Check for changes in cmdpriv-template.json
+      id: check_changes
+      run: |
+        if git diff --name-only | grep -q "cmdpriv-template.json"; then
+          echo "::set-output name=changes_detected::true"
+        else
+          echo "::set-output name=changes_detected::false"
+        fi
+
+    - name: Commit changes to cmdpriv-template.json
+      if: steps.check_changes.outputs.changes_detected == 'true'
+      run: |
+        git config --global user.name "GitHub Actions Bot"
+        git config --global user.email "<github-actions@github.com>"
+        git add cmdpriv-template.json
+        git commit -m "Update cmdpriv-template.json"
+        git push

.github/workflows/update-override-all.yml

@@ -0,0 +1,49 @@
+name: Check and Update override_all
+
+on:
+  push:
+    paths:
+      - 'config-template.py'
+  pull_request:
+    types:
+      - closed
+    branches:
+      - master
+    paths:
+      - 'config-template.py'
+
+jobs:
+  update-override-all:
+    name: check and update
+    if: github.event.pull_request.merged == true || github.event_name == 'push'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.x
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          # 在此处添加您的项目所需的其他依赖
+
+      - name: Run generate_override_all.py
+        run: python3 generate_override_all.py
+
+      - name: Check for changes in override-all.json
+        id: check_changes
+        run: |
+          git diff --exit-code override-all.json || echo "::set-output name=changes_detected::true"
+
+      - name: Commit and push changes
+        if: steps.check_changes.outputs.changes_detected == 'true'
+        run: |
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "GitHub Actions"
+          git add override-all.json
+          git commit -m "Update override-all.json"
+          git push

.gitignore

@@ -16,4 +16,5 @@ scenario/
 !scenario/default-template.json
 override.json
 cookies.json
-res/announcement_saved
+res/announcement_saved
+cmdpriv.json

Dockerfile

@@ -0,0 +1,17 @@
+FROM python:3.9-slim
+WORKDIR /QChatGPT
+
+RUN sed -i "s/deb.debian.org/mirrors.tencent.com/g" /etc/apt/sources.list \
+    && sed -i 's|security.debian.org/debian-security|mirrors.tencent.com/debian-security|g' /etc/apt/sources.list \
+    && apt-get clean \
+    && apt-get update \
+    && apt-get -y upgrade \
+    && apt-get install -y git \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY . /QChatGPT/
+
+RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
+
+CMD [ "python", "main.py" ] 

README.md

@@ -10,6 +10,7 @@
 - 交流、答疑群: ~~204785790~~（已满）、~~691226829~~（已满）、656285629  
   - **进群提问前请您`确保`已经找遍文档和issue均无法解决**  
 - QQ频道机器人见[QQChannelChatGPT](https://github.com/Soulter/QQChannelChatGPT)
+- 欢迎各种形式的贡献，请查看[贡献指引](CONTRIBUTING.md)
 
 通过调用OpenAI的ChatGPT等语言模型来实现一个更加智能的QQ机器人  
 
@@ -149,9 +150,11 @@
 
 #### Docker方式
 
-请查看此仓库[mikumifa/QChatGPT-Docker-Installer](https://github.com/mikumifa/QChatGPT-Docker-Installer)
+请查看[此文档](docker_deploy.md)  
+由[@mikumifa](https://github.com/mikumifa)贡献
 
 #### 安装器方式
+
 使用[此安装器](https://github.com/RockChinQ/qcg-installer)（若无法访问请到[Gitee](https://gitee.com/RockChin/qcg-installer)）进行部署
 
 - 安装器目前仅支持部分平台，请到仓库文档查看，其他平台请手动部署

cmdpriv-template.json

@@ -0,0 +1,27 @@
+{
+    "comment": "以下为命令权限，请设置到cmdpriv.json中。关于此功能的说明，请查看：https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E5%91%BD%E4%BB%A4%E6%9D%83%E9%99%90%E6%8E%A7%E5%88%B6",
+    "draw": 1,
+    "plugin": 2,
+    "plugin.get": 2,
+    "plugin.update": 2,
+    "plugin.del": 2,
+    "plugin.off": 2,
+    "plugin.on": 2,
+    "default": 1,
+    "default.set": 2,
+    "del": 1,
+    "del.all": 1,
+    "delhst": 2,
+    "delhst.all": 2,
+    "last": 1,
+    "list": 1,
+    "next": 1,
+    "prompt": 1,
+    "resend": 1,
+    "reset": 1,
+    "help": 1,
+    "reload": 2,
+    "update": 2,
+    "usage": 1,
+    "version": 1
+}

config-template.py

@@ -33,11 +33,26 @@ mirai_http_api_config = {
 #     },
 #     "http_proxy": "http://127.0.0.1:12345"
 # }
+# 
+# 现已支持反向代理，可以添加reverse_proxy字段以使用反向代理
+# 使用反向代理可以在国内使用OpenAI的API，反向代理的配置请参考 
+# https://github.com/Ice-Hazymoon/openai-scf-proxy
+#
+# 反向代理填写示例：
+# openai_config = {
+#     "api_key": {
+#         "default": "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+#         "key1": "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+#         "key2": "sk-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+#     },
+#     "reverse_proxy": "http://example.com:12345/v1"
+# }
 openai_config = {
     "api_key": {
         "default": "openai_api_key"
     },
-    "http_proxy": None
+    "http_proxy": None,
+    "reverse_proxy": None
 }
 
 # [必需] 管理员QQ号，用于接收报错等通知及执行管理员级别指令
@@ -80,33 +95,11 @@ default_prompt = {
 }
 
 # 情景预设格式
-# 参考值：旧版本方式：default | 完整情景：full_scenario
+# 参考值：默认方式：normal | 完整情景：full_scenario
-# 旧版本的格式为上述default_prompt中的内容，或prompts目录下的文件名
+# 默认方式 的格式为上述default_prompt中的内容，或prompts目录下的文件名
-#
+# 完整情景方式 的格式为JSON，在scenario目录下的JSON文件中列出对话的每个回合，编写方法见scenario/default-template.json
-# 完整情景预设的格式为JSON，在scenario目录下的JSON文件中列出对话的每个回合，编写方法见scenario/default-template.json
+#     编写方法请查看：https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E9%A2%84%E8%AE%BE%E6%96%87%E5%AD%97full_scenario%E6%A8%A1%E5%BC%8F
-# 编写方法例如：
+preset_mode = "normal"
-# {
-#   "prompt": [
-#       {
-#           "role": "user",
-#           "content": "之后当我需要帮助时，请说“输入!help获取帮助”"
-#       },{
-#           "role": "assistant",
-#           "content": "好的，当你之后需要帮助时，我会说“输入!help获取帮助”"
-#       },{
-#           "role": "user",
-#           "content": "帮助"
-#       },{
-#           "role": "assistant",
-#           "content": "输入!help获取帮助"
-#       }
-#   ]
-# }
-#
-# 您可以按照上述格式编写自己的情景预设，在prompt中列出对话的每个回合，
-# role为user或assistant，分别表示用户和机器人的回复
-# 每个JSON文件是一个情景预设，文件名即为情景预设的名称
-preset_mode = "default"
 
 # 群内响应规则
 # 符合此消息的群内消息即使不包含at机器人也会响应
@@ -238,10 +231,18 @@ hide_exce_info_to_user = False
 # 设置为空字符串时，不发送提示信息
 alter_tip_message = '出错了，请稍后再试'
 
-# 机器人线程池大小
+# 线程池相关配置
 # 该参数决定机器人可以同时处理几个人的消息，超出线程池数量的请求会被阻塞，不会被丢弃
 # 如果你不清楚该参数的意义，请不要更改
-pool_num = 10
+# 程序运行本身线程池，无代码层面修改请勿更改
+sys_pool_num = 8
+
+# 执行管理员请求和指令的线程池并行线程数量，一般和管理员数量相等
+admin_pool_num = 2
+
+# 执行用户请求和指令的线程池并行线程数量
+# 如需要更高的并发，可以增大该值
+user_pool_num = 6
 
 # 每个会话的过期时间，单位为秒
 # 默认值20分钟

docker_deploy.md

@@ -0,0 +1,95 @@
+
+
+## 操作步骤
+
+### 1.安装docker和docker compose
+
+[各种设备的安装Docker方法](https://yeasy.gitbook.io/docker_practice/install)
+
+[安装Compose方法](https://yeasy.gitbook.io/docker_practice/compose)
+
+> `Docker Desktop for Mac/Windows` 自带 `docker-compose` 二进制文件，安装 Docker 之后可以直接使用。
+>
+> 可以选择很多下载方法,反正只要安装了就可以了
+
+### 2. 登录qq(下面所有步骤建议在项目文件夹下操作)
+
+#### 2.1 输入指令
+
+```
+docker run -d -it --name mcl --network host -v ${PWD}/qq/plugins:/app/plugins -v ${PWD}/qq/config:/app/config -v   ${PWD}/qq/data:/app/data -v ${PWD}/qq/bots:/app/bots --restart unless-stopped kagurazakanyaa/mcl:latest
+```
+
+这里使用了[KagurazakaNyaa/mirai-console-loader-docker](https://github.com/KagurazakaNyaa/mirai-console-loader-docker)的镜像
+
+#### 2.2 进入容器
+
+```
+docker ps
+```
+在输出中查看容器的ID，例如：
+```sh
+CONTAINER ID   IMAGE                COMMAND      CREATED          STATUS          PORTS                                       NAMES
+bce1e5568f46   kagurazakanyaa/mcl   "./mcl -u"   10 minutes ago   Up 10 minutes   0.0.0.0:8080->8080/tcp, :::8080->8080/tcp   admiring_mendeleev
+```
+查看`IMAGE`名为`kagurazakanyaa/mcl`的容器的`CONTAINER ID`，在这里是`bce1e5568f46`，于是使用以下命令将其切到前台：
+```
+docker attach bce1e5568f46
+```
+如需将其切到后台运行，请使用组合键`Ctrl+P+Q`
+
+#### 2.3 编写配置文件
+
+- 在` /qq/config/net.mamoe.mirai-api-http` 文件夹中找到`setting.yml`，这是`mirai-api-http`的配置文件
+  - 将这个文件的内容修改为：
+
+```
+adapters:
+  - ws
+debug: true
+enableVerify: true
+verifyKey: yirimirai
+singleMode: false
+cacheSize: 4096
+adapterSettings:
+  ws:
+    host: localhost
+    port: 8080
+    reservedSyncId: -1
+```
+
+`verifyKey`要求与`bot`的`config.py`中的`verifyKey`相同
+
+ `port`: 8080要和2.4 config.py配置里面的端口号相同
+
+#### 2.4 登录
+
+#### 在mirai上登录QQ
+
+```
+login <机器人QQ号> <机器人QQ密码>
+```
+
+> 具体见[此教程](https://yiri-mirai.wybxc.cc/tutorials/01/configuration#4-登录-qq)
+
+#### 配置自动登录(可选)
+
+当机器人账号登录成功以后，执行
+
+```
+autologin add <机器人QQ号> <机器人密码>
+autologin setConfig <机器人QQ号> protocol ANDROID_PAD
+```
+
+> 出现`无法登录`报错时候[无法登录的临时处理方案](https://mirai.mamoe.net/topic/223/无法登录的临时处理方案)
+
+**完成后, `Ctrl+P+Q`退出(不会关掉容器,容器还会运行)**
+
+### 3. 部署QChatGPT
+
+配置好config.py,保存到当前目录下,运行下面的
+
+```
+ docker run  -it -d --name QChatGPT   --network host   -v ${PWD}/config.py:/QChatGPT/config.py  -v ${PWD}/banlist.py:/QChatGPT/banlist.py  -v ${PWD}/sensitive.json:/QChatGPT/sensitive.json  mikumifa/qchatgpt-docker
+```
+

generate_cmdpriv_template.py

@@ -0,0 +1,17 @@
+import pkg.qqbot.cmds.mgr as cmdsmgr
+import json
+
+# 执行命令模块的注册
+cmdsmgr.register_all()
+
+# 生成限权文件模板
+template: dict[str, int] = {
+    "comment": "以下为命令权限，请设置到cmdpriv.json中。关于此功能的说明，请查看：https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E5%91%BD%E4%BB%A4%E6%9D%83%E9%99%90%E6%8E%A7%E5%88%B6",
+}
+
+for key in cmdsmgr.__command_list__:
+    template[key] = cmdsmgr.__command_list__[key]['privilege']
+
+# 写入cmdpriv-template.json
+with open('cmdpriv-template.json', 'w') as f:
+    f.write(json.dumps(template, indent=4, ensure_ascii=False))

main.py

@@ -7,6 +7,9 @@ import time
 
 import logging
 import sys
+import traceback
+
+sys.path.append(".")
 
 try:
     import colorlog
@@ -24,10 +27,9 @@ import colorlog
 import requests
 import websockets.exceptions
 from urllib3.exceptions import InsecureRequestWarning
+import pkg.utils.context
 
 
-sys.path.append(".")
-
 log_colors_config = {
     'DEBUG': 'green',  # cyan white
     'INFO': 'white',
@@ -75,11 +77,8 @@ def init_runtime_log_file():
 
 def reset_logging():
     global log_file_name
-    assert os.path.exists('config.py')
 
-    config = importlib.import_module('config')
+    import config
-
-    import pkg.utils.context
 
     if pkg.utils.context.context['logger_handler'] is not None:
         logging.getLogger().removeHandler(pkg.utils.context.context['logger_handler'])
@@ -107,12 +106,46 @@ def reset_logging():
     return sh
 
 
-def main(first_time_init=False):
+# 临时函数，用于加载config和上下文，未来统一放在config类
+def load_config():
+    # 完整性校验
+    is_integrity = True
+    config_template = importlib.import_module('config-template')
+    config = importlib.import_module('config')
+    for key in dir(config_template):
+        if not key.startswith("__") and not hasattr(config, key):
+            setattr(config, key, getattr(config_template, key))
+            logging.warning("[{}]不存在".format(key))
+            is_integrity = False
+    
+    if not is_integrity:
+        logging.warning("配置文件不完整，请依据config-template.py检查config.py")
+
+    # 检查override.json覆盖
+    if os.path.exists("override.json"):
+        override_json = json.load(open("override.json", "r", encoding="utf-8"))
+        for key in override_json:
+            if hasattr(config, key):
+                setattr(config, key, override_json[key])
+                logging.info("覆写配置[{}]为[{}]".format(key, override_json[key]))
+            else:
+                logging.error("无法覆写配置[{}]为[{}]，该配置不存在，请检查override.json是否正确".format(key, override_json[key]))
+
+    if not is_integrity:
+        logging.warning("以上配置已被设为默认值，将在5秒后继续启动... ")
+        time.sleep(5)
+
+    # 存进上下文
+    pkg.utils.context.set_config(config)
+
+
+def start(first_time_init=False):
     """启动流程，reload之后会被执行"""
 
     global known_exception_caught
+    import pkg.utils.context
 
-    import config
+    config = pkg.utils.context.get_config()
     # 更新openai库到最新版本
     if not hasattr(config, 'upgrade_dependencies') or config.upgrade_dependencies:
         print("正在更新依赖库，请等待...")
@@ -127,43 +160,9 @@ def main(first_time_init=False):
 
     known_exception_caught = False
     try:
-        # 导入config.py
-        assert os.path.exists('config.py')
-
-        config = importlib.import_module('config')
-
-        init_runtime_log_file()
 
         sh = reset_logging()
-
+        pkg.utils.context.context['logger_handler'] = sh
-        # 配置完整性校验
-        is_integrity = True
-        config_template = importlib.import_module('config-template')
-        for key in dir(config_template):
-            if not key.startswith("__") and not hasattr(config, key):
-                setattr(config, key, getattr(config_template, key))
-                logging.warning("[{}]不存在".format(key))
-                is_integrity = False
-
-        if not is_integrity:
-            logging.warning("配置文件不完整，请依据config-template.py检查config.py")
-            logging.warning("以上配置已被设为默认值，将在5秒后继续启动... ")
-
-        # 检查override.json覆盖
-        if os.path.exists("override.json"):
-            override_json = json.load(open("override.json", "r", encoding="utf-8"))
-            for key in override_json:
-                if hasattr(config, key):
-                    setattr(config, key, override_json[key])
-                    logging.info("覆写配置[{}]为[{}]".format(key, override_json[key]))
-                else:
-                    logging.error("无法覆写配置[{}]为[{}]，该配置不存在，请检查override.json是否正确".format(key, override_json[key]))
-
-        if not is_integrity:
-            time.sleep(5)
-
-        import pkg.utils.context
-        pkg.utils.context.set_config(config)
 
         # 检查是否设置了管理员
         if not (hasattr(config, 'admin_qq') and config.admin_qq != 0):
@@ -194,11 +193,21 @@ def main(first_time_init=False):
         import pkg.openai.session
         import pkg.qqbot.manager
         import pkg.openai.dprompt
+        import pkg.qqbot.cmds.mgr
+        
+        try:
+            pkg.openai.dprompt.register_all()
+            pkg.qqbot.cmds.mgr.register_all()
+            pkg.qqbot.cmds.mgr.apply_privileges()
+        except Exception as e:
+            logging.error(e)
+            traceback.print_exc()
 
-        pkg.openai.dprompt.read_prompt_from_file()
+        # 配置openai api_base
-        pkg.openai.dprompt.read_scenario_from_file()
+        if "reverse_proxy" in config.openai_config and config.openai_config["reverse_proxy"] is not None:
+            import openai
+            openai.api_base = config.openai_config["reverse_proxy"]
 
-        pkg.utils.context.context['logger_handler'] = sh
         # 主启动流程
         database = pkg.database.manager.DatabaseManager()
 
@@ -212,7 +221,7 @@ def main(first_time_init=False):
         # 初始化qq机器人
         qqbot = pkg.qqbot.manager.QQBotManager(mirai_http_api_config=config.mirai_http_api_config,
                                                timeout=config.process_message_timeout, retry=config.retry_times,
-                                               first_time_init=first_time_init, pool_num=config.pool_num)
+                                               first_time_init=first_time_init)
 
         # 加载插件
         import pkg.plugin.host
@@ -266,9 +275,11 @@ def main(first_time_init=False):
                             "捕捉到未知异常:{}, 请前往 https://github.com/RockChinQ/QChatGPT/issues 查找或提issue".format(e))
                         known_exception_caught = True
                         raise e
-
+                finally:
-            qq_bot_thread = threading.Thread(target=run_bot_wrapper, args=(), daemon=True)
+                    time.sleep(12)
-            qq_bot_thread.start()
+            threading.Thread(
+                target=run_bot_wrapper
+            ).start()
     finally:
         # 判断若是Windows，输出选择模式可能会暂停程序的警告
         if os.name == 'nt':
@@ -276,6 +287,7 @@ def main(first_time_init=False):
             logging.info("您正在使用Windows系统，若命令行窗口处于“选择”模式，程序可能会被暂停，此时请右键点击窗口空白区域使其取消选择模式。")
 
         time.sleep(12)
+        
         if first_time_init:
             if not known_exception_caught:
                 logging.info('程序启动完成,如长时间未显示 ”成功登录到账号xxxxx“ ,并且不回复消息,请查看 '
@@ -324,9 +336,7 @@ def main(first_time_init=False):
 
     return qqbot
 
-
 def stop():
-    import pkg.utils.context
     import pkg.qqbot.manager
     import pkg.openai.session
     try:
@@ -345,8 +355,8 @@ def stop():
             raise e
 
 
-if __name__ == '__main__':
+def check_file():
-    # 检查是否有config.py,如果没有就把config-template.py复制一份,并退出程序
+    # 配置文件存在性校验
     if not os.path.exists('config.py'):
         shutil.copy('config-template.py', 'config.py')
         print('请先在config.py中填写配置')
@@ -364,6 +374,10 @@ if __name__ == '__main__':
     if not os.path.exists("scenario/default.json"):
         shutil.copy("scenario/default-template.json", "scenario/default.json")
 
+    # 检查cmdpriv.json
+    if not os.path.exists("cmdpriv.json"):
+        shutil.copy("cmdpriv-template.json", "cmdpriv.json")
+
     # 检查temp目录
     if not os.path.exists("temp/"):
         os.mkdir("temp/")
@@ -374,6 +388,30 @@ if __name__ == '__main__':
         if not os.path.exists(path):
             os.mkdir(path)
 
+
+def main():
+    # 初始化相关文件
+    check_file()
+
+    # 初始化logging
+    init_runtime_log_file()
+    pkg.utils.context.context['logger_handler'] = reset_logging()
+
+    # 加载配置
+    load_config()
+    config = pkg.utils.context.get_config()
+
+    # 配置线程池
+    from pkg.utils import ThreadCtl
+    thread_ctl = ThreadCtl(
+        sys_pool_num=config.sys_pool_num,
+        admin_pool_num=config.admin_pool_num,
+        user_pool_num=config.user_pool_num
+    )
+    # 存进上下文
+    pkg.utils.context.set_thread_ctl(thread_ctl)
+
+    # 启动指令处理
     if len(sys.argv) > 1 and sys.argv[1] == 'init_db':
         init_db()
         sys.exit(0)
@@ -384,16 +422,29 @@ if __name__ == '__main__':
         updater.update_all(cli=True)
         sys.exit(0)
 
+    # 关闭urllib的http警告
     requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 
-    qqbot = main(True)
+    pkg.utils.context.get_thread_ctl().submit_sys_task(
+        start,
+        True
+    )
 
-    import pkg.utils.context
+    # 主线程循环
     while True:
         try:
-            time.sleep(10)
+            time.sleep(0xFF)
-        except KeyboardInterrupt:
+        except:
             stop()
+            pkg.utils.context.get_thread_ctl().shutdown()
+            import platform
+            if platform.system() == 'Windows':
+                cmd = "taskkill /F /PID {}".format(os.getpid())
+            elif platform.system() in ['Linux', 'Darwin']:
+                cmd = "kill -9 {}".format(os.getpid())
+            os.system(cmd)
+
+
+if __name__ == '__main__':
+    main()
 
-            print("程序退出")
-            sys.exit(0)

override-all.json

@@ -11,13 +11,14 @@
         "api_key": {
             "default": "openai_api_key"
         },
-        "http_proxy": null
+        "http_proxy": null,
+        "reverse_proxy": null
     },
     "admin_qq": 0,
     "default_prompt": {
         "default": "如果我之后想获取帮助，请你说“输入!help获取帮助”"
     },
-    "preset_mode": "default",
+    "preset_mode": "normal",
     "response_rules": {
         "at": true,
         "prefix": [
@@ -42,7 +43,7 @@
     "baidu_secret_key": "",
     "inappropriate_message_tips": "[百度云]请珍惜机器人，当前返回内容不合规",
     "encourage_sponsor_at_start": true,
-    "prompt_submit_length": 1024,
+    "prompt_submit_length": 2048,
     "completion_api_params": {
         "model": "gpt-3.5-turbo",
         "temperature": 0.9,
@@ -63,7 +64,9 @@
     "retry_times": 3,
     "hide_exce_info_to_user": false,
     "alter_tip_message": "出错了，请稍后再试",
-    "pool_num": 10,
+    "sys_pool_num": 8,
+    "admin_pool_num": 2,
+    "user_pool_num": 6,
     "session_expire_time": 1200,
     "rate_limitation": 60,
     "rate_limit_strategy": "wait",

pkg/openai/dprompt.py

@@ -1,121 +1,145 @@
 # 多情景预设值管理
 import json
 import logging
+import config
+import os
 
-__current__ = "default"
+# __current__ = "default"
-"""当前默认使用的情景预设的名称
+# """当前默认使用的情景预设的名称
 
-由管理员使用`!default <名称>`指令切换
+# 由管理员使用`!default <名称>`指令切换
-"""
+# """
 
-__prompts_from_files__ = {}
+# __prompts_from_files__ = {}
-"""从文件中读取的情景预设值"""
+# """从文件中读取的情景预设值"""
 
-__scenario_from_files__ = {}
+# __scenario_from_files__ = {}
 
 
-def read_prompt_from_file():
+__universal_first_reply__ = "ok, I'll follow your commands."
-    """从文件读取预设值"""
+"""通用首次回复"""
-    # 读取prompts/目录下的所有文件，以文件名为键，文件内容为值
-    # 保存在__prompts_from_files__中
-    global __prompts_from_files__
-    import os
-
-    __prompts_from_files__ = {}
-    for file in os.listdir("prompts"):
-        with open(os.path.join("prompts", file), encoding="utf-8") as f:
-            __prompts_from_files__[file] = f.read()
 
 
-def read_scenario_from_file():
+class ScenarioMode:
-    """从JSON文件读取情景预设"""
+    """情景预设模式抽象类"""
-    global __scenario_from_files__
-    import os
 
-    __scenario_from_files__ = {}
+    using_prompt_name = "default"
-    for file in os.listdir("scenario"):
+    """新session创建时使用的prompt名称"""
-        if file == "default-template.json":
+
-            continue
+    prompts: dict[str, list] = {}
-        with open(os.path.join("scenario", file), encoding="utf-8") as f:
+
-            __scenario_from_files__[file] = json.load(f)
+    def __init__(self):
+        logging.debug("prompts: {}".format(self.prompts))
+
+    def list(self) -> dict[str, list]:
+        """获取所有情景预设的名称及内容"""
+        return self.prompts
+
+    def get_prompt(self, name: str) -> tuple[list, str]:
+        """获取指定情景预设的名称及内容"""
+        for key in self.prompts:
+            if key.startswith(name):
+                return self.prompts[key], key
+        raise Exception("没有找到情景预设: {}".format(name))
+
+    def set_using_name(self, name: str) -> str:
+        """设置默认情景预设"""
+        for key in self.prompts:
+            if key.startswith(name):
+                self.using_prompt_name = key
+                return key
+        raise Exception("没有找到情景预设: {}".format(name))
+    
+    def get_full_name(self, name: str) -> str:
+        """获取完整的情景预设名称"""
+        for key in self.prompts:
+            if key.startswith(name):
+                return key
+        raise Exception("没有找到情景预设: {}".format(name))
+
+    def get_using_name(self) -> str:
+        """获取默认情景预设"""
+        return self.using_prompt_name
 
 
-def get_prompt_dict() -> dict:
+class NormalScenarioMode(ScenarioMode):
-    """获取预设值字典"""
+    """普通情景预设模式"""
-    import config
-    default_prompt = config.default_prompt
-    if type(default_prompt) == str:
-        default_prompt = {"default": default_prompt}
-    elif type(default_prompt) == dict:
-        pass
-    else:
-        raise TypeError("default_prompt must be str or dict")
 
-    # 将文件中的预设值合并到default_prompt中
+    def __init__(self):
-    for key in __prompts_from_files__:
+        global __universal_first_reply__
-        default_prompt[key] = __prompts_from_files__[key]
+        # 加载config中的default_prompt值
-
+        if type(config.default_prompt) == str:
-    return default_prompt
+            self.using_prompt_name = "default"
-
+            self.prompts = {"default": [
-
+                {
-def set_current(name):
+                    "role": "user",
-    global __current__
+                    "content": config.default_prompt
-    for key in get_prompt_dict():
+                },{
-        if key.lower().startswith(name.lower()):
+                    "role": "assistant",
-            __current__ = key
+                    "content": __universal_first_reply__
-            return
+                }
-    raise KeyError("未找到情景预设: " + name)
+            ]}
-
-
-def get_current():
-    global __current__
-    return __current__
-
-
-def set_to_default():
-    global __current__
-    default_dict = get_prompt_dict()
-
-    if "default" in default_dict:
-        __current__ = "default"
-    else:
-        __current__ = list(default_dict.keys())[0]
-
-
-def get_prompt(name: str = None) -> list:
-    global __scenario_from_files__
-    import config
-    preset_mode = config.preset_mode
-
-    """获取预设值"""
-    if name is None:
-        name = get_current()
-
-    # JSON预设方式
-    if preset_mode == 'full_scenario':
-        import os
-
-        for key in __scenario_from_files__:
-            if key.lower().startswith(name.lower()):
-                logging.debug('成功加载情景预设从JSON文件: {}'.format(key))
-                return __scenario_from_files__[key]['prompt']
         
-    # 默认预设方式
+        elif type(config.default_prompt) == dict:
-    elif preset_mode == 'default':
+            for key in config.default_prompt:
-
+                self.prompts[key] = [
-        default_dict = get_prompt_dict()
-
-        for key in default_dict:
-            if key.lower().startswith(name.lower()):
-                return [
                     {
                         "role": "user",
-                        "content": default_dict[key]
+                        "content": config.default_prompt[key]
-                    },
+                    },{
-                    {
                         "role": "assistant",
-                        "content": "好的。"
+                        "content": __universal_first_reply__
                     }
                 ]
 
-    raise KeyError("未找到默认情景预设: " + name)
+        # 从prompts/目录下的文件中载入
+        # 遍历文件
+        for file in os.listdir("prompts"):
+            with open(os.path.join("prompts", file), encoding="utf-8") as f:
+                self.prompts[file] = [
+                    {
+                        "role": "user",
+                        "content": f.read()
+                    },{
+                        "role": "assistant",
+                        "content": __universal_first_reply__
+                    }
+                ]
+
+
+class FullScenarioMode(ScenarioMode):
+    """完整情景预设模式"""
+
+    def __init__(self):
+        """从json读取所有"""
+        # 遍历scenario/目录下的所有文件，以文件名为键，文件内容中的prompt为值
+        for file in os.listdir("scenario"):
+            if file == "default-template.json":
+                continue
+            with open(os.path.join("scenario", file), encoding="utf-8") as f:
+                self.prompts[file] = json.load(f)["prompt"]
+
+        super().__init__()
+
+
+scenario_mode_mapping = {}
+"""情景预设模式名称与对象的映射"""
+
+
+def register_all():
+    """注册所有情景预设模式，不使用装饰器，因为装饰器的方式不支持热重载"""
+    global scenario_mode_mapping
+    scenario_mode_mapping = {
+        "normal": NormalScenarioMode(),
+        "full_scenario": FullScenarioMode()
+    }
+
+
+def mode_inst() -> ScenarioMode:
+    """获取指定名称的情景预设模式对象"""
+    import config
+
+    if config.preset_mode == "default":
+        config.preset_mode = "normal"
+
+    return scenario_mode_mapping[config.preset_mode]

pkg/openai/session.py

@@ -141,9 +141,9 @@ class Session:
         import pkg.openai.dprompt as dprompt
 
         if use_default is None:
-            use_default = dprompt.get_current()
+            use_default = dprompt.mode_inst().get_using_name()
 
-        current_default_prompt = dprompt.get_prompt(use_default)
+        current_default_prompt, _ = dprompt.mode_inst().get_prompt(use_default)
         return current_default_prompt
 
     def __init__(self, name: str):

pkg/qqbot/cmds/func.py

@@ -1,36 +0,0 @@
-from pkg.qqbot.cmds.model import command
-
-import logging
-
-from mirai import Image
-
-import config
-import pkg.openai.session
-
-@command(
-    "draw",
-    "使用DALL·E模型作画",
-    "!draw <图片提示语>",
-    [],
-    False
-)
-def cmd_draw(cmd: str, params: list, session_name: str,
-             text_message: str, launcher_type: str, launcher_id: int,
-                sender_id: int, is_admin: bool) -> list:
-    """使用DALL·E模型作画"""
-    reply = []
-    
-    if len(params) == 0:
-        reply = ["[bot]err:请输入图片描述文字"]
-    else:
-        session = pkg.openai.session.get_session(session_name)
-
-        res = session.draw_image(" ".join(params))
-
-        logging.debug("draw_image result:{}".format(res))
-        reply = [Image(url=res['data'][0]['url'])]
-        if not (hasattr(config, 'include_image_description')
-                and not config.include_image_description):
-            reply.append(" ".join(params))
-
-    return reply

pkg/qqbot/cmds/func/draw.py

@@ -0,0 +1,35 @@
+from ..mgr import AbstractCommandNode, Context
+import logging
+
+from mirai import Image
+import config
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="draw",
+    description="使用DALL·E生成图片",
+    usage="!draw <图片提示语>",
+    aliases=[],
+    privilege=1
+)
+class DrawCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.openai.session
+
+        reply = []
+        if len(ctx.params) == 0:
+            reply = ["[bot]err: 未提供图片描述文字"]
+        else:
+            session = pkg.openai.session.get_session(ctx.session_name)
+
+            res = session.draw_image(" ".join(ctx.params))
+
+            logging.debug("draw_image result:{}".format(res))
+            reply = [Image(url=res['data'][0]['url'])]
+            if not (hasattr(config, 'include_image_description')
+                    and not config.include_image_description):
+                reply.append(" ".join(ctx.params))
+
+        return True, reply

pkg/qqbot/cmds/mgr.py

@@ -0,0 +1,326 @@
+import importlib
+import inspect
+import logging
+import copy
+import pkgutil
+import traceback
+import types
+import json
+
+
+__command_list__ = {}
+"""命令树
+
+结构：
+{
+    'cmd1': {
+        'description': 'cmd1 description',
+        'usage': 'cmd1 usage',
+        'aliases': ['cmd1 alias1', 'cmd1 alias2'],
+        'privilege': 0,
+        'parent': None,
+        'cls': <class 'pkg.qqbot.cmds.cmd1.CommandCmd1'>,
+        'sub': [
+            'cmd1-1'
+        ]
+    },
+    'cmd1.cmd1-1: {
+        'description': 'cmd1-1 description',
+        'usage': 'cmd1-1 usage',
+        'aliases': ['cmd1-1 alias1', 'cmd1-1 alias2'],
+        'privilege': 0,
+        'parent': 'cmd1',
+        'cls': <class 'pkg.qqbot.cmds.cmd1.CommandCmd1_1'>,
+        'sub': []
+    },
+    'cmd2': {
+        'description': 'cmd2 description',
+        'usage': 'cmd2 usage',
+        'aliases': ['cmd2 alias1', 'cmd2 alias2'],
+        'privilege': 0,
+        'parent': None,
+        'cls': <class 'pkg.qqbot.cmds.cmd2.CommandCmd2'>,
+        'sub': [
+            'cmd2-1'
+        ]
+    },
+    'cmd2.cmd2-1': {
+        'description': 'cmd2-1 description',
+        'usage': 'cmd2-1 usage',
+        'aliases': ['cmd2-1 alias1', 'cmd2-1 alias2'],
+        'privilege': 0,
+        'parent': 'cmd2',
+        'cls': <class 'pkg.qqbot.cmds.cmd2.CommandCmd2_1'>,
+        'sub': [
+            'cmd2-1-1'
+        ]
+    },
+    'cmd2.cmd2-1.cmd2-1-1': {
+        'description': 'cmd2-1-1 description',
+        'usage': 'cmd2-1-1 usage',
+        'aliases': ['cmd2-1-1 alias1', 'cmd2-1-1 alias2'],
+        'privilege': 0,
+        'parent': 'cmd2.cmd2-1',
+        'cls': <class 'pkg.qqbot.cmds.cmd2.CommandCmd2_1_1'>,
+        'sub': []
+    },
+}
+"""
+
+__tree_index__: dict[str, list] = {}
+"""命令树索引
+
+结构：
+{
+    'pkg.qqbot.cmds.cmd1.CommandCmd1': 'cmd1',  # 顶级指令
+    'pkg.qqbot.cmds.cmd1.CommandCmd1_1': 'cmd1.cmd1-1',  # 类名: 节点路径
+    'pkg.qqbot.cmds.cmd2.CommandCmd2': 'cmd2',
+    'pkg.qqbot.cmds.cmd2.CommandCmd2_1': 'cmd2.cmd2-1',
+    'pkg.qqbot.cmds.cmd2.CommandCmd2_1_1': 'cmd2.cmd2-1.cmd2-1-1',
+}
+"""
+
+
+class Context:
+    """命令执行上下文"""
+    command: str
+    """顶级指令文本"""
+
+    crt_command: str
+    """当前子指令文本"""
+
+    params: list
+    """完整参数列表"""
+
+    crt_params: list
+    """当前子指令参数列表"""
+
+    session_name: str
+    """会话名"""
+
+    text_message: str
+    """指令完整文本"""
+
+    launcher_type: str
+    """指令发起者类型"""
+
+    launcher_id: int
+    """指令发起者ID"""
+
+    sender_id: int
+    """指令发送者ID"""
+
+    is_admin: bool
+    """[过时]指令发送者是否为管理员"""
+
+    privilege: int
+    """指令发送者权限等级"""
+
+    def __init__(self, **kwargs):
+        self.__dict__.update(kwargs)
+
+
+class AbstractCommandNode:
+    """指令抽象类"""
+
+    parent: type
+    """父指令类"""
+
+    name: str
+    """指令名"""
+
+    description: str
+    """指令描述"""
+
+    usage: str
+    """指令用法"""
+
+    aliases: list[str]
+    """指令别名"""
+
+    privilege: int
+    """指令权限等级, 权限大于等于此值的用户才能执行指令"""
+
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        """指令处理函数
+        
+        :param ctx: 指令执行上下文
+
+        :return: (是否执行, 回复列表(若执行))
+
+        若未执行，将自动以下一个参数查找并执行子指令
+        """
+        raise NotImplementedError
+    
+    @classmethod
+    def help(cls) -> str:
+        """获取指令帮助信息"""
+        return '指令: {}\n描述: {}\n用法: \n{}\n别名: {}\n权限: {}'.format(
+            cls.name,
+            cls.description,
+            cls.usage,
+            ', '.join(cls.aliases),
+            cls.privilege
+        )
+
+    @staticmethod
+    def register(
+        parent: type = None,
+        name: str = None,
+        description: str = None,
+        usage: str = None,
+        aliases: list[str] = None,
+        privilege: int = 0
+    ):
+        """注册指令
+        
+        :param cls: 指令类
+        :param name: 指令名
+        :param parent: 父指令类
+        """
+        global __command_list__, __tree_index__
+        
+        def wrapper(cls):
+            cls.name = name
+            cls.parent = parent
+            cls.description = description
+            cls.usage = usage
+            cls.aliases = aliases
+            cls.privilege = privilege
+
+            logging.debug("cls: {}, name: {}, parent: {}".format(cls, name, parent))
+
+            if parent is None:
+                # 顶级指令注册
+                __command_list__[name] = {
+                    'description': cls.description,
+                    'usage': cls.usage,
+                    'aliases': cls.aliases,
+                    'privilege': cls.privilege,
+                    'parent': None,
+                    'cls': cls,
+                    'sub': []
+                }
+                # 更新索引
+                __tree_index__[cls.__module__ + '.' + cls.__name__] = name
+            else:
+                # 获取父节点名称
+                path = __tree_index__[parent.__module__ + '.' + parent.__name__]
+                
+                parent_node = __command_list__[path]
+                # 链接父子指令
+                __command_list__[path]['sub'].append(name)
+                # 注册子指令
+                __command_list__[path + '.' + name] = {
+                    'description': cls.description,
+                    'usage': cls.usage,
+                    'aliases': cls.aliases,
+                    'privilege': cls.privilege,
+                    'parent': path,
+                    'cls': cls,
+                    'sub': []
+                }
+                # 更新索引
+                __tree_index__[cls.__module__ + '.' + cls.__name__] = path + '.' + name
+
+            return cls
+        
+        return wrapper
+
+
+class CommandPrivilegeError(Exception):
+    """指令权限不足或不存在异常"""
+    pass
+
+
+# 传入Context对象，广搜命令树，返回执行结果
+# 若命令被处理，返回reply列表
+# 若命令未被处理，继续执行下一级指令
+# 若命令不存在，报异常
+def execute(context: Context) -> list:
+    """执行指令
+    
+    :param ctx: 指令执行上下文
+
+    :return: 回复列表
+    """
+    global __command_list__
+
+    # 拷贝ctx
+    ctx: Context = copy.deepcopy(context)
+
+    # 从树取出顶级指令
+    node = __command_list__
+    
+    path = ctx.command
+
+    while True:
+        try:
+            logging.debug('执行指令: {}'.format(path))
+            node = __command_list__[path]
+
+            # 检查权限
+            if ctx.privilege < node['privilege']:
+                raise CommandPrivilegeError('权限不足: {}'.format(path))
+            
+            # 执行
+            execed, reply = node['cls'].process(ctx)
+            if execed:
+                return reply
+            else:
+                # 删除crt_params第一个参数
+                ctx.crt_command = ctx.crt_params.pop(0)
+                # 下一个path
+                path = path + '.' + ctx.crt_command
+        except KeyError:
+            traceback.print_exc()
+            raise CommandPrivilegeError('找不到指令: {}'.format(path))
+
+
+def register_all():
+    """启动时调用此函数注册所有指令
+    
+    递归处理pkg.qqbot.cmds包下及其子包下所有模块的所有继承于AbstractCommand的类
+    """
+    # 模块：遍历其中的继承于AbstractCommand的类，进行注册
+    # 包：递归处理包下的模块
+    # 排除__开头的属性
+    global __command_list__, __tree_index__
+
+    import pkg.qqbot.cmds
+
+    def walk(module, prefix, path_prefix):
+        # 排除不处于pkg.qqbot.cmds中的包
+        if not module.__name__.startswith('pkg.qqbot.cmds'):
+            return
+        
+        logging.debug('walk: {}, path: {}'.format(module.__name__, module.__path__))
+        for item in pkgutil.iter_modules(module.__path__):
+            if item.name.startswith('__'):
+                continue
+
+            if item.ispkg:
+                walk(__import__(module.__name__ + '.' + item.name, fromlist=['']), prefix + item.name + '.', path_prefix + item.name + '/')
+            else:
+                m = __import__(module.__name__ + '.' + item.name, fromlist=[''])
+                # for name, cls in inspect.getmembers(m, inspect.isclass):
+                #     # 检查是否为指令类
+                #     if cls.__module__ == m.__name__ and issubclass(cls, AbstractCommandNode) and cls != AbstractCommandNode:
+                #         cls.register(cls, cls.name, cls.parent)
+
+    walk(pkg.qqbot.cmds, '', '')
+    logging.debug(__command_list__)
+
+
+def apply_privileges():
+    """读取cmdpriv.json并应用指令权限"""
+    with open('cmdpriv.json', 'r') as f:
+        data = json.load(f)
+        for path, priv in data.items():
+            if path == 'comment':
+                continue
+            if __command_list__[path]['privilege'] != priv:
+                logging.debug('应用权限: {} -> {}(default: {})'.format(path, priv, __command_list__[path]['privilege']))
+
+            __command_list__[path]['privilege'] = priv

pkg/qqbot/cmds/model.py

@@ -1,45 +0,0 @@
-# 指令模型
-import logging
-
-commands = []
-"""已注册的指令类
-{
-    "name": "指令名",
-    "description": "指令描述",
-    "usage": "指令用法",
-    "aliases": ["别名1", "别名2"],
-    "admin_only": "是否仅管理员可用",
-    "func": "指令执行函数"
-}
-"""
-
-
-def command(name: str, description: str, usage: str, aliases: list = None, admin_only: bool = False):
-    """指令装饰器"""
-
-    def wrapper(fun):
-        commands.append({
-            "name": name,
-            "description": description,
-            "usage": usage,
-            "aliases": aliases,
-            "admin_only": admin_only,
-            "func": fun
-        })
-        return fun
-    
-    return wrapper
-
-
-def search(cmd: str) -> dict:
-    """查找指令"""
-    for command in commands:
-        if (command["name"] == cmd) or (cmd in command["aliases"]):
-            return command
-    return None
-
-
-import pkg.qqbot.cmds.func
-import pkg.qqbot.cmds.system
-import pkg.qqbot.cmds.session
-import pkg.qqbot.cmds.plugin

pkg/qqbot/cmds/plugin.py

@@ -1,129 +0,0 @@
-from pkg.qqbot.cmds.model import command
-import pkg.utils.context
-import pkg.plugin.switch as plugin_switch
-
-import os
-import threading
-import logging
-
-
-def plugin_operation(cmd, params, is_admin):
-    reply = []
-
-    import pkg.plugin.host as plugin_host
-    import pkg.utils.updater as updater
-
-    plugin_list = plugin_host.__plugins__
-
-    if len(params) == 0:
-        reply_str = "[bot]所有插件({}):\n".format(len(plugin_host.__plugins__))
-        idx = 0
-        for key in plugin_host.iter_plugins_name():
-            plugin = plugin_list[key]
-            reply_str += "\n#{} {} {}\n{}\nv{}\n作者: {}\n"\
-                .format((idx+1), plugin['name'],
-                        "[已禁用]" if not plugin['enabled'] else "",
-                        plugin['description'],
-                        plugin['version'], plugin['author'])
-
-            if updater.is_repo("/".join(plugin['path'].split('/')[:-1])):
-                remote_url = updater.get_remote_url("/".join(plugin['path'].split('/')[:-1]))
-                if remote_url != "https://github.com/RockChinQ/QChatGPT" and remote_url != "https://gitee.com/RockChin/QChatGPT":
-                    reply_str += "源码: "+remote_url+"\n"
-
-            idx += 1
-
-        reply = [reply_str]
-    elif params[0] == 'update':
-        # 更新所有插件
-        if is_admin:
-            def closure():
-                import pkg.utils.context
-                updated = []
-                for key in plugin_list:
-                    plugin = plugin_list[key]
-                    if updater.is_repo("/".join(plugin['path'].split('/')[:-1])):
-                        success = updater.pull_latest("/".join(plugin['path'].split('/')[:-1]))
-                        if success:
-                            updated.append(plugin['name'])
-
-                # 检查是否有requirements.txt
-                pkg.utils.context.get_qqbot_manager().notify_admin("正在安装依赖...")
-                for key in plugin_list:
-                    plugin = plugin_list[key]
-                    if os.path.exists("/".join(plugin['path'].split('/')[:-1])+"/requirements.txt"):
-                        logging.info("{}检测到requirements.txt，安装依赖".format(plugin['name']))
-                        import pkg.utils.pkgmgr
-                        pkg.utils.pkgmgr.install_requirements("/".join(plugin['path'].split('/')[:-1])+"/requirements.txt")
-
-                        import main
-                        main.reset_logging()
-
-                pkg.utils.context.get_qqbot_manager().notify_admin("已更新插件: {}".format(", ".join(updated)))
-
-            threading.Thread(target=closure).start()
-            reply = ["[bot]正在更新所有插件，请勿重复发起..."]
-        else:
-            reply = ["[bot]err:权限不足"]
-    elif params[0] == 'del' or params[0] == 'delete':
-        if is_admin:
-            if len(params) < 2:
-                reply = ["[bot]err:未指定插件名"]
-            else:
-                plugin_name = params[1]
-                if plugin_name in plugin_list:
-                    unin_path = plugin_host.uninstall_plugin(plugin_name)
-                    reply = ["[bot]已删除插件: {} ({}), 请发送 !reload 重载插件".format(plugin_name, unin_path)]
-                else:
-                    reply = ["[bot]err:未找到插件: {}, 请使用!plugin指令查看插件列表".format(plugin_name)]
-        else:
-            reply = ["[bot]err:权限不足，请使用管理员账号私聊发起"]
-    elif params[0] == 'on' or params[0] == 'off' :
-        new_status = params[0] == 'on'
-        if is_admin:
-            if len(params) < 2:
-                reply = ["[bot]err:未指定插件名"]
-            else:
-                plugin_name = params[1]
-                if plugin_name in plugin_list:
-                    plugin_list[plugin_name]['enabled'] = new_status
-                    plugin_switch.dump_switch()
-                    reply = ["[bot]已{}插件: {}".format("启用" if new_status else "禁用", plugin_name)]
-                else:
-                    reply = ["[bot]err:未找到插件: {}, 请使用!plugin指令查看插件列表".format(plugin_name)]
-        else:
-            reply = ["[bot]err:权限不足，请使用管理员账号私聊发起"]
-    elif params[0].startswith("http"):
-        if is_admin:
-
-            def closure():
-                try:
-                    plugin_host.install_plugin(params[0])
-                    pkg.utils.context.get_qqbot_manager().notify_admin("插件安装成功，请发送 !reload 指令重载插件")
-                except Exception as e:
-                    logging.error("插件安装失败:{}".format(e))
-                    pkg.utils.context.get_qqbot_manager().notify_admin("插件安装失败:{}".format(e))
-
-            threading.Thread(target=closure, args=()).start()
-            reply = ["[bot]正在安装插件..."]
-        else:
-            reply = ["[bot]err:权限不足，请使用管理员账号私聊发起"]
-    else:
-        reply = ["[bot]err:未知参数: {}".format(params)]
-
-    return reply
-
-
-@command(
-    "plugin",
-    "插件相关操作",
-    "!plugin\n!plugin <插件仓库地址>\!plugin update\n!plugin del <插件名>\n!plugin on <插件名>\n!plugin off <插件名>",
-    [],
-    False
-)
-def cmd_plugin(cmd: str, params: list, session_name: str,
-                text_message: str, launcher_type: str, launcher_id: int,
-                 sender_id: int, is_admin: bool) -> list:
-    """插件相关操作"""
-    reply = plugin_operation(cmd, params, is_admin)
-    return reply

pkg/qqbot/cmds/plugin/plugin.py

@@ -0,0 +1,195 @@
+from ..mgr import AbstractCommandNode, Context
+
+import os
+
+import pkg.plugin.host as plugin_host
+import pkg.utils.updater as updater
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="plugin",
+    description="插件管理",
+    usage="!plugin\n!plugin get <插件仓库地址>\!plugin update\n!plugin del <插件名>\n!plugin on <插件名>\n!plugin off <插件名>",
+    aliases=[],
+    privilege=2
+)
+class PluginCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        reply = []
+        plugin_list = plugin_host.__plugins__
+        if len(ctx.params) == 0:
+            # 列出所有插件
+            
+            reply_str = "[bot]所有插件({}):\n".format(len(plugin_host.__plugins__))
+            idx = 0
+            for key in plugin_host.iter_plugins_name():
+                plugin = plugin_list[key]
+                reply_str += "\n#{} {} {}\n{}\nv{}\n作者: {}\n"\
+                    .format((idx+1), plugin['name'],
+                            "[已禁用]" if not plugin['enabled'] else "",
+                            plugin['description'],
+                            plugin['version'], plugin['author'])
+
+                if updater.is_repo("/".join(plugin['path'].split('/')[:-1])):
+                    remote_url = updater.get_remote_url("/".join(plugin['path'].split('/')[:-1]))
+                    if remote_url != "https://github.com/RockChinQ/QChatGPT" and remote_url != "https://gitee.com/RockChin/QChatGPT":
+                        reply_str += "源码: "+remote_url+"\n"
+
+                idx += 1
+
+            reply = [reply_str]
+            return True, reply
+        elif ctx.params[0].startswith("http"):
+            reply = ["[bot]err: 此命令已启用，请使用 !plugin get <插件仓库地址> 进行安装"]
+            return True, reply
+        else:
+            return False, []
+
+    
+@AbstractCommandNode.register(
+    parent=PluginCommand,
+    name="get",
+    description="安装插件",
+    usage="!plugin get <插件仓库地址>",
+    aliases=[],
+    privilege=2
+)
+class PluginGetCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import threading
+        import logging
+        import pkg.utils.context
+
+        if len(ctx.crt_params) == 0:
+            reply = ["[bot]err: 请提供插件仓库地址"]
+            return True, reply
+        
+        reply = []
+        def closure():
+            try:
+                plugin_host.install_plugin(ctx.crt_params[0])
+                pkg.utils.context.get_qqbot_manager().notify_admin("插件安装成功，请发送 !reload 指令重载插件")
+            except Exception as e:
+                logging.error("插件安装失败:{}".format(e))
+                pkg.utils.context.get_qqbot_manager().notify_admin("插件安装失败:{}".format(e))
+
+        threading.Thread(target=closure, args=()).start()
+        reply = ["[bot]正在安装插件..."]
+        return True, reply
+
+
+@AbstractCommandNode.register(
+    parent=PluginCommand,
+    name="update",
+    description="更新所有插件",
+    usage="!plugin update",
+    aliases=[],
+    privilege=2
+)
+class PluginUpdateCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import threading
+        import logging
+        plugin_list = plugin_host.__plugins__
+
+        reply = []
+        def closure():
+            import pkg.utils.context
+            updated = []
+            for key in plugin_list:
+                plugin = plugin_list[key]
+                if updater.is_repo("/".join(plugin['path'].split('/')[:-1])):
+                    success = updater.pull_latest("/".join(plugin['path'].split('/')[:-1]))
+                    if success:
+                        updated.append(plugin['name'])
+
+            # 检查是否有requirements.txt
+            pkg.utils.context.get_qqbot_manager().notify_admin("正在安装依赖...")
+            for key in plugin_list:
+                plugin = plugin_list[key]
+                if os.path.exists("/".join(plugin['path'].split('/')[:-1])+"/requirements.txt"):
+                    logging.info("{}检测到requirements.txt，安装依赖".format(plugin['name']))
+                    import pkg.utils.pkgmgr
+                    pkg.utils.pkgmgr.install_requirements("/".join(plugin['path'].split('/')[:-1])+"/requirements.txt")
+
+                    import main
+                    main.reset_logging()
+
+            pkg.utils.context.get_qqbot_manager().notify_admin("已更新插件: {}".format(", ".join(updated)))
+
+        threading.Thread(target=closure).start()
+        reply = ["[bot]正在更新所有插件，请勿重复发起..."]
+        return True, reply
+
+
+@AbstractCommandNode.register(
+    parent=PluginCommand,
+    name="del",
+    description="删除插件",
+    usage="!plugin del <插件名>",
+    aliases=[],
+    privilege=2
+)
+class PluginDelCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        plugin_list = plugin_host.__plugins__
+        reply = []
+
+        if len(ctx.crt_params) < 1:
+            reply = ["[bot]err: 未指定插件名"]
+        else:
+            plugin_name = ctx.crt_params[0]
+            if plugin_name in plugin_list:
+                unin_path = plugin_host.uninstall_plugin(plugin_name)
+                reply = ["[bot]已删除插件: {} ({}), 请发送 !reload 重载插件".format(plugin_name, unin_path)]
+            else:
+                reply = ["[bot]err:未找到插件: {}, 请使用!plugin指令查看插件列表".format(plugin_name)]
+        
+        return True, reply
+
+
+@AbstractCommandNode.register(
+    parent=PluginCommand,
+    name="on",
+    description="启用指定插件",
+    usage="!plugin on <插件名>",
+    aliases=[],
+    privilege=2
+)
+@AbstractCommandNode.register(
+    parent=PluginCommand,
+    name="off",
+    description="禁用指定插件",
+    usage="!plugin off <插件名>",
+    aliases=[],
+    privilege=2
+)
+class PluginOnOffCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.plugin.switch as plugin_switch
+
+        plugin_list = plugin_host.__plugins__
+        reply = []
+        
+        print(ctx.params)
+        new_status = ctx.params[0] == 'on'
+
+        if len(ctx.crt_params) < 1:
+            reply = ["[bot]err: 未指定插件名"]
+        else:
+            plugin_name = ctx.crt_params[0]
+            if plugin_name in plugin_list:
+                plugin_list[plugin_name]['enabled'] = new_status
+                plugin_switch.dump_switch()
+                reply = ["[bot]已{}插件: {}".format("启用" if new_status else "禁用", plugin_name)]
+            else:
+                reply = ["[bot]err:未找到插件: {}, 请使用!plugin指令查看插件列表".format(plugin_name)]
+        
+        return True, reply
+

pkg/qqbot/cmds/session.py

@@ -1,282 +0,0 @@
-# 会话管理相关指令
-import datetime
-import json
-
-from pkg.qqbot.cmds.model import command
-import pkg.openai.session
-import pkg.utils.context
-import config
-
-@command(
-    "reset",
-    "重置当前会话",
-    "!reset\n!reset [使用情景预设名称]",
-    [],
-    False
-)
-def cmd_reset(cmd: str, params: list, session_name: str, 
-              text_message: str, launcher_type: str, launcher_id: int,
-                sender_id: int, is_admin: bool) -> list:
-    """重置会话"""
-    reply = []
-    
-    if len(params) == 0:
-        pkg.openai.session.get_session(session_name).reset(explicit=True)
-        reply = ["[bot]会话已重置"]
-    else:
-        pkg.openai.session.get_session(session_name).reset(explicit=True, use_prompt=params[0])
-        reply = ["[bot]会话已重置，使用场景预设:{}".format(params[0])]
-    
-    return reply
-
-
-@command(
-    "last",
-    "切换到前一次会话",
-    "!last",
-    [],
-    False
-)
-def cmd_last(cmd: str, params: list, session_name: str, 
-             text_message: str, launcher_type: str, launcher_id: int,
-                sender_id: int, is_admin: bool) -> list:
-    """切换到前一次会话"""
-    reply = []
-    result = pkg.openai.session.get_session(session_name).last_session()
-    if result is None:
-        reply = ["[bot]没有前一次的对话"]
-    else:
-        datetime_str = datetime.datetime.fromtimestamp(result.create_timestamp).strftime(
-            '%Y-%m-%d %H:%M:%S')
-        reply = ["[bot]已切换到前一次的对话：\n创建时间:{}\n".format(datetime_str)]
-
-    return reply
-
-@command(
-    "next",
-    "切换到后一次会话",
-    "!next",
-    [],
-    False
-)
-def cmd_next(cmd: str, params: list, session_name: str, 
-             text_message: str, launcher_type: int, launcher_id: int,
-                sender_id: int, is_admin: bool) -> list:
-    """切换到后一次会话"""
-    reply = []
-    
-    result = pkg.openai.session.get_session(session_name).next_session()
-    if result is None:
-        reply = ["[bot]没有后一次的对话"]
-    else:
-        datetime_str = datetime.datetime.fromtimestamp(result.create_timestamp).strftime(
-            '%Y-%m-%d %H:%M:%S')
-        reply = ["[bot]已切换到后一次的对话：\n创建时间:{}\n".format(datetime_str)]
-
-    return reply
-
-
-@command(
-    "prompt",
-    "获取当前会话的前文",
-    "!prompt",
-    [],
-    False
-)
-def cmd_prompt(cmd: str, params: list, session_name: str,
-                text_message: str, launcher_type: str, launcher_id: int,
-                 sender_id: int, is_admin: bool) -> list:
-    """获取当前会话的前文"""
-    reply = []
-     
-    msgs = ""
-    session:list = pkg.openai.session.get_session(session_name).prompt
-    for msg in session:
-        if len(params) != 0 and params[0] in ['-all', '-a']:
-            msgs = msgs + "{}: {}\n\n".format(msg['role'], msg['content'])
-        elif len(msg['content']) > 30:
-            msgs = msgs + "[{}]: {}...\n\n".format(msg['role'], msg['content'][:30])
-        else:
-            msgs = msgs + "[{}]: {}\n\n".format(msg['role'], msg['content'])
-    reply = ["[bot]当前对话所有内容：\n{}".format(msgs)]
-
-    return reply
-
-
-@command(
-    "list",
-    "列出当前会话的所有历史记录",
-    "!list\n!list [页数]",
-    [],
-    False
-)
-def cmd_list(cmd: str, params: list, session_name: str,
-              text_message: str, launcher_type: str, launcher_id: int,
-               sender_id: int, is_admin: bool) -> list:
-    """列出当前会话的所有历史记录"""
-    reply = []
-    
-    pkg.openai.session.get_session(session_name).persistence()
-    page = 0
-
-    if len(params) > 0:
-        try:
-            page = int(params[0])
-        except ValueError:
-            pass
-
-    results = pkg.openai.session.get_session(session_name).list_history(page=page)
-    if len(results) == 0:
-        reply = ["[bot]第{}页没有历史会话".format(page)]
-    else:
-        reply_str = "[bot]历史会话 第{}页：\n".format(page)
-        current = -1
-        for i in range(len(results)):
-            # 时间(使用create_timestamp转换) 序号 部分内容
-            datetime_obj = datetime.datetime.fromtimestamp(results[i]['create_timestamp'])
-            msg = ""
-            try:
-                msg = json.loads(results[i]['prompt'])
-            except json.decoder.JSONDecodeError:
-                msg = pkg.openai.session.reset_session_prompt(session_name, results[i]['prompt'])
-                # 持久化
-                pkg.openai.session.get_session(session_name).persistence()
-            if len(msg) >= 2:
-                reply_str += "#{} 创建:{} {}\n".format(i + page * 10,
-                                                        datetime_obj.strftime("%Y-%m-%d %H:%M:%S"),
-                                                        msg[0]['content'])
-            else:
-                reply_str += "#{} 创建:{} {}\n".format(i + page * 10,
-                                                        datetime_obj.strftime("%Y-%m-%d %H:%M:%S"),
-                                                        "无内容")
-            if results[i]['create_timestamp'] == pkg.openai.session.get_session(
-                    session_name).create_timestamp:
-                current = i + page * 10
-
-        reply_str += "\n以上信息倒序排列"
-        if current != -1:
-            reply_str += ",当前会话是 #{}\n".format(current)
-        else:
-            reply_str += ",当前处于全新会话或不在此页"
-
-        reply = [reply_str]
-
-    return reply
-
-
-@command(
-    "resend",
-    "重新获取上一次问题的回复",
-    "!resend",
-    [],
-    False
-)
-def cmd_resend(cmd: str, params: list, session_name: str,
-                text_message: str, launcher_type: str, launcher_id: int,
-                 sender_id: int, is_admin: bool) -> list:
-    """重新获取上一次问题的回复"""
-    reply = []
-    
-    session = pkg.openai.session.get_session(session_name)
-    to_send = session.undo()
-
-    mgr = pkg.utils.context.get_qqbot_manager()
-
-    reply = pkg.qqbot.message.process_normal_message(to_send, mgr, config,
-                                                        launcher_type, launcher_id, sender_id)
-    
-    return reply
-
-
-@command(
-    "del",
-    "删除当前会话的历史记录",
-    "!del <序号>\n!del all",
-    [],
-    False
-)
-def cmd_del(cmd: str, params: list, session_name: str,
-             text_message: str, launcher_type: str, launcher_id: int,
-              sender_id: int, is_admin: bool) -> list:
-    """删除当前会话的历史记录"""
-    reply = []
-    
-    if len(params) == 0:
-        reply = ["[bot]参数不足, 格式: !del <序号>\n可以通过!list查看序号"]
-    else:
-        if params[0] == 'all':
-            pkg.openai.session.get_session(session_name).delete_all_history()
-            reply = ["[bot]已删除所有历史会话"]
-        elif params[0].isdigit():
-            if pkg.openai.session.get_session(session_name).delete_history(int(params[0])):
-                reply = ["[bot]已删除历史会话 #{}".format(params[0])]
-            else:
-                reply = ["[bot]没有历史会话 #{}".format(params[0])]
-        else:
-            reply = ["[bot]参数错误, 格式: !del <序号>\n可以通过!list查看序号"]
-    return reply
-
-
-@command(
-    "default",
-    "操作情景预设",
-    "!default\n!default [指定情景预设为默认]",
-    [],
-    False
-)
-def cmd_default(cmd: str, params: list, session_name: str,
-                text_message: str, launcher_type: str, launcher_id: int,
-                 sender_id: int, is_admin: bool) -> list:
-    """操作情景预设"""
-    reply = []
-
-    if len(params) == 0:
-        # 输出目前所有情景预设
-        import pkg.openai.dprompt as dprompt
-        reply_str = "[bot]当前所有情景预设:\n\n"
-        for key,value in dprompt.get_prompt_dict().items():
-            reply_str += "  - {}: {}\n".format(key,value)
-
-        reply_str += "\n当前默认情景预设:{}\n".format(dprompt.get_current())
-        reply_str += "请使用!default <情景预设>来设置默认情景预设"
-        reply = [reply_str]
-    elif len(params) >0  and is_admin:
-        # 设置默认情景
-        import pkg.openai.dprompt as dprompt
-        try:
-            dprompt.set_current(params[0])
-            reply = ["[bot]已设置默认情景预设为:{}".format(dprompt.get_current())]
-        except KeyError:
-            reply = ["[bot]err: 未找到情景预设:{}".format(params[0])]
-    else:
-        reply = ["[bot]err: 仅管理员可设置默认情景预设"]
-
-    return reply
-
-
-@command(
-    "delhst",
-    "删除指定会话的所有历史记录",
-    "!delhst <会话名称>\n!delhst all",
-    [],
-    True
-)
-def cmd_delhst(cmd: str, params: list, session_name: str,
-                text_message: str, launcher_type: str, launcher_id: int,
-                 sender_id: int, is_admin: bool) -> list:
-    """删除指定会话的所有历史记录"""
-    reply = []
-    
-    if len(params) == 0:
-        reply = ["[bot]err:请输入要删除的会话名: group_<群号> 或者 person_<QQ号>, 或使用 !delhst all 删除所有会话的历史记录"]
-    else:
-        if params[0] == "all":
-            pkg.utils.context.get_database_manager().delete_all_session_history()
-            reply = ["[bot]已删除所有会话的历史记录"]
-        else:
-            if pkg.utils.context.get_database_manager().delete_all_history(params[0]):
-                reply = ["[bot]已删除会话 {} 的所有历史记录".format(params[0])]
-            else:
-                reply = ["[bot]未找到会话 {} 的历史记录".format(params[0])]
-
-    return reply

pkg/qqbot/cmds/session/default.py

@@ -0,0 +1,73 @@
+from ..mgr import AbstractCommandNode, Context
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="default",
+    description="操作情景预设",
+    usage="!default\n!default set [指定情景预设为默认]",
+    aliases=[],
+    privilege=1
+)
+class DefaultCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.openai.session
+        session_name = ctx.session_name
+        params = ctx.params
+        reply = []
+        import config
+
+        if len(params) == 0:
+            # 输出目前所有情景预设
+            import pkg.openai.dprompt as dprompt
+            reply_str = "[bot]当前所有情景预设({}模式):\n\n".format(config.preset_mode)
+
+            prompts = dprompt.mode_inst().list()
+
+            for key in prompts:
+                pro = prompts[key]
+                reply_str += "名称: {}".format(key)
+
+                for r in pro:
+                    reply_str += "\n   - [{}]: {}".format(r['role'], r['content'])
+
+                reply_str += "\n\n"
+
+            reply_str += "\n当前默认情景预设:{}\n".format(dprompt.mode_inst().get_using_name())
+            reply_str += "请使用 !default set <情景预设名称> 来设置默认情景预设"
+            reply = [reply_str]
+        elif params[0] != "set":
+            reply = ["[bot]err: 已弃用，请使用!default set <情景预设名称> 来设置默认情景预设"]
+        else:
+            return False, []
+
+        return True, reply
+
+
+@AbstractCommandNode.register(
+    parent=DefaultCommand,
+    name="set",
+    description="设置默认情景预设",
+    usage="!default set <情景预设名称>",
+    aliases=[],
+    privilege=2
+)
+class DefaultSetCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        reply = []
+
+        if len(ctx.crt_params) == 0:
+            reply = ["[bot]err: 请指定情景预设名称"]
+        elif len(ctx.crt_params) > 0:
+            import pkg.openai.dprompt as dprompt
+            try:
+                full_name = dprompt.mode_inst().set_using_name(ctx.crt_params[0])
+                reply = ["[bot]已设置默认情景预设为:{}".format(full_name)]
+            except Exception as e:
+                reply = ["[bot]err: {}".format(e)]
+        else:
+            reply = ["[bot]err: 仅管理员可设置默认情景预设"]
+
+        return True, reply

pkg/qqbot/cmds/session/del.py

@@ -0,0 +1,52 @@
+from ..mgr import AbstractCommandNode, Context
+import datetime
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="del",
+    description="删除当前会话的历史记录",
+    usage="!del <序号>\n!del all",
+    aliases=[],
+    privilege=1
+)
+class DelCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.openai.session
+        session_name = ctx.session_name
+        params = ctx.params
+        reply = []
+        if len(params) == 0:
+            reply = ["[bot]参数不足, 格式: !del <序号>\n可以通过!list查看序号"]
+        else:
+            if params[0] == 'all':
+                return False, []
+            elif params[0].isdigit():
+                if pkg.openai.session.get_session(session_name).delete_history(int(params[0])):
+                    reply = ["[bot]已删除历史会话 #{}".format(params[0])]
+                else:
+                    reply = ["[bot]没有历史会话 #{}".format(params[0])]
+            else:
+                reply = ["[bot]参数错误, 格式: !del <序号>\n可以通过!list查看序号"]
+
+        return True, reply
+
+
+@AbstractCommandNode.register(
+    parent=DelCommand,
+    name="all",
+    description="删除当前会话的全部历史记录",
+    usage="!del all",
+    aliases=[],
+    privilege=1
+)
+class DelAllCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.openai.session
+        session_name = ctx.session_name
+        reply = []
+        pkg.openai.session.get_session(session_name).delete_all_history()
+        reply = ["[bot]已删除所有历史会话"]
+        return True, reply

pkg/qqbot/cmds/session/delhst.py

@@ -0,0 +1,50 @@
+from ..mgr import AbstractCommandNode, Context
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="delhst",
+    description="删除指定会话的所有历史记录",
+    usage="!delhst <会话名称>\n!delhst all",
+    aliases=[],
+    privilege=2
+)
+class DelHistoryCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.openai.session
+        import pkg.utils.context
+        params = ctx.params
+        reply = []
+        if len(params) == 0:
+            reply = [
+            "[bot]err:请输入要删除的会话名: group_<群号> 或者 person_<QQ号>, 或使用 !delhst all 删除所有会话的历史记录"]
+        else:
+            if params[0] == 'all':
+                return False, []
+            else:
+                if pkg.utils.context.get_database_manager().delete_all_history(params[0]):
+                    reply = ["[bot]已删除会话 {} 的所有历史记录".format(params[0])]
+                else:
+                    reply = ["[bot]未找到会话 {} 的历史记录".format(params[0])]
+
+        return True, reply
+    
+
+@AbstractCommandNode.register(
+    parent=DelHistoryCommand,
+    name="all",
+    description="删除所有会话的全部历史记录",
+    usage="!delhst all",
+    aliases=[],
+    privilege=2
+)
+class DelAllHistoryCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.utils.context
+        reply = []
+        pkg.utils.context.get_database_manager().delete_all_session_history()
+        reply = ["[bot]已删除所有会话的历史记录"]
+        return True, reply
+    

pkg/qqbot/cmds/session/last.py

@@ -0,0 +1,28 @@
+from ..mgr import AbstractCommandNode, Context
+import datetime
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="last",
+    description="切换前一次对话",
+    usage="!last",
+    aliases=[],
+    privilege=1
+)
+class LastCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.openai.session
+        session_name = ctx.session_name
+
+        reply = []
+        result = pkg.openai.session.get_session(session_name).last_session()
+        if result is None:
+            reply = ["[bot]没有前一次的对话"]
+        else:
+            datetime_str = datetime.datetime.fromtimestamp(result.create_timestamp).strftime(
+                '%Y-%m-%d %H:%M:%S')
+            reply = ["[bot]已切换到前一次的对话：\n创建时间:{}\n".format(datetime_str)]
+
+        return True, reply

pkg/qqbot/cmds/session/list.py

@@ -0,0 +1,67 @@
+from ..mgr import AbstractCommandNode, Context
+import datetime
+import json
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name='list',
+    description='列出当前会话的所有历史记录',
+    usage='!list\n!list [页数]',
+    aliases=[],
+    privilege=1
+)
+class ListCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.openai.session
+        session_name = ctx.session_name
+        params = ctx.params
+        reply = []
+
+        pkg.openai.session.get_session(session_name).persistence()
+        page = 0
+
+        if len(params) > 0:
+            try:
+                page = int(params[0])
+            except ValueError:
+                pass
+
+        results = pkg.openai.session.get_session(session_name).list_history(page=page)
+        if len(results) == 0:
+            reply = ["[bot]第{}页没有历史会话".format(page)]
+        else:
+            reply_str = "[bot]历史会话 第{}页：\n".format(page)
+            current = -1
+            for i in range(len(results)):
+                # 时间(使用create_timestamp转换) 序号 部分内容
+                datetime_obj = datetime.datetime.fromtimestamp(results[i]['create_timestamp'])
+                msg = ""
+                try:
+                    msg = json.loads(results[i]['prompt'])
+                except json.decoder.JSONDecodeError:
+                    msg = pkg.openai.session.reset_session_prompt(session_name, results[i]['prompt'])
+                    # 持久化
+                    pkg.openai.session.get_session(session_name).persistence()
+                if len(msg) >= 2:
+                    reply_str += "#{} 创建:{} {}\n".format(i + page * 10,
+                                                        datetime_obj.strftime("%Y-%m-%d %H:%M:%S"),
+                                                        msg[0]['content'])
+                else:
+                    reply_str += "#{} 创建:{} {}\n".format(i + page * 10,
+                                                        datetime_obj.strftime("%Y-%m-%d %H:%M:%S"),
+                                                        "无内容")
+                if results[i]['create_timestamp'] == pkg.openai.session.get_session(
+                        session_name).create_timestamp:
+                    current = i + page * 10
+
+            reply_str += "\n以上信息倒序排列"
+            if current != -1:
+                reply_str += ",当前会话是 #{}\n".format(current)
+            else:
+                reply_str += ",当前处于全新会话或不在此页"
+
+        reply = [reply_str]
+
+        return True, reply

pkg/qqbot/cmds/session/next.py

@@ -0,0 +1,28 @@
+from ..mgr import AbstractCommandNode, Context
+import datetime
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="next",
+    description="切换后一次对话",
+    usage="!next",
+    aliases=[],
+    privilege=1
+)
+class NextCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.openai.session
+        session_name = ctx.session_name
+        reply = []
+
+        result = pkg.openai.session.get_session(session_name).next_session()
+        if result is None:
+            reply = ["[bot]没有后一次的对话"]
+        else:
+            datetime_str = datetime.datetime.fromtimestamp(result.create_timestamp).strftime(
+                '%Y-%m-%d %H:%M:%S')
+            reply = ["[bot]已切换到后一次的对话：\n创建时间:{}\n".format(datetime_str)]
+
+        return True, reply

pkg/qqbot/cmds/session/prompt.py

@@ -0,0 +1,32 @@
+from ..mgr import AbstractCommandNode, Context
+import datetime
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="prompt",
+    description="获取当前会话的前文",
+    usage="!prompt",
+    aliases=[],
+    privilege=1
+)
+class PromptCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.openai.session
+        session_name = ctx.session_name
+        params = ctx.params
+        reply = []
+
+        msgs = ""
+        session: list = pkg.openai.session.get_session(session_name).prompt
+        for msg in session:
+            if len(params) != 0 and params[0] in ['-all', '-a']:
+                msgs = msgs + "{}: {}\n\n".format(msg['role'], msg['content'])
+            elif len(msg['content']) > 30:
+                msgs = msgs + "[{}]: {}...\n\n".format(msg['role'], msg['content'][:30])
+            else:
+                msgs = msgs + "[{}]: {}\n\n".format(msg['role'], msg['content'])
+        reply = ["[bot]当前对话所有内容：\n{}".format(msgs)]
+
+        return True, reply

pkg/qqbot/cmds/session/resend.py

@@ -0,0 +1,30 @@
+from ..mgr import AbstractCommandNode, Context
+import datetime
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="resend",
+    description="重新获取上一次问题的回复",
+    usage="!resend",
+    aliases=[],
+    privilege=1
+)
+class ResendCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import pkg.openai.session
+        import config
+        session_name = ctx.session_name
+        reply = []
+
+        session = pkg.openai.session.get_session(session_name)
+        to_send = session.undo()
+
+        mgr = pkg.utils.context.get_qqbot_manager()
+
+        reply = pkg.qqbot.message.process_normal_message(to_send, mgr, config,
+                                                        ctx.launcher_type, ctx.launcher_id,
+                                                        ctx.sender_id)
+
+        return True, reply

pkg/qqbot/cmds/session/reset.py

@@ -0,0 +1,34 @@
+from ..mgr import AbstractCommandNode, Context
+
+import pkg.openai.session
+import pkg.utils.context
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name='reset',
+    description='重置当前会话',
+    usage='!reset',
+    aliases=[],
+    privilege=1
+)
+class ResetCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        params = ctx.params
+        session_name = ctx.session_name
+        
+        reply = ""
+
+        if len(params) == 0:
+            pkg.openai.session.get_session(session_name).reset(explicit=True)
+            reply = ["[bot]会话已重置"]
+        else:
+            try:
+                import pkg.openai.dprompt as dprompt
+                pkg.openai.session.get_session(session_name).reset(explicit=True, use_prompt=params[0])
+                reply = ["[bot]会话已重置，使用场景预设:{}".format(dprompt.mode_inst().get_full_name(params[0]))]
+            except Exception as e:
+                reply = ["[bot]会话重置失败：{}".format(e)]
+        
+        return True, reply

pkg/qqbot/cmds/system.py

@@ -1,216 +0,0 @@
-from pkg.qqbot.cmds.model import command
-import pkg.utils.context
-import pkg.utils.updater
-import pkg.utils.credit as credit
-import config
-
-import logging
-import os
-import threading
-import traceback
-import json
-
-@command(
-    "help",
-    "获取帮助信息",
-    "!help",
-    [],
-    False
-)
-def cmd_help(cmd: str, params: list, session_name: str, 
-             text_message: str, launcher_type: str, launcher_id: int,
-                sender_id: int, is_admin: bool) -> list:
-    """获取帮助信息"""
-    return ["[bot]" + config.help_message]
-
-
-@command(
-    "usage",
-    "获取使用情况",
-    "!usage",
-    [],
-    False
-)
-def cmd_usage(cmd: str, params: list, session_name: str,
-                text_message: str, launcher_type: str, launcher_id: int,
-                 sender_id: int, is_admin: bool) -> list:
-    """获取使用情况"""
-    reply = []
-
-    reply_str = "[bot]各api-key使用情况:\n\n"
-
-    api_keys = pkg.utils.context.get_openai_manager().key_mgr.api_key
-    for key_name in api_keys:
-        text_length = pkg.utils.context.get_openai_manager().audit_mgr \
-            .get_text_length_of_key(api_keys[key_name])
-        image_count = pkg.utils.context.get_openai_manager().audit_mgr \
-            .get_image_count_of_key(api_keys[key_name])
-        reply_str += "{}:\n - 文本长度:{}\n - 图片数量:{}\n".format(key_name, int(text_length),
-                                                                    int(image_count))
-        # 获取此key的额度
-        try:
-            http_proxy = config.openai_config["http_proxy"] if "http_proxy" in config.openai_config else None
-            credit_data = credit.fetch_credit_data(api_keys[key_name], http_proxy)
-            reply_str += " - 使用额度:{:.2f}/{:.2f}\n".format(credit_data['total_used'],credit_data['total_granted'])
-        except Exception as e:
-            logging.warning("获取额度失败:{}".format(e))
-
-    reply = [reply_str]
-    return reply
-
-
-@command(
-    "version",
-    "查看版本信息",
-    "!version",
-    [],
-    False
-)
-def cmd_version(cmd: str, params: list, session_name: str,
-                text_message: str, launcher_type: str, launcher_id: int,
-                 sender_id: int, is_admin: bool) -> list:
-    """查看版本信息"""
-    reply = []
-    
-    reply_str = "[bot]当前版本:\n{}\n".format(pkg.utils.updater.get_current_version_info())
-    try:
-        if pkg.utils.updater.is_new_version_available():
-            reply_str += "\n有新版本可用，请使用命令 !update 进行更新"
-    except:
-        pass
-
-    reply = [reply_str]
-
-    return reply
-
-
-@command(
-    "reload",
-    "执行热重载",
-    "!reload",
-    [],
-    True
-)
-def cmd_reload(cmd: str, params: list, session_name: str,
-                text_message: str, launcher_type: str, launcher_id: int,
-                 sender_id: int, is_admin: bool) -> list:
-    """执行热重载"""
-    import pkg.utils.reloader
-    def reload_task():
-        pkg.utils.reloader.reload_all()
-
-    threading.Thread(target=reload_task, daemon=True).start()
-
-
-@command(
-    "update",
-    "更新程序",
-    "!update",
-    [],
-    True
-)
-def cmd_update(cmd: str, params: list, session_name: str,
-                text_message: str, launcher_type: str, launcher_id: int,
-                 sender_id: int, is_admin: bool) -> list:
-    """更新程序"""
-    reply = []
-    import pkg.utils.updater
-    import pkg.utils.reloader
-    import pkg.utils.context
-
-    def update_task():
-        try:
-            if pkg.utils.updater.update_all():
-                pkg.utils.reloader.reload_all(notify=False)
-                pkg.utils.context.get_qqbot_manager().notify_admin("更新完成")
-            else:
-                pkg.utils.context.get_qqbot_manager().notify_admin("无新版本")
-        except Exception as e0:
-            traceback.print_exc()
-            pkg.utils.context.get_qqbot_manager().notify_admin("更新失败:{}".format(e0))
-            return
-
-    threading.Thread(target=update_task, daemon=True).start()
-
-    reply = ["[bot]正在更新，请耐心等待，请勿重复发起更新..."]
-
-
-def config_operation(cmd, params):
-    reply = []
-    config = pkg.utils.context.get_config()
-    reply_str = ""
-    if len(params) == 0:
-        reply = ["[bot]err:请输入配置项"]
-    else:
-        cfg_name = params[0]
-        if cfg_name == 'all':
-            reply_str = "[bot]所有配置项:\n\n"
-            for cfg in dir(config):
-                if not cfg.startswith('__') and not cfg == 'logging':
-                    # 根据配置项类型进行格式化，如果是字典则转换为json并格式化
-                    if isinstance(getattr(config, cfg), str):
-                        reply_str += "{}: \"{}\"\n".format(cfg, getattr(config, cfg))
-                    elif isinstance(getattr(config, cfg), dict):
-                        # 不进行unicode转义，并格式化
-                        reply_str += "{}: {}\n".format(cfg,
-                                                       json.dumps(getattr(config, cfg),
-                                                                  ensure_ascii=False, indent=4))
-                    else:
-                        reply_str += "{}: {}\n".format(cfg, getattr(config, cfg))
-            reply = [reply_str]
-        elif cfg_name in dir(config):
-            if len(params) == 1:
-                # 按照配置项类型进行格式化
-                if isinstance(getattr(config, cfg_name), str):
-                    reply_str = "[bot]配置项{}: \"{}\"\n".format(cfg_name, getattr(config, cfg_name))
-                elif isinstance(getattr(config, cfg_name), dict):
-                    reply_str = "[bot]配置项{}: {}\n".format(cfg_name,
-                                                             json.dumps(getattr(config, cfg_name),
-                                                                        ensure_ascii=False, indent=4))
-                else:
-                    reply_str = "[bot]配置项{}: {}\n".format(cfg_name, getattr(config, cfg_name))
-                reply = [reply_str]
-            else:
-                cfg_value = " ".join(params[1:])
-                # 类型转换，如果是json则转换为字典
-                if cfg_value == 'true':
-                    cfg_value = True
-                elif cfg_value == 'false':
-                    cfg_value = False
-                elif cfg_value.isdigit():
-                    cfg_value = int(cfg_value)
-                elif cfg_value.startswith('{') and cfg_value.endswith('}'):
-                    cfg_value = json.loads(cfg_value)
-                else:
-                    try:
-                        cfg_value = float(cfg_value)
-                    except ValueError:
-                        pass
-
-                # 检查类型是否匹配
-                if isinstance(getattr(config, cfg_name), type(cfg_value)):
-                    setattr(config, cfg_name, cfg_value)
-                    pkg.utils.context.set_config(config)
-                    reply = ["[bot]配置项{}修改成功".format(cfg_name)]
-                else:
-                    reply = ["[bot]err:配置项{}类型不匹配".format(cfg_name)]
-
-        else:
-            reply = ["[bot]err:未找到配置项 {}".format(cfg_name)]
-
-    return reply
-
-
-@command(
-    "cfg",
-    "配置文件相关操作",
-    "!cfg all\n!cfg <配置项名称>\n!cfg <配置项名称> <配置项新值>",
-    [],
-    True
-)
-def cmd_cfg(cmd: str, params: list, session_name: str,
-                text_message: str, launcher_type: str, launcher_id: int,
-                 sender_id: int, is_admin: bool) -> list:
-    """配置文件相关操作"""
-    reply = config_operation(cmd, params)
-    return reply

pkg/qqbot/cmds/system/help.py

@@ -0,0 +1,38 @@
+from ..mgr import AbstractCommandNode, Context, __command_list__
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="help",
+    description="显示帮助信息",
+    usage="!help\n!help <指令名称>",
+    aliases=[],
+    privilege=1
+)
+class HelpCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        command_list = __command_list__
+
+        reply = []
+
+        if len(ctx.params) == 0:
+            reply_str = "[bot]当前所有指令:\n\n"
+
+            # 遍历顶级指令
+            for key in command_list:
+                command = command_list[key]
+                if command['parent'] is None:
+                    reply_str += "!{} - {}\n".format(key, command['description'])
+
+            reply_str += "\n请使用 !help <指令名称> 来查看指令的详细信息"
+
+            reply = [reply_str]
+        else:
+            command_name = ctx.params[0]
+            if command_name in command_list:
+                reply = [command_list[command_name]['cls'].help()]
+            else:
+                reply = ["[bot]指令 {} 不存在".format(command_name)]
+
+        return True, reply

pkg/qqbot/cmds/system/reload.py

@@ -0,0 +1,23 @@
+from ..mgr import AbstractCommandNode, Context
+import threading
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="reload",
+    description="执行热重载",
+    usage="!reload",
+    aliases=[],
+    privilege=2
+)
+class ReloadCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        reply = []
+
+        import pkg.utils.reloader
+        def reload_task():
+            pkg.utils.reloader.reload_all()
+
+        threading.Thread(target=reload_task, daemon=True).start()
+
+        return True, reply

pkg/qqbot/cmds/system/update.py

@@ -0,0 +1,38 @@
+from ..mgr import AbstractCommandNode, Context
+import threading
+import traceback
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="update",
+    description="更新程序",
+    usage="!update",
+    aliases=[],
+    privilege=2
+)
+class UpdateCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        reply = []
+        import pkg.utils.updater
+        import pkg.utils.reloader
+        import pkg.utils.context
+
+        def update_task():
+            try:
+                if pkg.utils.updater.update_all():
+                    pkg.utils.reloader.reload_all(notify=False)
+                    pkg.utils.context.get_qqbot_manager().notify_admin("更新完成")
+                else:
+                    pkg.utils.context.get_qqbot_manager().notify_admin("无新版本")
+            except Exception as e0:
+                traceback.print_exc()
+                pkg.utils.context.get_qqbot_manager().notify_admin("更新失败:{}".format(e0))
+                return
+
+        threading.Thread(target=update_task, daemon=True).start()
+
+        reply = ["[bot]正在更新，请耐心等待，请勿重复发起更新..."]
+
+        return True, reply

pkg/qqbot/cmds/system/usage.py

@@ -0,0 +1,42 @@
+from ..mgr import AbstractCommandNode, Context
+import logging
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="usage",
+    description="获取使用情况",
+    usage="!usage",
+    aliases=[],
+    privilege=1
+)
+class UsageCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        import config
+        import pkg.utils.credit as credit
+        import pkg.utils.context
+
+        reply = []
+
+        reply_str = "[bot]各api-key使用情况:\n\n"
+
+        api_keys = pkg.utils.context.get_openai_manager().key_mgr.api_key
+        for key_name in api_keys:
+            text_length = pkg.utils.context.get_openai_manager().audit_mgr \
+                .get_text_length_of_key(api_keys[key_name])
+            image_count = pkg.utils.context.get_openai_manager().audit_mgr \
+                .get_image_count_of_key(api_keys[key_name])
+            reply_str += "{}:\n - 文本长度:{}\n - 图片数量:{}\n".format(key_name, int(text_length),
+                                                                        int(image_count))
+            # 获取此key的额度
+            try:
+                http_proxy = config.openai_config["http_proxy"] if "http_proxy" in config.openai_config else None
+                credit_data = credit.fetch_credit_data(api_keys[key_name], http_proxy)
+                reply_str += " - 使用额度:{:.2f}/{:.2f}\n".format(credit_data['total_used'],credit_data['total_granted'])
+            except Exception as e:
+                logging.warning("获取额度失败:{}".format(e))
+
+        reply = [reply_str]
+
+        return True, reply

pkg/qqbot/cmds/system/version.py

@@ -0,0 +1,27 @@
+from ..mgr import AbstractCommandNode, Context
+
+
+@AbstractCommandNode.register(
+    parent=None,
+    name="version",
+    description="查看版本信息",
+    usage="!version",
+    aliases=[],
+    privilege=1
+)
+class VersionCommand(AbstractCommandNode):
+    @classmethod
+    def process(cls, ctx: Context) -> tuple[bool, list]:
+        reply = []
+        import pkg.utils.updater
+    
+        reply_str = "[bot]当前版本:\n{}\n".format(pkg.utils.updater.get_current_version_info())
+        try:
+            if pkg.utils.updater.is_new_version_available():
+                reply_str += "\n有新版本可用，请使用命令 !update 进行更新"
+        except:
+            pass
+
+        reply = [reply_str]
+
+        return True, reply

pkg/qqbot/command.py

@@ -13,7 +13,8 @@ import pkg.utils.updater
 import pkg.utils.context
 import pkg.qqbot.message
 import pkg.utils.credit as credit
-import pkg.qqbot.cmds.model as cmdmodel
+# import pkg.qqbot.cmds.model as cmdmodel
+import pkg.qqbot.cmds.mgr as cmdmgr
 
 from mirai import Image
 
@@ -36,22 +37,24 @@ def process_command(session_name: str, text_message: str, mgr, config,
             params = [cmd[1:]] + params
             cmd = 'cfg'
 
-        # 选择指令处理函数
+        # 包装参数
-        cmd_obj = cmdmodel.search(cmd)
+        context = cmdmgr.Context(
-        if cmd_obj is not None and (cmd_obj['admin_only'] is False or is_admin):
+            command=cmd,
-            cmd_func = cmd_obj['func']
+            crt_command=cmd,
-            reply = cmd_func(
+            params=params,
-                cmd=cmd,
+            crt_params=params[:],
-                params=params,
+            session_name=session_name,
-                session_name=session_name,
+            text_message=text_message,
-                text_message=text_message,
+            launcher_type=launcher_type,
-                launcher_type=launcher_type,
+            launcher_id=launcher_id,
-                launcher_id=launcher_id,
+            sender_id=sender_id,
-                sender_id=sender_id,
+            is_admin=is_admin,
-                is_admin=is_admin,
+            privilege=2 if is_admin else 1,  # 普通用户1，管理员2
-            )
+        )
-        else:
+        try:
-            reply = ["[bot]err:未知的指令或权限不足: " + cmd]
+            reply = cmdmgr.execute(context)
+        except cmdmgr.CommandPrivilegeError as e:
+            reply = ["[bot]err:{}".format(e)]
 
         return reply
     except Exception as e:

pkg/qqbot/manager.py

@@ -2,7 +2,6 @@ import asyncio
 import json
 import os
 import threading
-from concurrent.futures import ThreadPoolExecutor
 
 import mirai.models.bus
 from mirai import At, GroupMessage, MessageEvent, Mirai, StrangerMessage, WebSocketAdapter, HTTPAdapter, \
@@ -66,9 +65,6 @@ def random_responding():
 class QQBotManager:
     retry = 3
 
-    #线程池控制
-    pool = None
-
     bot: Mirai = None
 
     reply_filter = None
@@ -78,14 +74,10 @@ class QQBotManager:
     ban_person = []
     ban_group = []
 
-    def __init__(self, mirai_http_api_config: dict, timeout: int = 60, retry: int = 3, pool_num: int = 10, first_time_init=True):
+    def __init__(self, mirai_http_api_config: dict, timeout: int = 60, retry: int = 3, first_time_init=True):
         self.timeout = timeout
         self.retry = retry
 
-        self.pool_num = pool_num
-        self.pool = ThreadPoolExecutor(max_workers=self.pool_num)
-        logging.debug("Registered thread pool Size:{}".format(pool_num))
-
         # 加载禁用列表
         if os.path.exists("banlist.py"):
             import banlist
@@ -138,7 +130,10 @@ class QQBotManager:
 
                 self.on_person_message(event)
 
-            self.go(friend_message_handler, event)
+            pkg.utils.context.get_thread_ctl().submit_user_task(
+                friend_message_handler,
+                event
+            )
 
         @self.bot.on(StrangerMessage)
         async def on_stranger_message(event: StrangerMessage):
@@ -158,7 +153,10 @@ class QQBotManager:
 
                 self.on_person_message(event)
 
-            self.go(stranger_message_handler, event)
+            pkg.utils.context.get_thread_ctl().submit_user_task(
+                stranger_message_handler,
+                event
+            )
 
         @self.bot.on(GroupMessage)
         async def on_group_message(event: GroupMessage):
@@ -178,7 +176,10 @@ class QQBotManager:
 
                 self.on_group_message(event)
 
-            self.go(group_message_handler, event)
+            pkg.utils.context.get_thread_ctl().submit_user_task(
+                group_message_handler,
+                event
+            )
 
         def unsubscribe_all():
             """取消所有订阅

pkg/utils/__init__.py

@@ -0,0 +1 @@
+from .threadctl import ThreadCtl

pkg/utils/context.py

@@ -1,50 +1,94 @@
+import threading
+from pkg.utils import ThreadCtl
+
+
 context = {
     'inst': {
         'database.manager.DatabaseManager': None,
         'openai.manager.OpenAIInteract': None,
         'qqbot.manager.QQBotManager': None,
     },
+    'pool_ctl': None,
     'logger_handler': None,
     'config': None,
     'plugin_host': None,
 }
+context_lock = threading.Lock()
 
-
+### context耦合度非常高，需要大改 ###
 def set_config(inst):
+    context_lock.acquire()
     context['config'] = inst
+    context_lock.release()
 
 
 def get_config():
-    return context['config']
+    context_lock.acquire()
+    t = context['config']
+    context_lock.release()
+    return t
 
 
 def set_database_manager(inst):
+    context_lock.acquire()
     context['inst']['database.manager.DatabaseManager'] = inst
+    context_lock.release()
 
 
 def get_database_manager():
-    return context['inst']['database.manager.DatabaseManager']
+    context_lock.acquire()
+    t = context['inst']['database.manager.DatabaseManager']
+    context_lock.release()
+    return t
 
 
 def set_openai_manager(inst):
+    context_lock.acquire()
     context['inst']['openai.manager.OpenAIInteract'] = inst
+    context_lock.release()
 
 
 def get_openai_manager():
-    return context['inst']['openai.manager.OpenAIInteract']
+    context_lock.acquire()
+    t = context['inst']['openai.manager.OpenAIInteract']
+    context_lock.release()
+    return t
 
 
 def set_qqbot_manager(inst):
+    context_lock.acquire()
     context['inst']['qqbot.manager.QQBotManager'] = inst
+    context_lock.release()
 
 
 def get_qqbot_manager():
-    return context['inst']['qqbot.manager.QQBotManager']
+    context_lock.acquire()
+    t = context['inst']['qqbot.manager.QQBotManager']
+    context_lock.release()
+    return t
 
 
 def set_plugin_host(inst):
+    context_lock.acquire()
     context['plugin_host'] = inst
+    context_lock.release()
 
 
 def get_plugin_host():
-    return context['plugin_host']
+    context_lock.acquire()
+    t = context['plugin_host']
+    context_lock.release()
+    return t
+
+
+def set_thread_ctl(inst):
+    context_lock.acquire()
+    context['pool_ctl'] = inst
+    context_lock.release()
+
+
+def get_thread_ctl() -> ThreadCtl:
+    context_lock.acquire()
+    t: ThreadCtl = context['pool_ctl']
+    context_lock.release()
+    return t

pkg/utils/reloader.py

@@ -3,7 +3,7 @@ import threading
 
 import importlib
 import pkgutil
-import pkg.utils.context
+import pkg.utils.context as context
 import pkg.plugin.host
 
 
@@ -22,20 +22,26 @@ def walk(module, prefix='', path_prefix=''):
 def reload_all(notify=True):
     # 解除bot的事件注册
     import pkg
-    pkg.utils.context.get_qqbot_manager().unsubscribe_all()
+    context.get_qqbot_manager().unsubscribe_all()
     # 执行关闭流程
     logging.info("执行程序关闭流程")
     import main
     main.stop()
 
+    # 删除所有已注册的指令
+    import pkg.qqbot.cmds.mgr as cmdsmgr
+    cmdsmgr.__command_list__ = {}
+    cmdsmgr.__tree_index__ = {}
+
     # 重载所有模块
-    pkg.utils.context.context['exceeded_keys'] = pkg.utils.context.get_openai_manager().key_mgr.exceeded
+    context.context['exceeded_keys'] = context.get_openai_manager().key_mgr.exceeded
-    context = pkg.utils.context.context
+    this_context = context.context
     walk(pkg)
+    importlib.reload(__import__("config-template"))
     importlib.reload(__import__('config'))
     importlib.reload(__import__('main'))
     importlib.reload(__import__('banlist'))
-    pkg.utils.context.context = context
+    context.context = this_context
 
     # 重载插件
     import plugins
@@ -43,8 +49,16 @@ def reload_all(notify=True):
 
     # 执行启动流程
     logging.info("执行程序启动流程")
-    threading.Thread(target=main.main, args=(False,), daemon=False).start()
+    main.load_config()
+    context.get_thread_ctl().reload(
+        admin_pool_num=context.get_config().admin_pool_num,
+        user_pool_num=context.get_config().user_pool_num
+    )
+    context.get_thread_ctl().submit_sys_task(
+        main.start,
+        False
+    )
 
     logging.info('程序启动完成')
     if notify:
-        pkg.utils.context.get_qqbot_manager().notify_admin("重载完成")
+        context.get_qqbot_manager().notify_admin("重载完成")

pkg/utils/threadctl.py

@@ -0,0 +1,96 @@
+import threading
+import time
+from concurrent.futures import ThreadPoolExecutor
+
+
+class Pool:
+    '''
+    线程池结构
+    '''
+    pool_num:int = None
+    ctl:ThreadPoolExecutor = None
+    task_list:list = None
+    task_list_lock:threading.Lock = None
+    monitor_type = True
+
+    def __init__(self, pool_num):
+        self.pool_num = pool_num
+        self.ctl = ThreadPoolExecutor(max_workers = self.pool_num)
+        self.task_list = []
+        self.task_list_lock = threading.Lock()
+    
+    def __thread_monitor__(self):
+        while self.monitor_type:
+            for t in self.task_list:
+                if not t.done():
+                    continue
+                try:
+                    self.task_list.pop(self.task_list.index(t))
+                except:
+                    continue
+            time.sleep(1)
+
+
+class ThreadCtl:
+    def __init__(self, sys_pool_num, admin_pool_num, user_pool_num):
+        '''
+        线程池控制类
+        sys_pool_num：分配系统使用的线程池数量(>=8)
+        admin_pool_num：用于处理管理员消息的线程池数量(>=1)
+        user_pool_num：分配用于处理用户消息的线程池的数量(>=1)
+        '''
+        if sys_pool_num < 5:
+            raise Exception("Too few system threads(sys_pool_num needs >= 8, but received {})".format(sys_pool_num))
+        if admin_pool_num < 1:
+            raise Exception("Too few admin threads(admin_pool_num needs >= 1, but received {})".format(admin_pool_num))
+        if user_pool_num < 1:
+            raise Exception("Too few user threads(user_pool_num needs >= 1, but received {})".format(admin_pool_num))
+        self.__sys_pool__ = Pool(sys_pool_num)
+        self.__admin_pool__ = Pool(admin_pool_num)
+        self.__user_pool__ = Pool(user_pool_num)
+        self.submit_sys_task(self.__sys_pool__.__thread_monitor__)
+        self.submit_sys_task(self.__admin_pool__.__thread_monitor__)
+        self.submit_sys_task(self.__user_pool__.__thread_monitor__)
+
+    def __submit__(self, pool: Pool, fn, /, *args, **kwargs ):
+        t = pool.ctl.submit(fn, *args, **kwargs)
+        pool.task_list_lock.acquire()
+        pool.task_list.append(t)
+        pool.task_list_lock.release()
+        return t
+
+    def submit_sys_task(self, fn, /, *args, **kwargs):
+        return self.__submit__(
+            self.__sys_pool__,
+            fn, *args, **kwargs
+        )
+
+    def submit_admin_task(self, fn, /, *args, **kwargs):
+        return self.__submit__(
+            self.__admin_pool__,
+            fn, *args, **kwargs
+        )
+
+    def submit_user_task(self, fn, /, *args, **kwargs):
+        return self.__submit__(
+            self.__user_pool__,
+            fn, *args, **kwargs
+        )
+
+    def shutdown(self):
+        self.__user_pool__.ctl.shutdown(cancel_futures=True)
+        self.__user_pool__.monitor_type = False
+        self.__admin_pool__.ctl.shutdown(cancel_futures=True)
+        self.__admin_pool__.monitor_type = False
+        self.__sys_pool__.monitor_type = False
+        self.__sys_pool__.ctl.shutdown(wait=True, cancel_futures=False)
+
+    def reload(self, admin_pool_num, user_pool_num):
+        self.__user_pool__.ctl.shutdown(cancel_futures=True)
+        self.__user_pool__.monitor_type = False
+        self.__admin_pool__.ctl.shutdown(cancel_futures=True)
+        self.__admin_pool__.monitor_type = False
+        self.__admin_pool__ = Pool(admin_pool_num)
+        self.__user_pool__ = Pool(user_pool_num)
+        self.submit_sys_task(self.__admin_pool__.__thread_monitor__)
+        self.submit_sys_task(self.__user_pool__.__thread_monitor__)