Release v2.3.0

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

.devcontainer/devcontainer.json

@@ -0,0 +1,34 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
+{
+	"name": "QChatGPT 3.10",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/python:0-3.10",
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "pip3 install --user -r requirements.txt",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+	"customizations": {
+		"codespaces": {
+		  "repositories": {
+			"RockChinQ/QChatGPT": {
+			  "permissions": "write-all"
+			},
+			"RockChinQ/revLibs": {
+			  "permissions": "write-all"
+			}
+		  }
+		}
+	  }
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

.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: 报错或漏洞请使用这个模板创建
-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/pull_request_template.md

@@ -0,0 +1,25 @@
+## 概述
+
+实现/解决/优化的内容: 
+
+### 事务
+
+- [ ] 已阅读仓库[贡献指引](../CONTRIBUTING.md)
+- [ ] 已与维护者在issues或其他平台沟通此PR大致内容
+
+## 以下内容可在起草PR后、合并PR前逐步完成
+
+### 功能
+
+- [ ] 已编写完善的配置文件字段说明（若有新增）
+- [ ] 已编写面向用户的新功能说明（若有必要）
+- [ ] 已测试新功能或更改
+
+### 兼容性
+
+- [ ] 已处理版本兼容性
+- [ ] 已处理插件兼容问题
+
+### 风险
+
+可能导致或已知的问题: 

.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

@@ -11,4 +11,10 @@ prompts/
 logs/
 sensitive.json
 temp/
-current_tag
+current_tag
+scenario/
+!scenario/default-template.json
+override.json
+cookies.json
+res/announcement_saved
+cmdpriv.json

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "QChatGPT.wiki"]
+	path = QChatGPT.wiki
+	url = https://github.com/RockChinQ/QChatGPT.wiki.git

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

@@ -1,24 +1,32 @@
 # QChatGPT🤖
-> 2023/3/3  官方接口疑似被墙，可考虑使用网络代理 [#198](https://github.com/RockChinQ/QChatGPT/issues/198)  
+
+> 2023/3/18 现已支持GPT-4 API（内测），请查看`config-template.py`中的`completion_api_params`  
+> 2023/3/15 逆向库已支持New Bing，使用方法查看[插件文档](https://github.com/RockChinQ/revLibs)  
+> 2023/3/15 逆向库已支持GPT-4模型，使用方法查看[插件](https://github.com/RockChinQ/revLibs)   
 > 2023/3/3  现已在主线支持官方ChatGPT接口，使用方法查看[#195](https://github.com/RockChinQ/QChatGPT/issues/195)  
-> 2023/3/2  OpenAI已发布ChatGPT官方接口，我们正在全力接入，预计明日前完成，请查看[此PR](https://github.com/RockChinQ/QChatGPT/pull/194)  
-> 2023/2/16 现已支持接入ChatGPT网页版，详情请完成部署并查看底部**插件**小节或[此仓库](https://github.com/RockChinQ/revLibs)
 
 - 到[项目Wiki](https://github.com/RockChinQ/QChatGPT/wiki)可了解项目详细信息
-- 由bilibili TheLazy制作的[视频教程](https://www.bilibili.com/video/BV15v4y1X7aP)
-- 交流、答疑群: ~~204785790~~（已满）、691226829、656285629  
+- ~~由bilibili TheLazy制作的[视频教程](https://www.bilibili.com/video/BV15v4y1X7aP)~~（寄了，求大佬做个新的）
+- 交流、答疑群: ~~204785790~~（已满）、~~691226829~~（已满）、656285629  
   - **进群提问前请您`确保`已经找遍文档和issue均无法解决**  
 - QQ频道机器人见[QQChannelChatGPT](https://github.com/Soulter/QQChannelChatGPT)
+- 欢迎各种形式的贡献，请查看[贡献指引](CONTRIBUTING.md)
 
 通过调用OpenAI的ChatGPT等语言模型来实现一个更加智能的QQ机器人  
 
 ## 🍺模型适配一览
 
+<details>
+<summary>点击此处展开</summary>
+
 ### 文字对话
 
 - OpenAI GPT-3.5模型(ChatGPT API), 本项目原生支持, 默认使用
-- OpenAI GPT-3模型, 本项目原生支持, 部署完成后前往config.py切换
-- ChatGPT网页版逆向API, 由[插件](https://github.com/RockChinQ/revLibs)接入
+- OpenAI GPT-3模型, 本项目原生支持, 部署完成后前往`config.py`切换
+- OpenAI GPT-4模型, 本项目原生支持, 目前需要您的账户通过OpenAI的内测申请, 请前往`config.py`切换
+- ChatGPT网页版GPT-3.5模型, 由[插件](https://github.com/RockChinQ/revLibs)接入
+- ChatGPT网页版GPT-4模型, 目前需要ChatGPT Plus订阅, 由[插件](https://github.com/RockChinQ/revLibs)接入
+- New Bing逆向库, 由[插件](https://github.com/RockChinQ/revLibs)接入
 
 ### 故事续写
 
@@ -32,6 +40,10 @@
 ### 语音生成
 
 - TTS+VITS, 由[插件](https://github.com/dominoar/QChatPlugins)接入
+- Plachta/VITS-Umamusume-voice-synthesizer, 由[插件](https://github.com/oliverkirk-sudo/chat_voice)接入
+
+
+</details>
 
 ## ✅功能
 
@@ -106,19 +118,26 @@
     - “丢弃”策略：此分钟内对话次数达到限制时，丢弃之后的对话
   - 详细请查看config.py中的相关配置
 </details>
+<details>
+<summary>✅支持使用网络代理</summary>
+
+  - 目前已支持正向代理访问接口
+  - 详细请查看config.py中的`openai_config`的说明
+</details>
 
 详情请查看[Wiki功能使用页](https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E5%8A%9F%E8%83%BD%E7%82%B9%E5%88%97%E4%B8%BE)
 
 ## 🔩部署
 
-**部署过程中遇到任何问题，请先在[QChatGPT](https://github.com/RockChinQ/QChatGPT/issues)或[qcg-installer](https://github.com/RockChinQ/qcg-installer/issues)的issue里进行搜索**
+**部署过程中遇到任何问题，请先在[QChatGPT](https://github.com/RockChinQ/QChatGPT/issues)或[qcg-installer](https://github.com/RockChinQ/qcg-installer/issues)的issue里进行搜索**  
 
 ### - 注册OpenAI账号
 
-**可以直接进群找群主购买**  
-或参考以下文章自行注册
+> 若您要直接使用非OpenAI的模型（如New Bing），可跳过此步骤，直接进行之后的部署，完成后按照相关插件的文档进行配置即可
 
-> ~~[只需 1 元搞定 ChatGPT 注册](https://zhuanlan.zhihu.com/p/589470082)~~（已失效）  
+参考以下文章自行注册
+
+> [国内注册ChatGPT的方法(100%可用)](https://www.pythonthree.com/register-openai-chatgpt/)  
 > [手把手教你如何注册ChatGPT，超级详细](https://guxiaobei.com/51461)
 
 注册成功后请前往[个人中心查看](https://beta.openai.com/account/api-keys)api_key  
@@ -131,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)）进行部署
 
 - 安装器目前仅支持部分平台，请到仓库文档查看，其他平台请手动部署
@@ -163,8 +184,7 @@ cd QChatGPT
 2. 安装依赖
 
 ```bash
-pip3 install yiri-mirai openai colorlog func_timeout
-pip3 install dulwich
+pip3 install yiri-mirai openai colorlog func_timeout dulwich Pillow
 ```
 
 3. 运行一次主程序，生成配置文件
@@ -195,7 +215,8 @@ python3 main.py
 
 ## 🚀使用
 
-查看[Wiki功能使用页](https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F)
+**部署完成后必看: [指令说明](https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E6%9C%BA%E5%99%A8%E4%BA%BA%E6%8C%87%E4%BB%A4)**  
+所有功能查看[Wiki功能使用页](https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F)  
 
 ## 🧩插件生态
 
@@ -203,6 +224,9 @@ python3 main.py
 详见[Wiki插件使用页](https://github.com/RockChinQ/QChatGPT/wiki/%E6%8F%92%E4%BB%B6%E4%BD%BF%E7%94%A8)  
 开发教程见[Wiki插件开发页](https://github.com/RockChinQ/QChatGPT/wiki/%E6%8F%92%E4%BB%B6%E5%BC%80%E5%8F%91)
 
+<details>
+<summary>查看插件列表</summary>
+
 ### 示例插件
 
 在`tests/plugin_examples`目录下，将其整个目录复制到`plugins`目录下即可使用
@@ -217,19 +241,23 @@ python3 main.py
 
 - [revLibs](https://github.com/RockChinQ/revLibs) - 将ChatGPT网页版接入此项目，关于[官方接口和网页版有什么区别](https://github.com/RockChinQ/QChatGPT/wiki/%E5%AE%98%E6%96%B9%E6%8E%A5%E5%8F%A3%E4%B8%8EChatGPT%E7%BD%91%E9%A1%B5%E7%89%88)
 - [hello_plugin](https://github.com/RockChinQ/hello_plugin) - `hello_plugin` 的储存库形式，插件开发模板
-- [dominoar/QChatPlugins](https://github.com/dominoar/QchatPlugins) - dominoar编写的诸多新功能插件（语言输出、Ranimg、屏蔽词规则等）
+- [dominoar/QChatPlugins](https://github.com/dominoar/QchatPlugins) - dominoar编写的诸多新功能插件（语音输出、Ranimg、屏蔽词规则等）
 - [dominoar/QCP-NovelAi](https://github.com/dominoar/QCP-NovelAi) - NovelAI 故事叙述与绘画
+- [oliverkirk-sudo/chat_voice](https://github.com/oliverkirk-sudo/chat_voice) - 文字转语音输出，使用HuggingFace上的[VITS-Umamusume-voice-synthesizer模型](https://huggingface.co/spaces/Plachta/VITS-Umamusume-voice-synthesizer)
+- [RockChinQ/WaitYiYan](https://github.com/RockChinQ/WaitYiYan) - 实时获取百度`文心一言`等待列表人数
+- [QChartGPT_Emoticon_Plugin](https://github.com/chordfish-k/QChartGPT_Emoticon_Plugin) - 使机器人根据回复内容发送表情包
+</details>
 
 ## 😘致谢
 
 - [@the-lazy-me](https://github.com/the-lazy-me) 为本项目制作[视频教程](https://www.bilibili.com/video/BV15v4y1X7aP)
 - [@mikumifa](https://github.com/mikumifa) 本项目Docker部署仓库开发者
 - [@dominoar](https://github.com/dominoar) 为本项目开发多种插件
-- [@hissincn](https://github.com/hissincn) 本项目贡献者
-- [@LINSTCL](https://github.com/LINSTCL)   GPT-3.5官方模型适配贡献者
+- [@万神的星空](https://github.com/qq255204159)  整合包发行
+- [@ljcduo](https://github.com/ljcduo)  GPT-4 API内测账号提供
 
-以及其他所有为本项目提供支持的朋友们。
+以及所有[贡献者](https://github.com/RockChinQ/QChatGPT/graphs/contributors)和其他为本项目提供支持的朋友们。
 
-## 👍赞赏
+<!-- ## 👍赞赏
 
-<img alt="赞赏码" src="res/mm_reward_qrcode_1672840549070.png" width="400" height="400"/>
+<img alt="赞赏码" src="res/mm_reward_qrcode_1672840549070.png" width="400" height="400"/> -->

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号，用于接收报错等通知及执行管理员级别指令
@@ -79,15 +94,25 @@ default_prompt = {
     "default": "如果我之后想获取帮助，请你说“输入!help获取帮助”",
 }
 
+# 情景预设格式
+# 参考值：默认方式：normal | 完整情景：full_scenario
+# 默认方式 的格式为上述default_prompt中的内容，或prompts目录下的文件名
+# 完整情景方式 的格式为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"
+
 # 群内响应规则
 # 符合此消息的群内消息即使不包含at机器人也会响应
 # 支持消息前缀匹配及正则表达式匹配
+# 支持设置是否响应at消息、随机响应概率
 # 注意：由消息前缀(prefix)匹配的消息中将会删除此前缀，正则表达式(regexp)匹配的消息不会删除匹配的部分
 #      前缀匹配优先级高于正则表达式匹配
 # 正则表达式简明教程：https://www.runoob.com/regexp/regexp-tutorial.html
 response_rules = {
+    "at": True,  # 是否响应at机器人的消息
     "prefix": ["/ai", "!ai", "！ai", "ai"],
-    "regexp": []  # "为什么.*", "怎么?样.*", "怎么.*", "如何.*", "[Hh]ow to.*", "[Ww]hy not.*", "[Ww]hat is.*", ".*怎么办", ".*咋办"
+    "regexp": [],  # "为什么.*", "怎么?样.*", "怎么.*", "如何.*", "[Hh]ow to.*", "[Ww]hy not.*", "[Ww]hat is.*", ".*怎么办", ".*咋办"
+    "random_rate": 0.0,  # 随机响应概率，0.0-1.0，0.0为不随机响应，1.0为响应所有消息, 仅在前几项判断不通过时生效
 }
 
 # 消息忽略规则
@@ -130,12 +155,16 @@ encourage_sponsor_at_start = True
 # 每次向OpenAI接口发送对话记录上下文的字符数
 # 最大不超过(4096 - max_tokens)个字符，max_tokens为下方completion_api_params中的max_tokens
 # 注意：较大的prompt_submit_length会导致OpenAI账户额度消耗更快
-prompt_submit_length = 1024
+prompt_submit_length = 2048
 
 # OpenAI补全API的参数
 # 请在下方填写模型，程序自动选择接口
 # 现已支持的模型有：
 # 
+#    'gpt-4'
+#    'gpt-4-0314'
+#    'gpt-4-32k'
+#    'gpt-4-32k-0314'
 #    'gpt-3.5-turbo'
 #    'gpt-3.5-turbo-0301'
 #    'text-davinci-003'
@@ -147,10 +176,10 @@ prompt_submit_length = 1024
 #    'text-ada-001'
 #
 # 具体请查看OpenAI的文档: https://beta.openai.com/docs/api-reference/completions/create
+# 请将内容修改到config.py中，请勿修改config-template.py
 completion_api_params = {
     "model": "gpt-3.5-turbo",
     "temperature": 0.9,  # 数值越低得到的回答越理性，取值范围[0, 1]
-    "max_tokens": 1024,  # 每次获取OpenAI接口响应的文字量上限, 不高于4096
     "top_p": 1,  # 生成的文本的文本与要求的符合度, 取值范围[0, 1]
     "frequency_penalty": 0.2,
     "presence_penalty": 1.0,
@@ -183,6 +212,12 @@ blob_message_threshold = 256
 # - "forward": 将长消息转换为转发消息组件发送
 blob_message_strategy = "forward"
 
+# 文字转图片时使用的字体文件路径
+# 当策略为"image"时生效
+#   若在Windows系统下，程序会自动使用Windows自带的微软雅黑字体
+#   若未填写或不存在且不是Windows，将禁用文字转图片功能，改为使用转发消息组件
+font_path = ""
+
 # 消息处理超时重试次数
 retry_times = 3
 
@@ -196,6 +231,19 @@ hide_exce_info_to_user = False
 # 设置为空字符串时，不发送提示信息
 alter_tip_message = '出错了，请稍后再试'
 
+# 线程池相关配置
+# 该参数决定机器人可以同时处理几个人的消息，超出线程池数量的请求会被阻塞，不会被丢弃
+# 如果你不清楚该参数的意义，请不要更改
+# 程序运行本身线程池，无代码层面修改请勿更改
+sys_pool_num = 8
+
+# 执行管理员请求和指令的线程池并行线程数量，一般和管理员数量相等
+admin_pool_num = 2
+
+# 执行用户请求和指令的线程池并行线程数量
+# 如需要更高的并发，可以增大该值
+user_pool_num = 6
+
 # 每个会话的过期时间，单位为秒
 # 默认值20分钟
 session_expire_time = 60 * 20
@@ -235,11 +283,4 @@ help_message = """此机器人通过调用OpenAI的GPT-3大型语言模型生成
 每次会话最后一次交互后{}分钟后会自动结束，结束后将开启新会话，如需继续前一次会话请发送 !last 重新开启
 欢迎到github.com/RockChinQ/QChatGPT 给个star
 
-帮助信息：
-!help - 显示帮助
-!reset - 重置会话
-!last - 切换到前一次的对话
-!next - 切换到后一次的对话
-!prompt - 显示当前对话所有内容
-!list - 列出所有历史会话
-!usage - 列出各个api-key的使用量""".format(session_expire_time // 60)
+指令帮助信息请查看: https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E6%9C%BA%E5%99%A8%E4%BA%BA%E6%8C%87%E4%BB%A4""".format(session_expire_time // 60)

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))

generate_override_all.py

@@ -0,0 +1,23 @@
+# 使用config-template生成override.json的字段全集模板文件override-all.json
+# 关于override.json机制，请参考：https://github.com/RockChinQ/QChatGPT/pull/271
+import json
+import importlib
+
+
+template = importlib.import_module("config-template")
+output_json = {
+    "comment": "这是override.json支持的字段全集, 关于override.json机制, 请查看https://github.com/RockChinQ/QChatGPT/pull/271"
+}
+
+
+for k, v in template.__dict__.items():
+    if k.startswith("__"):
+        continue
+    # 如果是module
+    if type(v) == type(template):
+        continue
+    print(k, v, type(v))
+    output_json[k] = v
+
+with open("override-all.json", "w", encoding="utf-8") as f:
+    json.dump(output_json, f, indent=4, ensure_ascii=False)

main.py

@@ -1,4 +1,5 @@
 import importlib
+import json
 import os
 import shutil
 import threading
@@ -6,14 +7,17 @@ import time
 
 import logging
 import sys
+import traceback
+
+sys.path.append(".")
 
 try:
     import colorlog
 except ImportError:
     # 尝试安装
     import pkg.utils.pkgmgr as pkgmgr
-    pkgmgr.install_requirements("requirements.txt")
     try:
+        pkgmgr.install_requirements("requirements.txt")
         import colorlog
     except ImportError:
         print("依赖不满足,请查看 https://github.com/RockChinQ/qcg-installer/issues/15")
@@ -23,16 +27,15 @@ 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',
     'WARNING': 'yellow',
     'ERROR': 'red',
-    'CRITICAL': 'bold_red',
+    'CRITICAL': 'cyan',
 }
 
 
@@ -45,7 +48,9 @@ def init_db():
 
 def ensure_dependencies():
     import pkg.utils.pkgmgr as pkgmgr
-    pkgmgr.run_pip(["install", "openai", "Pillow", "--upgrade"])
+    pkgmgr.run_pip(["install", "openai", "Pillow", "--upgrade",
+                    "-i", "https://pypi.douban.com/simple/",
+                    "--trusted-host", "pypi.douban.com"])
 
 
 known_exception_caught = False
@@ -72,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 pkg.utils.context
+    import config
 
     if pkg.utils.context.context['logger_handler'] is not None:
         logging.getLogger().removeHandler(pkg.utils.context.context['logger_handler'])
@@ -104,10 +106,46 @@ def reset_logging():
     return sh
 
 
-def main(first_time_init=False):
-    global known_exception_caught
+# 临时函数，用于加载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")
 
-    import config
+    # 检查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
+
+    config = pkg.utils.context.get_config()
     # 更新openai库到最新版本
     if not hasattr(config, 'upgrade_dependencies') or config.upgrade_dependencies:
         print("正在更新依赖库，请等待...")
@@ -122,17 +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')
-
-        import pkg.utils.context
-        pkg.utils.context.set_config(config)
-
-        init_runtime_log_file()
 
         sh = reset_logging()
+        pkg.utils.context.context['logger_handler'] = sh
 
         # 检查是否设置了管理员
         if not (hasattr(config, 'admin_qq') and config.admin_qq != 0):
@@ -163,10 +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
+        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()
 
@@ -188,7 +229,7 @@ def main(first_time_init=False):
 
         pkg.plugin.host.initialize_plugins()
 
-        if first_time_init:  # 不是热重载之后的启动,则不启动新的bot线程
+        if first_time_init:  # 不是热重载之后的启动,则启动新的bot线程
 
             import mirai.exceptions
 
@@ -234,11 +275,19 @@ def main(first_time_init=False):
                             "捕捉到未知异常:{}, 请前往 https://github.com/RockChinQ/QChatGPT/issues 查找或提issue".format(e))
                         known_exception_caught = True
                         raise e
-
-            qq_bot_thread = threading.Thread(target=run_bot_wrapper, args=(), daemon=True)
-            qq_bot_thread.start()
+                finally:
+                    time.sleep(12)
+            threading.Thread(
+                target=run_bot_wrapper
+            ).start()
     finally:
+        # 判断若是Windows，输出选择模式可能会暂停程序的警告
+        if os.name == 'nt':
+            time.sleep(2)
+            logging.info("您正在使用Windows系统，若命令行窗口处于“选择”模式，程序可能会被暂停，此时请右键点击窗口空白区域使其取消选择模式。")
+
         time.sleep(12)
+        
         if first_time_init:
             if not known_exception_caught:
                 logging.info('程序启动完成,如长时间未显示 ”成功登录到账号xxxxx“ ,并且不回复消息,请查看 '
@@ -270,28 +319,24 @@ def main(first_time_init=False):
     import pkg.utils.updater
     try:
         if pkg.utils.updater.is_new_version_available():
-            pkg.utils.context.get_qqbot_manager().notify_admin("新版本可用，请发送 !update 进行自动更新\n更新日志:\n{}".format("\n".join(pkg.utils.updater.get_rls_notes())))
+            logging.info("新版本可用，请发送 !update 进行自动更新\n更新日志:\n{}".format("\n".join(pkg.utils.updater.get_rls_notes())))
         else:
             logging.info("当前已是最新版本")
 
     except Exception as e:
         logging.warning("检查更新失败:{}".format(e))
 
-    while True:
-        try:
-            time.sleep(10)
-            if qqbot != pkg.utils.context.get_qqbot_manager():  # 已经reload了
-                logging.info("以前的main流程由于reload退出")
-                break
-        except KeyboardInterrupt:
-            stop()
-
-            print("程序退出")
-            sys.exit(0)
+    try:
+        import pkg.utils.announcement as announcement
+        new_announcement = announcement.fetch_new()
+        if new_announcement != "":
+            logging.critical("[公告] {}".format(new_announcement))
+    except Exception as e:
+        logging.warning("获取公告失败:{}".format(e))
 
+    return qqbot
 
 def stop():
-    import pkg.utils.context
     import pkg.qqbot.manager
     import pkg.openai.session
     try:
@@ -310,8 +355,8 @@ def stop():
             raise e
 
 
-if __name__ == '__main__':
-    # 检查是否有config.py,如果没有就把config-template.py复制一份,并退出程序
+def check_file():
+    # 配置文件存在性校验
     if not os.path.exists('config.py'):
         shutil.copy('config-template.py', 'config.py')
         print('请先在config.py中填写配置')
@@ -325,6 +370,14 @@ if __name__ == '__main__':
     if not os.path.exists("sensitive.json"):
         shutil.copy("sensitive-template.json", "sensitive.json")
 
+    # 检查是否有scenario/default.json
+    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/")
@@ -335,29 +388,63 @@ 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)
 
     elif len(sys.argv) > 1 and sys.argv[1] == 'update':
-        try:
-            try:
-                import pkg.utils.pkgmgr
-                pkg.utils.pkgmgr.ensure_dulwich()
-            except:
-                pass
-
-            from dulwich import porcelain
-
-            repo = porcelain.open_repo('.')
-            porcelain.pull(repo)
-        except ModuleNotFoundError:
-            print("dulwich模块未安装,请查看 https://github.com/RockChinQ/QChatGPT/issues/77")
+        print("正在进行程序更新...")
+        import pkg.utils.updater as updater
+        updater.update_all(cli=True)
         sys.exit(0)
 
-    # import pkg.utils.configmgr
-    #
-    # pkg.utils.configmgr.set_config_and_reload("quote_origin", False)
+    # 关闭urllib的http警告
     requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 
-    main(True)
+    pkg.utils.context.get_thread_ctl().submit_sys_task(
+        start,
+        True
+    )
+
+    # 主线程循环
+    while True:
+        try:
+            time.sleep(0xFF)
+        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()
+

override-all.json

@@ -0,0 +1,78 @@
+{
+    "comment": "这是override.json支持的字段全集, 关于override.json机制, 请查看https://github.com/RockChinQ/QChatGPT/pull/271",
+    "mirai_http_api_config": {
+        "adapter": "WebSocketAdapter",
+        "host": "localhost",
+        "port": 8080,
+        "verifyKey": "yirimirai",
+        "qq": 1234567890
+    },
+    "openai_config": {
+        "api_key": {
+            "default": "openai_api_key"
+        },
+        "http_proxy": null,
+        "reverse_proxy": null
+    },
+    "admin_qq": 0,
+    "default_prompt": {
+        "default": "如果我之后想获取帮助，请你说“输入!help获取帮助”"
+    },
+    "preset_mode": "normal",
+    "response_rules": {
+        "at": true,
+        "prefix": [
+            "/ai",
+            "!ai",
+            "！ai",
+            "ai"
+        ],
+        "regexp": [],
+        "random_rate": 0.0
+    },
+    "ignore_rules": {
+        "prefix": [
+            "/"
+        ],
+        "regexp": []
+    },
+    "income_msg_check": false,
+    "sensitive_word_filter": true,
+    "baidu_check": false,
+    "baidu_api_key": "",
+    "baidu_secret_key": "",
+    "inappropriate_message_tips": "[百度云]请珍惜机器人，当前返回内容不合规",
+    "encourage_sponsor_at_start": true,
+    "prompt_submit_length": 2048,
+    "completion_api_params": {
+        "model": "gpt-3.5-turbo",
+        "temperature": 0.9,
+        "top_p": 1,
+        "frequency_penalty": 0.2,
+        "presence_penalty": 1.0
+    },
+    "image_api_params": {
+        "size": "256x256"
+    },
+    "quote_origin": true,
+    "include_image_description": true,
+    "process_message_timeout": 30,
+    "show_prefix": false,
+    "blob_message_threshold": 256,
+    "blob_message_strategy": "forward",
+    "font_path": "",
+    "retry_times": 3,
+    "hide_exce_info_to_user": false,
+    "alter_tip_message": "出错了，请稍后再试",
+    "sys_pool_num": 8,
+    "admin_pool_num": 2,
+    "user_pool_num": 6,
+    "session_expire_time": 1200,
+    "rate_limitation": 60,
+    "rate_limit_strategy": "wait",
+    "rate_limit_drop_tip": "本分钟对话次数超过限速次数，此对话被丢弃",
+    "upgrade_dependencies": true,
+    "report_usage": true,
+    "logging_level": 20,
+    "help_message": "此机器人通过调用OpenAI的GPT-3大型语言模型生成回复，不具有情感。\n你可以用自然语言与其交流，回复的消息中[GPT]开头的为模型生成的语言，[bot]开头的为程序提示。\n了解此项目请找QQ 1010553892 联系作者\n请不要用其生成整篇文章或大段代码，因为每次只会向模型提交少部分文字，生成大部分文字会产生偏题、前后矛盾等问题\n每次会话最后一次交互后20分钟后会自动结束，结束后将开启新会话，如需继续前一次会话请发送 !last 重新开启\n欢迎到github.com/RockChinQ/QChatGPT 给个star\n\n指令帮助信息请查看: https://github.com/RockChinQ/QChatGPT/wiki/%E5%8A%9F%E8%83%BD%E4%BD%BF%E7%94%A8#%E6%9C%BA%E5%99%A8%E4%BA%BA%E6%8C%87%E4%BB%A4"
+}

pkg/audit/__init__.py

@@ -0,0 +1,3 @@
+"""
+审计相关操作
+"""

pkg/audit/gatherer.py

@@ -1,3 +1,7 @@
+"""
+使用量统计以及数据上报功能实现
+"""
+
 import hashlib
 import json
 import logging
@@ -10,8 +14,11 @@ import pkg.utils.updater
 
 class DataGatherer:
     """数据收集器"""
+
     usage = {}
-    """以key值md5为key,{
+    """各api-key的使用量
+    
+    以key值md5为key,{
         "text": {
             "text-davinci-003": 文字量:int,
         },
@@ -25,16 +32,21 @@ class DataGatherer:
     def __init__(self):
         self.load_from_db()
         try:
-            self.version_str = pkg.utils.updater.get_current_tag()
+            self.version_str = pkg.utils.updater.get_current_tag()  # 从updater模块获取版本号
         except:
             pass
 
     def report_to_server(self, subservice_name: str, count: int):
+        """向中央服务器报告使用量
+
+        只会报告此次请求的使用量，不会报告总量。
+        不包含除版本号、使用类型、使用量以外的任何信息，仅供开发者分析使用情况。
+        """
         try:
             config = pkg.utils.context.get_config()
             if hasattr(config, "report_usage") and not config.report_usage:
                 return
-            res = requests.get("http://rockchin.top:18989/usage?service_name=qchatgpt.{}&version={}&count={}".format(subservice_name, self.version_str, count))
+            res = requests.get("http://reports.rockchin.top:18989/usage?service_name=qchatgpt.{}&version={}&count={}".format(subservice_name, self.version_str, count))
             if res.status_code != 200 or res.text != "ok":
                 logging.warning("report to server failed, status_code: {}, text: {}".format(res.status_code, res.text))
         except:
@@ -44,7 +56,9 @@ class DataGatherer:
         return self.usage[key_md5] if key_md5 in self.usage else {}
 
     def report_text_model_usage(self, model, total_tokens):
-        key_md5 = pkg.utils.context.get_openai_manager().key_mgr.get_using_key_md5()
+        """调用方报告文字模型请求文字使用量"""
+
+        key_md5 = pkg.utils.context.get_openai_manager().key_mgr.get_using_key_md5()  # 以key的md5进行储存
 
         if key_md5 not in self.usage:
             self.usage[key_md5] = {}
@@ -62,6 +76,8 @@ class DataGatherer:
         self.report_to_server("text", length)
 
     def report_image_model_usage(self, size):
+        """调用方报告图片模型请求图片使用量"""
+
         key_md5 = pkg.utils.context.get_openai_manager().key_mgr.get_using_key_md5()
 
         if key_md5 not in self.usage:
@@ -79,6 +95,7 @@ class DataGatherer:
         self.report_to_server("image", 1)
 
     def get_text_length_of_key(self, key):
+        """获取指定api-key (明文) 的文字总使用量(本地记录)"""
         key_md5 = hashlib.md5(key.encode('utf-8')).hexdigest()
         if key_md5 not in self.usage:
             return 0
@@ -88,6 +105,8 @@ class DataGatherer:
         return sum(self.usage[key_md5]["text"].values())
 
     def get_image_count_of_key(self, key):
+        """获取指定api-key (明文) 的图片总使用量(本地记录)"""
+
         key_md5 = hashlib.md5(key.encode('utf-8')).hexdigest()
         if key_md5 not in self.usage:
             return 0
@@ -97,6 +116,7 @@ class DataGatherer:
         return sum(self.usage[key_md5]["image"].values())
 
     def get_total_text_length(self):
+        """获取所有api-key的文字总使用量(本地记录)"""
         total = 0
         for key in self.usage:
             if "text" not in self.usage[key]:

pkg/database/__init__.py

@@ -0,0 +1,3 @@
+"""
+数据库操作封装
+"""

pkg/database/manager.py

@@ -1,3 +1,6 @@
+"""
+数据库管理模块
+"""
 import hashlib
 import json
 import logging
@@ -9,9 +12,9 @@ import sqlite3
 import pkg.utils.context
 
 
-# 数据库管理
-# 为其他模块提供数据库操作接口
 class DatabaseManager:
+    """封装数据库底层操作，并提供方法给上层使用"""
+
     conn = None
     cursor = None
 
@@ -23,21 +26,25 @@ class DatabaseManager:
 
     # 连接到数据库文件
     def reconnect(self):
+        """连接到数据库"""
         self.conn = sqlite3.connect('database.db', check_same_thread=False)
         self.cursor = self.conn.cursor()
 
     def close(self):
         self.conn.close()
 
-    def execute(self, *args, **kwargs) -> Cursor:
+    def __execute__(self, *args, **kwargs) -> Cursor:
         # logging.debug('SQL: {}'.format(sql))
+        logging.debug('SQL: {}'.format(args))
         c = self.cursor.execute(*args, **kwargs)
         self.conn.commit()
         return c
 
     # 初始化数据库的函数
     def initialize_database(self):
-        self.execute("""
+        """创建数据表"""
+
+        self.__execute__("""
         create table if not exists `sessions` (
             `id` INTEGER PRIMARY KEY AUTOINCREMENT,
             `name` varchar(255) not null,
@@ -46,11 +53,31 @@ class DatabaseManager:
             `create_timestamp` bigint not null,
             `last_interact_timestamp` bigint not null,
             `status` varchar(255) not null default 'on_going',
-            `prompt` text not null
+            `default_prompt` text not null default '',
+            `prompt` text not null,
+            `token_counts` text not null default '[]'
         )
         """)
 
-        self.execute("""
+        # 检查sessions表是否存在`default_prompt`字段, 检查是否存在`token_counts`字段
+        self.__execute__("PRAGMA table_info('sessions')")
+        columns = self.cursor.fetchall()
+        has_default_prompt = False
+        has_token_counts = False
+        for field in columns:
+            if field[1] == 'default_prompt':
+                has_default_prompt = True
+            if field[1] == 'token_counts':
+                has_token_counts = True
+            if has_default_prompt and has_token_counts:
+                break
+        if not has_default_prompt:
+            self.__execute__("alter table `sessions` add column `default_prompt` text not null default ''")
+        if not has_token_counts:
+            self.__execute__("alter table `sessions` add column `token_counts` text not null default '[]'")
+
+
+        self.__execute__("""
         create table if not exists `account_fee`(
             `id` INTEGER PRIMARY KEY AUTOINCREMENT,
             `key_md5` varchar(255) not null,
@@ -59,7 +86,7 @@ class DatabaseManager:
         )
         """)
 
-        self.execute("""
+        self.__execute__("""
         create table if not exists `account_usage`(
             `id` INTEGER PRIMARY KEY AUTOINCREMENT,
             `json` text not null
@@ -69,47 +96,49 @@ class DatabaseManager:
 
     # session持久化
     def persistence_session(self, subject_type: str, subject_number: int, create_timestamp: int,
-                            last_interact_timestamp: int, prompt: str):
+                            last_interact_timestamp: int, prompt: str, default_prompt: str = '', token_counts: str = ''):
+        """持久化指定session"""
+
         # 检查是否已经有了此name和create_timestamp的session
         # 如果有，就更新prompt和last_interact_timestamp
         # 如果没有，就插入一条新的记录
-        self.execute("""
+        self.__execute__("""
         select count(*) from `sessions` where `type` = '{}' and `number` = {} and `create_timestamp` = {}
         """.format(subject_type, subject_number, create_timestamp))
         count = self.cursor.fetchone()[0]
         if count == 0:
 
             sql = """
-            insert into `sessions` (`name`, `type`, `number`, `create_timestamp`, `last_interact_timestamp`, `prompt`) 
-            values (?, ?, ?, ?, ?, ?)
+            insert into `sessions` (`name`, `type`, `number`, `create_timestamp`, `last_interact_timestamp`, `prompt`, `default_prompt`, `token_counts`) 
+            values (?, ?, ?, ?, ?, ?, ?, ?)
             """
 
-            self.execute(sql,
-                         ("{}_{}".format(subject_type, subject_number), subject_type, subject_number, create_timestamp,
-                          last_interact_timestamp, prompt))
+            self.__execute__(sql,
+                             ("{}_{}".format(subject_type, subject_number), subject_type, subject_number, create_timestamp,
+                          last_interact_timestamp, prompt, default_prompt, token_counts))
         else:
             sql = """
-            update `sessions` set `last_interact_timestamp` = ?, `prompt` = ? 
+            update `sessions` set `last_interact_timestamp` = ?, `prompt` = ?, `token_counts` = ?
             where `type` = ? and `number` = ? and `create_timestamp` = ?
             """
 
-            self.execute(sql, (last_interact_timestamp, prompt, subject_type,
-                               subject_number, create_timestamp))
+            self.__execute__(sql, (last_interact_timestamp, prompt, token_counts, subject_type,
+                                   subject_number, create_timestamp))
 
     # 显式关闭一个session
     def explicit_close_session(self, session_name: str, create_timestamp: int):
-        self.execute("""
+        self.__execute__("""
         update `sessions` set `status` = 'explicitly_closed' where `name` = '{}' and `create_timestamp` = {}
         """.format(session_name, create_timestamp))
 
     def set_session_ongoing(self, session_name: str, create_timestamp: int):
-        self.execute("""
+        self.__execute__("""
         update `sessions` set `status` = 'on_going' where `name` = '{}' and `create_timestamp` = {}
         """.format(session_name, create_timestamp))
 
     # 设置session为过期
     def set_session_expired(self, session_name: str, create_timestamp: int):
-        self.execute("""
+        self.__execute__("""
         update `sessions` set `status` = 'expired' where `name` = '{}' and `create_timestamp` = {}
         """.format(session_name, create_timestamp))
 
@@ -117,8 +146,8 @@ class DatabaseManager:
     def load_valid_sessions(self) -> dict:
         # 从数据库中加载所有还没过期的session
         config = pkg.utils.context.get_config()
-        self.execute("""
-        select `name`, `type`, `number`, `create_timestamp`, `last_interact_timestamp`, `prompt`, `status`
+        self.__execute__("""
+        select `name`, `type`, `number`, `create_timestamp`, `last_interact_timestamp`, `prompt`, `status`, `default_prompt`, `token_counts`
         from `sessions` where `last_interact_timestamp` > {}
         """.format(int(time.time()) - config.session_expire_time))
         results = self.cursor.fetchall()
@@ -131,6 +160,8 @@ class DatabaseManager:
             last_interact_timestamp = result[4]
             prompt = result[5]
             status = result[6]
+            default_prompt = result[7]
+            token_counts = result[8]
 
             # 当且仅当最后一个该对象的会话是on_going状态时，才会被加载
             if status == 'on_going':
@@ -139,7 +170,9 @@ class DatabaseManager:
                     'subject_number': subject_number,
                     'create_timestamp': create_timestamp,
                     'last_interact_timestamp': last_interact_timestamp,
-                    'prompt': prompt
+                    'prompt': prompt,
+                    'default_prompt': default_prompt,
+                    'token_counts': token_counts
                 }
             else:
                 if session_name in sessions:
@@ -150,8 +183,8 @@ class DatabaseManager:
     # 获取此session_name前一个session的数据
     def last_session(self, session_name: str, cursor_timestamp: int):
 
-        self.execute("""
-        select `name`, `type`, `number`, `create_timestamp`, `last_interact_timestamp`, `prompt`, `status`
+        self.__execute__("""
+        select `name`, `type`, `number`, `create_timestamp`, `last_interact_timestamp`, `prompt`, `status`, `default_prompt`, `token_counts`
         from `sessions` where `name` = '{}' and `last_interact_timestamp` < {} order by `last_interact_timestamp` desc
         limit 1
         """.format(session_name, cursor_timestamp))
@@ -167,20 +200,24 @@ class DatabaseManager:
         last_interact_timestamp = result[4]
         prompt = result[5]
         status = result[6]
+        default_prompt = result[7]
+        token_counts = result[8]
 
         return {
             'subject_type': subject_type,
             'subject_number': subject_number,
             'create_timestamp': create_timestamp,
             'last_interact_timestamp': last_interact_timestamp,
-            'prompt': prompt
+            'prompt': prompt,
+            'default_prompt': default_prompt,
+            'token_counts': token_counts
         }
 
     # 获取此session_name后一个session的数据
     def next_session(self, session_name: str, cursor_timestamp: int):
 
-        self.execute("""
-            select `name`, `type`, `number`, `create_timestamp`, `last_interact_timestamp`, `prompt`, `status`
+        self.__execute__("""
+            select `name`, `type`, `number`, `create_timestamp`, `last_interact_timestamp`, `prompt`, `status`, `default_prompt`, `token_counts`
             from `sessions` where `name` = '{}' and `last_interact_timestamp` > {} order by `last_interact_timestamp` asc
             limit 1
             """.format(session_name, cursor_timestamp))
@@ -196,19 +233,23 @@ class DatabaseManager:
         last_interact_timestamp = result[4]
         prompt = result[5]
         status = result[6]
+        default_prompt = result[7]
+        token_counts = result[8]
 
         return {
             'subject_type': subject_type,
             'subject_number': subject_number,
             'create_timestamp': create_timestamp,
             'last_interact_timestamp': last_interact_timestamp,
-            'prompt': prompt
+            'prompt': prompt,
+            'default_prompt': default_prompt,
+            'token_counts': token_counts
         }
 
     # 列出与某个对象的所有对话session
     def list_history(self, session_name: str, capacity: int, page: int):
-        self.execute("""
-        select `name`, `type`, `number`, `create_timestamp`, `last_interact_timestamp`, `prompt`, `status`
+        self.__execute__("""
+        select `name`, `type`, `number`, `create_timestamp`, `last_interact_timestamp`, `prompt`, `status`, `default_prompt`, `token_counts`
         from `sessions` where `name` = '{}' order by `last_interact_timestamp` desc limit {} offset {}
         """.format(session_name, capacity, capacity * page))
         results = self.cursor.fetchall()
@@ -221,17 +262,42 @@ class DatabaseManager:
             last_interact_timestamp = result[4]
             prompt = result[5]
             status = result[6]
+            default_prompt = result[7]
+            token_counts = result[8]
 
             sessions.append({
                 'subject_type': subject_type,
                 'subject_number': subject_number,
                 'create_timestamp': create_timestamp,
                 'last_interact_timestamp': last_interact_timestamp,
-                'prompt': prompt
+                'prompt': prompt,
+                'default_prompt': default_prompt,
+                'token_counts': token_counts
             })
 
         return sessions
 
+    def delete_history(self, session_name: str, index: int) -> bool:
+        # 删除倒序第index个session
+        # 查找其id再删除
+        self.__execute__("""
+        delete from `sessions` where `id` in (select `id` from `sessions` where `name` = '{}' order by `last_interact_timestamp` desc limit 1 offset {})
+        """.format(session_name, index))
+
+        return self.cursor.rowcount == 1
+
+    def delete_all_history(self, session_name: str) -> bool:
+        self.__execute__("""
+        delete from `sessions` where `name` = '{}'
+        """.format(session_name))
+        return self.cursor.rowcount > 0
+
+    def delete_all_session_history(self) -> bool:
+        self.__execute__("""
+        delete from `sessions`
+        """)
+        return self.cursor.rowcount > 0
+
     # 将apikey的使用量存进数据库
     def dump_api_key_usage(self, api_keys: dict, usage: dict):
         logging.debug('dumping api key usage...')
@@ -246,22 +312,22 @@ class DatabaseManager:
                 usage_count = usage[key_md5]
             # 将使用量存进数据库
             # 先检查是否已存在
-            self.execute("""
+            self.__execute__("""
             select count(*) from `api_key_usage` where `key_md5` = '{}'""".format(key_md5))
             result = self.cursor.fetchone()
             if result[0] == 0:
                 # 不存在则插入
-                self.execute("""
+                self.__execute__("""
                 insert into `api_key_usage` (`key_md5`, `usage`,`timestamp`) values ('{}', {}, {})
                 """.format(key_md5, usage_count, int(time.time())))
             else:
                 # 存在则更新，timestamp设置为当前
-                self.execute("""
+                self.__execute__("""
                 update `api_key_usage` set `usage` = {}, `timestamp` = {} where `key_md5` = '{}'
                 """.format(usage_count, int(time.time()), key_md5))
 
     def load_api_key_usage(self):
-        self.execute("""
+        self.__execute__("""
         select `key_md5`, `usage` from `api_key_usage`
         """)
         results = self.cursor.fetchall()
@@ -273,23 +339,24 @@ class DatabaseManager:
         return usage
 
     def dump_usage_json(self, usage: dict):
+
         json_str = json.dumps(usage)
-        self.execute("""
+        self.__execute__("""
         select count(*) from `account_usage`""")
         result = self.cursor.fetchone()
         if result[0] == 0:
             # 不存在则插入
-            self.execute("""
+            self.__execute__("""
             insert into `account_usage` (`json`) values ('{}')
             """.format(json_str))
         else:
             # 存在则更新
-            self.execute("""
+            self.__execute__("""
             update `account_usage` set `json` = '{}' where `id` = 1
             """.format(json_str))
 
     def load_usage_json(self):
-        self.execute("""
+        self.__execute__("""
         select `json` from `account_usage` order by id desc limit 1
         """)
         result = self.cursor.fetchone()

pkg/openai/__init__.py

@@ -0,0 +1,2 @@
+"""OpenAI 接口处理及会话管理相关
+"""

pkg/openai/dprompt.py

@@ -1,74 +1,145 @@
 # 多情景预设值管理
+import json
+import logging
+import config
+import os
 
-__current__ = "default"
+# __current__ = "default"
+# """当前默认使用的情景预设的名称
 
-__prompts_from_files__ = {}
+# 由管理员使用`!default <名称>`指令切换
+# """
+
+# __prompts_from_files__ = {}
+# """从文件中读取的情景预设值"""
+
+# __scenario_from_files__ = {}
 
 
-def read_prompt_from_file() -> str:
-    """从文件读取预设值"""
-    # 读取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()
+__universal_first_reply__ = "ok, I'll follow your commands."
+"""通用首次回复"""
 
 
-def get_prompt_dict() -> dict:
-    """获取预设值字典"""
+class ScenarioMode:
+    """情景预设模式抽象类"""
+
+    using_prompt_name = "default"
+    """新session创建时使用的prompt名称"""
+
+    prompts: dict[str, list] = {}
+
+    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
+
+
+class NormalScenarioMode(ScenarioMode):
+    """普通情景预设模式"""
+
+    def __init__(self):
+        global __universal_first_reply__
+        # 加载config中的default_prompt值
+        if type(config.default_prompt) == str:
+            self.using_prompt_name = "default"
+            self.prompts = {"default": [
+                {
+                    "role": "user",
+                    "content": config.default_prompt
+                },{
+                    "role": "assistant",
+                    "content": __universal_first_reply__
+                }
+            ]}
+        
+        elif type(config.default_prompt) == dict:
+            for key in config.default_prompt:
+                self.prompts[key] = [
+                    {
+                        "role": "user",
+                        "content": config.default_prompt[key]
+                    },{
+                        "role": "assistant",
+                        "content": __universal_first_reply__
+                    }
+                ]
+
+        # 从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
-    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中
-    for key in __prompts_from_files__:
-        default_prompt[key] = __prompts_from_files__[key]
+    if config.preset_mode == "default":
+        config.preset_mode = "normal"
 
-    return default_prompt
-
-
-def set_current(name):
-    global __current__
-    for key in get_prompt_dict():
-        if key.lower().startswith(name.lower()):
-            __current__ = key
-            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) -> str:
-    """获取预设值"""
-    if name is None:
-        name = get_current()
-
-    default_dict = get_prompt_dict()
-
-    for key in default_dict:
-        if key.lower().startswith(name.lower()):
-            return default_dict[key]
-
-    raise KeyError("未找到情景预设: " + name)
+    return scenario_mode_mapping[config.preset_mode]

pkg/openai/keymgr.py

@@ -5,18 +5,26 @@ import logging
 import pkg.plugin.host as plugin_host
 import pkg.plugin.models as plugin_models
 
+
 class KeysManager:
     api_key = {}
+    """所有api-key"""
 
-    # api-key的使用量
-    # 其中键为api-key的md5值，值为使用量
     using_key = ""
+    """当前使用的api-key
+    """
 
     alerted = []
+    """已提示过超额的key
+    
+    记录在此以避免重复提示
+    """
 
-    # 在此list中的都是经超额报错标记过的api-key
-    # 记录的是key值，仅在运行时有效
     exceeded = []
+    """已超额的key
+    
+    供自动切换功能识别
+    """
 
     def get_using_key(self):
         return self.using_key
@@ -25,8 +33,6 @@ class KeysManager:
         return hashlib.md5(self.using_key.encode('utf-8')).hexdigest()
 
     def __init__(self, api_key):
-        # if hasattr(config, 'api_key_usage_threshold'):
-        #     self.api_key_usage_threshold = config.api_key_usage_threshold
 
         if type(api_key) is dict:
             self.api_key = api_key
@@ -42,9 +48,13 @@ class KeysManager:
 
         self.auto_switch()
 
-    # 根据tested自动切换到可用的api-key
-    # 返回是否切换成功, 切换后的api-key的别名
     def auto_switch(self) -> (bool, str):
+        """尝试切换api-key
+
+        Returns:
+            是否切换成功, 切换后的api-key的别名
+        """
+
         for key_name in self.api_key:
             if self.api_key[key_name] not in self.exceeded:
                 self.using_key = self.api_key[key_name]
@@ -68,12 +78,9 @@ class KeysManager:
     def add(self, key_name, key):
         self.api_key[key_name] = key
 
-    # 设置当前使用的api-key使用量超限
-    # 这是在尝试调用api时发生超限异常时调用的
     def set_current_exceeded(self):
-        # md5 = hashlib.md5(self.using_key.encode('utf-8')).hexdigest()
-        # self.usage[md5] = self.api_key_usage_threshold
-        # self.fee[md5] = self.api_key_fee_threshold
+        """设置当前使用的api-key使用量超限
+        """
         self.exceeded.append(self.using_key)
 
     def get_key_name(self, api_key):
@@ -81,4 +88,4 @@ class KeysManager:
         for key_name in self.api_key:
             if self.api_key[key_name] == api_key:
                 return key_name
-        return ""
+        return ""

pkg/openai/manager.py

@@ -7,9 +7,12 @@ import pkg.utils.context
 import pkg.audit.gatherer
 from pkg.openai.modelmgr import ModelRequest, create_openai_model_request
 
-# 为其他模块提供与OpenAI交互的接口
+
 class OpenAIInteract:
-    api_params = {}
+    """OpenAI 接口封装
+
+    将文字接口和图片接口封装供调用方使用
+    """
 
     key_mgr: pkg.openai.keymgr.KeysManager = None
 
@@ -20,7 +23,6 @@ class OpenAIInteract:
     }
 
     def __init__(self, api_key: str):
-        # self.api_key = api_key
 
         self.key_mgr = pkg.openai.keymgr.KeysManager(api_key)
         self.audit_mgr = pkg.audit.gatherer.DataGatherer()
@@ -32,7 +34,16 @@ class OpenAIInteract:
         pkg.utils.context.set_openai_manager(self)
 
     # 请求OpenAI Completion
-    def request_completion(self, prompts):
+    def request_completion(self, prompts) -> tuple[str, int]:
+        """请求补全接口回复
+
+        Parameters:
+            prompts (str): 提示语
+
+        Returns:
+            str: 回复
+        """
+
         config = pkg.utils.context.get_config()
 
         # 根据模型选择使用的接口
@@ -49,17 +60,28 @@ class OpenAIInteract:
 
         logging.debug("OpenAI response: %s", response)
 
+        # 记录使用量
+        current_round_token = 0
         if 'model' in config.completion_api_params:
             self.audit_mgr.report_text_model_usage(config.completion_api_params['model'],
                                                    ai.get_total_tokens())
+            current_round_token = ai.get_total_tokens()
         elif 'engine' in config.completion_api_params:
             self.audit_mgr.report_text_model_usage(config.completion_api_params['engine'],
                                                    response['usage']['total_tokens'])
+            current_round_token = response['usage']['total_tokens']
 
-        return ai.get_message()
+        return ai.get_message(), current_round_token
 
-    def request_image(self, prompt):
+    def request_image(self, prompt) -> dict:
+        """请求图片接口回复
 
+        Parameters:
+            prompt (str): 提示语
+
+        Returns:
+            dict: 响应
+        """
         config = pkg.utils.context.get_config()
         params = config.image_api_params if hasattr(config, "image_api_params") else self.default_image_api_params
 

pkg/openai/modelmgr.py

@@ -1,5 +1,12 @@
-# 提供与模型交互的抽象接口
+"""OpenAI 接口底层封装
+
+目前使用的对话接口有：
+ChatCompletion - gpt-3.5-turbo 等模型
+Completion - text-davinci-003 等模型
+此模块封装此两个接口的请求实现，为上层提供统一的调用方式
+"""
 import openai, logging, threading, asyncio
+import openai.error as aiE
 
 COMPLETION_MODELS = {
     'text-davinci-003',
@@ -14,6 +21,10 @@ COMPLETION_MODELS = {
 CHAT_COMPLETION_MODELS = {
     'gpt-3.5-turbo',
     'gpt-3.5-turbo-0301',
+    'gpt-4',
+    'gpt-4-0314',
+    'gpt-4-32k',
+    'gpt-4-32k-0314'
 }
 
 EDIT_MODELS = {
@@ -25,26 +36,46 @@ IMAGE_MODELS = {
 }
 
 
-class ModelRequest():
-    """GPT父类"""
-    can_chat = False
-    runtime:threading.Thread = None
-    ret = ""
-    proxy:str = None
+class ModelRequest:
+    """模型接口请求父类"""
 
-    def __init__(self, model_name, user_name, request_fun, http_proxy:str = None):
+    can_chat = False
+    runtime: threading.Thread = None
+    ret = {}
+    proxy: str = None
+    request_ready = True
+    error_info: str = "若在没有任何错误的情况下看到这句话，请带着配置文件上报Issues"
+
+    def __init__(self, model_name, user_name, request_fun, http_proxy:str = None, time_out = None):
         self.model_name = model_name
         self.user_name = user_name
         self.request_fun = request_fun
+        self.time_out = time_out
         if http_proxy != None:
             self.proxy = http_proxy
             openai.proxy = self.proxy
+            self.request_ready = False
 
     async def __a_request__(self, **kwargs):
-        self.ret = await self.request_fun(**kwargs)
+        """异步请求"""
+
+        try:
+            self.ret:dict = await self.request_fun(**kwargs)
+            self.request_ready = True
+        except aiE.APIConnectionError as e:
+            self.error_info = "{}\n请检查网络连接或代理是否正常".format(e)
+            raise ConnectionError(self.error_info)
+        except ValueError as e:
+            self.error_info = "{}\n该错误可能是由于http_proxy格式设置错误引起的"
+        except Exception as e:
+            self.error_info = "{}\n由于请求异常产生的未知错误，请查看日志".format(e)
+            raise Exception(self.error_info)
 
     def request(self, **kwargs):
+        """向接口发起请求"""
+
         if self.proxy != None: #异步请求
+            self.request_ready = False
             loop = asyncio.new_event_loop()
             self.runtime = threading.Thread(
                 target=loop.run_until_complete,
@@ -64,13 +95,15 @@ class ModelRequest():
         若重写该方法，应检查异步线程状态，或在需要检查处super该方法
         '''
         if self.runtime != None and isinstance(self.runtime, threading.Thread):
-            self.runtime.join()
-        return
+            self.runtime.join(self.time_out)
+        if self.request_ready:
+            return
+        raise Exception(self.error_info)
 
     def get_total_tokens(self):
         try:
             return self.ret['usage']['total_tokens']
-        except Exception:
+        except:
             return 0
 
     def get_message(self):
@@ -79,8 +112,10 @@ class ModelRequest():
     def get_response(self):
         return self.ret
 
+
 class ChatCompletionModel(ModelRequest):
-    """ChatCompletion类模型"""
+    """ChatCompletion接口的请求实现"""
+
     Chat_role = ['system', 'user', 'assistant']
     def __init__(self, model_name, user_name, http_proxy:str = None, **kwargs):
         if http_proxy == None:
@@ -108,7 +143,8 @@ class ChatCompletionModel(ModelRequest):
 
 
 class CompletionModel(ModelRequest):
-    """Completion类模型"""
+    """Completion接口的请求实现"""
+
     def __init__(self, model_name, user_name, http_proxy:str = None, **kwargs):
         if http_proxy == None:
             request_fun = openai.Completion.create

pkg/openai/session.py

@@ -1,3 +1,8 @@
+"""主线使用的会话管理模块
+
+每个人、每个群单独一个session，session内部保留了对话的上下文，
+"""
+
 import logging
 import threading
 import time
@@ -19,6 +24,7 @@ class SessionOfflineStatus:
     ON_GOING = 'on_going'
     EXPLICITLY_CLOSED = 'explicitly_closed'
 
+
 # 重置session.prompt
 def reset_session_prompt(session_name, prompt):
     # 备份原始数据
@@ -34,7 +40,7 @@ def reset_session_prompt(session_name, prompt):
     prompt = [
         {
             'role': 'system',
-            'content': config.default_prompt['default']
+            'content': config.default_prompt['default'] if type(config.default_prompt) == dict else config.default_prompt
         }
     ]
     # 警告
@@ -43,11 +49,14 @@ def reset_session_prompt(session_name, prompt):
 用户[{}]的数据已被重置，有可能是因为数据版本过旧或存储错误
 原始数据将备份在：
 {}""".format(session_name, bak_path)
-    )
+    )  # 为保证多行文本格式正确故无缩进
     return prompt
 
+
 # 从数据加载session
 def load_sessions():
+    """从数据库加载sessions"""
+
     global sessions
 
     db_inst = pkg.utils.context.get_database_manager()
@@ -63,9 +72,12 @@ def load_sessions():
         temp_session.last_interact_timestamp = session_data[session_name]['last_interact_timestamp']
         try:
             temp_session.prompt = json.loads(session_data[session_name]['prompt'])
+            temp_session.token_counts = json.loads(session_data[session_name]['token_counts'])
         except Exception:
             temp_session.prompt = reset_session_prompt(session_name, session_data[session_name]['prompt'])
             temp_session.persistence()
+        temp_session.default_prompt = json.loads(session_data[session_name]['default_prompt']) if \
+            session_data[session_name]['default_prompt'] else []
 
         sessions[session_name] = temp_session
 
@@ -93,10 +105,19 @@ class Session:
     name = ''
 
     prompt = []
+    """使用list来保存会话中的回合"""
+
+    token_counts = []
+    """每个回合的token数量"""
+
+    default_prompt = []
+    """本session的默认prompt"""
 
     create_timestamp = 0
+    """会话创建时间"""
 
     last_interact_timestamp = 0
+    """上次交互(产生回复)时间"""
 
     just_switched_to_exist_session = False
 
@@ -116,34 +137,27 @@ class Session:
             logging.debug('{},lock release successfully,{}'.format(self.name, self.response_lock))
 
     # 从配置文件获取会话预设信息
-    def get_default_prompt(self, use_default: str=None):
-        config = pkg.utils.context.get_config()
-
+    def get_default_prompt(self, use_default: str = None):
         import pkg.openai.dprompt as dprompt
 
         if use_default is None:
-            current_default_prompt = dprompt.get_prompt(dprompt.get_current())
-        else:
-            current_default_prompt = dprompt.get_prompt(use_default)
+            use_default = dprompt.mode_inst().get_using_name()
 
-        return [
-            {
-                'role': 'user',
-                'content': current_default_prompt
-            },{
-                'role': 'assistant',
-                'content': 'ok'
-            }
-        ]
+        current_default_prompt, _ = dprompt.mode_inst().get_prompt(use_default)
+        return current_default_prompt
 
     def __init__(self, name: str):
         self.name = name
         self.create_timestamp = int(time.time())
         self.last_interact_timestamp = int(time.time())
+        self.prompt = []
+        self.token_counts = []
         self.schedule()
 
         self.response_lock = threading.Lock()
-        self.prompt = self.get_default_prompt()
+
+        self.default_prompt = self.get_default_prompt()
+        logging.debug("prompt is: {}".format(self.default_prompt))
 
     # 设定检查session最后一次对话是否超过过期时间的计时器
     def schedule(self):
@@ -182,14 +196,16 @@ class Session:
     # 请求回复
     # 这个函数是阻塞的
     def append(self, text: str) -> str:
+        """向session中添加一条消息，返回接口回复"""
+
         self.last_interact_timestamp = int(time.time())
 
         # 触发插件事件
-        if self.prompt == self.get_default_prompt():
+        if not self.prompt:
             args = {
                 'session_name': self.name,
                 'session': self,
-                'default_prompt': self.prompt,
+                'default_prompt': self.default_prompt,
             }
 
             event = pkg.plugin.host.emit(plugin_models.SessionFirstMessageReceived, **args)
@@ -199,9 +215,16 @@ class Session:
         config = pkg.utils.context.get_config()
         max_length = config.prompt_submit_length if hasattr(config, "prompt_submit_length") else 1024
 
+        prompts, counts = self.cut_out(text, max_length)
+
+        # 计算请求前的prompt数量
+        total_token_before_query = 0
+        for token_count in counts:
+            total_token_before_query += token_count
+
         # 向API请求补全
-        message = pkg.utils.context.get_openai_manager().request_completion(
-            self.cut_out(text, max_length),
+        message, total_token = pkg.utils.context.get_openai_manager().request_completion(
+            prompts,
         )
 
         # 成功获取，处理回复
@@ -215,14 +238,18 @@ class Session:
             res_ans = '\n\n'.join(res_ans_spt)
 
         # 将此次对话的双方内容加入到prompt中
-        self.prompt.append({'role':'user', 'content':text})
-        self.prompt.append({'role':'assistant', 'content':res_ans})
+        self.prompt.append({'role': 'user', 'content': text})
+        self.prompt.append({'role': 'assistant', 'content': res_ans})
+
+        # 向token_counts中添加本回合的token数量
+        self.token_counts.append(total_token-total_token_before_query)
+        logging.debug("本回合使用token: {}, session counts: {}".format(total_token-total_token_before_query, self.token_counts))
 
         if self.just_switched_to_exist_session:
             self.just_switched_to_exist_session = False
             self.set_ongoing()
 
-        return res_ans if res_ans[0]!='\n' else res_ans[1:]
+        return res_ans if res_ans[0] != '\n' else res_ans[1:]
 
     # 删除上一回合并返回上一回合的问题
     def undo(self) -> str:
@@ -231,38 +258,64 @@ class Session:
         # 删除最后两个消息
         if len(self.prompt) < 2:
             raise Exception('之前无对话，无法撤销')
-    
+
         question = self.prompt[-2]['content']
         self.prompt = self.prompt[:-2]
-        
+        self.token_counts = self.token_counts[:-1]
+
         # 返回上一回合的问题
         return question
 
     # 构建对话体
-    def cut_out(self, msg: str, max_tokens: int) -> list:
-        """将现有prompt进行切割处理，使得新的prompt长度不超过max_tokens"""
-        # 如果用户消息长度超过max_tokens，直接返回
-        
-        temp_prompt = [
-                {
-                    'role': 'user',
-                    'content': msg
-                }
-            ]
+    def cut_out(self, msg: str, max_tokens: int) -> tuple[list, list]:
+        """将现有prompt进行切割处理，使得新的prompt长度不超过max_tokens
 
-        token_count = len(msg)
-        # 倒序遍历prompt
-        for i in range(len(self.prompt) - 1, -1, -1):
-            if token_count >= max_tokens:
+        :return: (新的prompt, 新的token_counts)
+        """
+
+        # 最终由三个部分组成
+        # - default_prompt         情景预设固定值
+        # - changable_prompts      可变部分, 此会话中的历史对话回合
+        # - current_question       当前问题
+
+        # 包装目前的对话回合内容
+        changable_prompts = []
+        changable_counts = []
+        # 倒着来, 遍历prompt的步长为2, 遍历tokens_counts的步长为1
+        changable_index = len(self.prompt) - 1
+        token_count_index = len(self.token_counts) - 1
+
+        packed_tokens = 0
+
+        while changable_index >= 0 and token_count_index >= 0:
+            if packed_tokens + self.token_counts[token_count_index] > max_tokens:
                 break
 
-            # 将prompt加到temp_prompt头部
-            temp_prompt.insert(0, self.prompt[i])
-            token_count += len(self.prompt[i]['content'])
+            changable_prompts.insert(0, self.prompt[changable_index])
+            changable_prompts.insert(0, self.prompt[changable_index - 1])
+            changable_counts.insert(0, self.token_counts[token_count_index])
+            packed_tokens += self.token_counts[token_count_index]
 
-        logging.debug('cut_out: {}'.format(str(temp_prompt)))
+            changable_index -= 2
+            token_count_index -= 1
 
-        return temp_prompt
+        # 将default_prompt和changable_prompts合并
+        result_prompt = self.default_prompt + changable_prompts
+
+        # 添加当前问题
+        result_prompt.append(
+            {
+                'role': 'user',
+                'content': msg
+            }
+        )
+
+        logging.debug('cut_out: {}\nchangable section tokens: {}\npacked counts: {}\nsession counts: {}'.format(json.dumps(result_prompt, ensure_ascii=False, indent=4),
+                                                                             packed_tokens,
+                                                                             changable_counts,
+                                                                             self.token_counts))
+
+        return result_prompt, changable_counts
 
     # 持久化session
     def persistence(self):
@@ -277,11 +330,11 @@ class Session:
         subject_number = int(name_spt[1])
 
         db_inst.persistence_session(subject_type, subject_number, self.create_timestamp, self.last_interact_timestamp,
-                                    json.dumps(self.prompt))
+                                    json.dumps(self.prompt), json.dumps(self.default_prompt), json.dumps(self.token_counts))
 
     # 重置session
     def reset(self, explicit: bool = False, expired: bool = False, schedule_new: bool = True, use_prompt: str = None):
-        if self.prompt[-1]['role'] != "system":
+        if self.prompt:
             self.persistence()
             if explicit:
                 # 触发插件事件
@@ -297,7 +350,10 @@ class Session:
 
             if expired:
                 pkg.utils.context.get_database_manager().set_session_expired(self.name, self.create_timestamp)
-        self.prompt = self.get_default_prompt(use_prompt)
+
+        self.default_prompt = self.get_default_prompt(use_prompt)
+        self.prompt = []
+        self.token_counts = []
         self.create_timestamp = int(time.time())
         self.last_interact_timestamp = int(time.time())
         self.just_switched_to_exist_session = False
@@ -323,9 +379,11 @@ class Session:
             self.last_interact_timestamp = last_one['last_interact_timestamp']
             try:
                 self.prompt = json.loads(last_one['prompt'])
+                self.token_counts = json.loads(last_one['token_counts'])
             except json.decoder.JSONDecodeError:
                 self.prompt = reset_session_prompt(self.name, last_one['prompt'])
                 self.persistence()
+            self.default_prompt = json.loads(last_one['default_prompt']) if last_one['default_prompt'] else []
 
             self.just_switched_to_exist_session = True
             return self
@@ -342,9 +400,11 @@ class Session:
             self.last_interact_timestamp = next_one['last_interact_timestamp']
             try:
                 self.prompt = json.loads(next_one['prompt'])
+                self.token_counts = json.loads(next_one['token_counts'])
             except json.decoder.JSONDecodeError:
                 self.prompt = reset_session_prompt(self.name, next_one['prompt'])
                 self.persistence()
+            self.default_prompt = json.loads(next_one['default_prompt']) if next_one['default_prompt'] else []
 
             self.just_switched_to_exist_session = True
             return self
@@ -352,5 +412,11 @@ class Session:
     def list_history(self, capacity: int = 10, page: int = 0):
         return pkg.utils.context.get_database_manager().list_history(self.name, capacity, page)
 
+    def delete_history(self, index: int) -> bool:
+        return pkg.utils.context.get_database_manager().delete_history(self.name, index)
+
+    def delete_all_history(self) -> bool:
+        return pkg.utils.context.get_database_manager().delete_all_history(self.name)
+
     def draw_image(self, prompt: str):
         return pkg.utils.context.get_openai_manager().request_image(prompt)

pkg/plugin/__init__.py

@@ -0,0 +1,4 @@
+"""插件支持包
+
+包含插件基类、插件宿主以及部分API接口
+"""

pkg/plugin/host.py

@@ -5,6 +5,7 @@ import importlib
 import os
 import pkgutil
 import sys
+import shutil
 import traceback
 
 import pkg.utils.context as context
@@ -116,7 +117,9 @@ def initialize_plugins():
 
 
 def unload_plugins():
-    """ 卸载插件 """
+    """ 卸载插件
+    """
+    # 不再显式卸载插件，因为当程序结束时，插件的析构函数会被系统执行
     # for plugin in __plugins__.values():
     #     if plugin['enabled'] and plugin['instance'] is not None:
     #         if not hasattr(plugin['instance'], '__del__'):
@@ -158,6 +161,22 @@ def install_plugin(repo_url: str):
         main.reset_logging()
 
 
+def uninstall_plugin(plugin_name: str) -> str:
+    """ 卸载插件 """
+    if plugin_name not in __plugins__:
+        raise Exception("插件不存在")
+    
+    # 获取文件夹路径
+    plugin_path = __plugins__[plugin_name]['path'].replace("\\", "/")
+
+    # 剪切路径为plugins/插件名
+    plugin_path = plugin_path.split("plugins/")[1].split("/")[0]
+
+    # 删除文件夹
+    shutil.rmtree("plugins/"+plugin_path)
+    return "plugins/"+plugin_path
+
+
 class EventContext:
     """ 事件上下文 """
     eid = 0

pkg/plugin/models.py

@@ -145,6 +145,7 @@ __current_registering_plugin__ = ""
 
 
 class Plugin:
+    """插件基类"""
 
     host: host.PluginHost
     """插件宿主，提供插件的一些基础功能"""

pkg/qqbot/blob.py

@@ -1,5 +1,4 @@
 # 长消息处理相关
-import logging
 import os
 import time
 import base64
@@ -67,7 +66,7 @@ def check_text(text: str) -> list:
     """检查文本是否为长消息，并转换成该使用的消息链组件"""
     if not hasattr(config, 'blob_message_threshold'):
         return [text]
-    
+
     if len(text) > config.blob_message_threshold:
         if not hasattr(config, 'blob_message_strategy'):
             raise AttributeError('未定义长消息处理策略')
@@ -77,8 +76,6 @@ def check_text(text: str) -> list:
             # 转换成图片
             return [text_to_image(text)]
         elif config.blob_message_strategy == 'forward':
-            # 敏感词屏蔽
-            text = context.get_qqbot_manager().reply_filter.process(text)
 
             # 包装转发消息
             display = ForwardMessageDiaplay(

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/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/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/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

@@ -4,6 +4,7 @@ import json
 import datetime
 import os
 import threading
+import traceback
 
 import pkg.openai.session
 import pkg.openai.manager
@@ -12,151 +13,12 @@ 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.mgr as cmdmgr
 
 from mirai import Image
 
 
-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
-
-
-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].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:权限不足，请使用管理员账号私聊发起"]
-    return reply
-
 
 def process_command(session_name: str, text_message: str, mgr, config,
                     launcher_type: str, launcher_id: int, sender_id: int, is_admin: bool) -> list:
@@ -169,188 +31,32 @@ def process_command(session_name: str, text_message: str, mgr, config,
         cmd = text_message[1:].strip().split(' ')[0]
 
         params = text_message[1:].strip().split(' ')[1:]
-        if cmd == 'help':
-            reply = ["[bot]" + config.help_message]
-        elif cmd == 'reset':
-            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])]
-        elif cmd == 'last':
-            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)]
-        elif cmd == 'next':
-            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)]
-        elif cmd == 'prompt':
-            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)]
-        elif cmd == 'list':
-            pkg.openai.session.get_session(session_name).persistence()
-            page = 0
 
-            if len(params) > 0:
-                try:
-                    page = int(params[0])
-                except ValueError:
-                    pass
+        # 把!~开头的转换成!cfg 
+        if cmd.startswith('~'):
+            params = [cmd[1:]] + params
+            cmd = 'cfg'
 
-            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[1]['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
+        # 包装参数
+        context = cmdmgr.Context(
+            command=cmd,
+            crt_command=cmd,
+            params=params,
+            crt_params=params[:],
+            session_name=session_name,
+            text_message=text_message,
+            launcher_type=launcher_type,
+            launcher_id=launcher_id,
+            sender_id=sender_id,
+            is_admin=is_admin,
+            privilege=2 if is_admin else 1,  # 普通用户1，管理员2
+        )
+        try:
+            reply = cmdmgr.execute(context)
+        except cmdmgr.CommandPrivilegeError as e:
+            reply = ["[bot]err:{}".format(e)]
 
-                reply_str += "\n以上信息倒序排列"
-                if current != -1:
-                    reply_str += ",当前会话是 #{}\n".format(current)
-                else:
-                    reply_str += ",当前处于全新会话或不在此页"
-
-                reply = [reply_str]
-        elif cmd == 'resend':
-            session = pkg.openai.session.get_session(session_name)
-            to_send = session.undo()
-
-            reply = pkg.qqbot.message.process_normal_message(to_send, mgr, config,
-                                                             launcher_type, launcher_id, sender_id)
-        elif cmd == 'usage':
-            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:
-                    credit_data = credit.fetch_credit_data(api_keys[key_name])
-                    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]
-        elif cmd == 'draw':
-            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))
-        elif cmd == 'version':
-            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]
-
-        elif cmd == 'plugin':
-            reply = plugin_operation(cmd, params, is_admin)
-
-        elif cmd == 'default':
-            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: 仅管理员可设置默认情景预设"]
-        elif cmd == 'reload' and is_admin:
-            def reload_task():
-                pkg.utils.reloader.reload_all()
-
-            threading.Thread(target=reload_task, daemon=True).start()
-        elif cmd == 'update' and is_admin:
-            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:
-                    pkg.utils.context.get_qqbot_manager().notify_admin("更新失败:{}".format(e0))
-                    return
-
-            threading.Thread(target=update_task, daemon=True).start()
-
-            reply = ["[bot]正在更新，请耐心等待，请勿重复发起更新..."]
-        elif cmd == 'cfg' and is_admin:
-            reply = config_operation(cmd, params)
-        else:
-            if cmd.startswith("~") and is_admin:
-                config_item = cmd[1:]
-                params = [config_item] + params
-                reply = config_operation("cfg", params)
-            else:
-                reply = ["[bot]err:未知的指令或权限不足: " + cmd]
+        return reply
     except Exception as e:
         mgr.notify_admin("{}指令执行失败:{}".format(session_name, e))
         logging.exception(e)

pkg/qqbot/filter.py

@@ -7,6 +7,8 @@ import logging
 
 class ReplyFilter:
     sensitive_words = []
+    mask = "*"
+    mask_word = ""
 
     # 默认值( 兼容性考虑 )
     baidu_check = False
@@ -14,8 +16,10 @@ class ReplyFilter:
     baidu_secret_key = ""
     inappropriate_message_tips = "[百度云]请珍惜机器人，当前返回内容不合规"
 
-    def __init__(self, sensitive_words: list):
+    def __init__(self, sensitive_words: list, mask: str = "*", mask_word: str = ""):
         self.sensitive_words = sensitive_words
+        self.mask = mask
+        self.mask_word = mask_word
         import config
         if hasattr(config, 'baidu_check') and hasattr(config, 'baidu_api_key') and hasattr(config, 'baidu_secret_key'):
             self.baidu_check = config.baidu_check
@@ -36,7 +40,10 @@ class ReplyFilter:
             match = re.findall(word, message)
             if len(match) > 0:
                 for i in range(len(match)):
-                    message = message.replace(match[i], "*" * len(match[i]))
+                    if self.mask_word == "":
+                        message = message.replace(match[i], self.mask * len(match[i]))
+                    else:
+                        message = message.replace(match[i], self.mask_word)
 
         # 百度云审核
         if self.baidu_check:

pkg/qqbot/manager.py

@@ -21,12 +21,6 @@ import pkg.plugin.host as plugin_host
 import pkg.plugin.models as plugin_models
 
 
-# 并行运行
-def go(func, args=()):
-    thread = threading.Thread(target=func, args=args, daemon=True)
-    thread.start()
-
-
 # 检查消息是否符合泛响应匹配机制
 def check_response_rule(text: str):
     config = pkg.utils.context.get_config()
@@ -51,6 +45,22 @@ def check_response_rule(text: str):
     return False, ""
 
 
+def response_at():
+    config = pkg.utils.context.get_config()
+    if 'at' not in config.response_rules:
+        return True
+
+    return config.response_rules['at']
+
+
+def random_responding():
+    config = pkg.utils.context.get_config()
+    if 'random_rate' in config.response_rules:
+        import random
+        return random.random() < config.response_rules['random_rate']
+    return False
+
+
 # 控制QQ消息输入输出的类
 class QQBotManager:
     retry = 3
@@ -65,7 +75,6 @@ class QQBotManager:
     ban_group = []
 
     def __init__(self, mirai_http_api_config: dict, timeout: int = 60, retry: int = 3, first_time_init=True):
-
         self.timeout = timeout
         self.retry = retry
 
@@ -82,7 +91,12 @@ class QQBotManager:
                 and config.sensitive_word_filter is not None \
                 and config.sensitive_word_filter:
             with open("sensitive.json", "r", encoding="utf-8") as f:
-                self.reply_filter = pkg.qqbot.filter.ReplyFilter(json.load(f)['words'])
+                sensitive_json = json.load(f)
+                self.reply_filter = pkg.qqbot.filter.ReplyFilter(
+                    sensitive_words=sensitive_json['words'],
+                    mask=sensitive_json['mask'] if 'mask' in sensitive_json else '*',
+                    mask_word=sensitive_json['mask_word'] if 'mask_word' in sensitive_json else ''
+                )
         else:
             self.reply_filter = pkg.qqbot.filter.ReplyFilter([])
 
@@ -116,7 +130,10 @@ class QQBotManager:
 
                 self.on_person_message(event)
 
-            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):
@@ -136,7 +153,10 @@ class QQBotManager:
 
                 self.on_person_message(event)
 
-            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):
@@ -156,7 +176,10 @@ class QQBotManager:
 
                 self.on_group_message(event)
 
-            go(group_message_handler, (event,))
+            pkg.utils.context.get_thread_ctl().submit_user_task(
+                group_message_handler,
+                event
+            )
 
         def unsubscribe_all():
             """取消所有订阅
@@ -173,6 +196,9 @@ class QQBotManager:
 
         self.unsubscribe_all = unsubscribe_all
 
+    def go(self, func, *args, **kwargs):
+        self.pool.submit(func, *args, **kwargs)
+
     def first_time_init(self, mirai_http_api_config: dict):
         """热重载后不再运行此函数"""
 
@@ -288,14 +314,19 @@ class QQBotManager:
 
         if Image in event.message_chain:
             pass
-        elif At(self.bot.qq) not in event.message_chain:
-            check, result = check_response_rule(str(event.message_chain).strip())
-
-            if check:
-                reply = process(result.strip())
         else:
-            # 直接调用
-            reply = process()
+            if At(self.bot.qq) in event.message_chain and response_at():
+                # 直接调用
+                reply = process()
+            else:
+                check, result = check_response_rule(str(event.message_chain).strip())
+
+                if check:
+                    reply = process(result.strip())
+                # 检查是否随机响应
+                elif random_responding():
+                    logging.info("随机响应group_{}消息".format(event.group.id))
+                    reply = process()
 
         if reply:
             return self.send(event, reply)

pkg/qqbot/message.py

@@ -1,6 +1,5 @@
 # 普通消息处理模块
 import logging
-import time
 import openai
 import pkg.utils.context
 import pkg.openai.session
@@ -64,7 +63,7 @@ def process_normal_message(text_message: str, mgr, config, launcher_type: str,
                 reply = event.get_return_value("reply")
 
             if not event.is_prevented_default():
-                reply = blob.check_text(prefix + text)
+                reply = [prefix + text]
         except openai.error.APIConnectionError as e:
             err_msg = str(e)
             if err_msg.__contains__('Error communicating with OpenAI'):
@@ -117,8 +116,7 @@ def process_normal_message(text_message: str, mgr, config, launcher_type: str,
                 reply = handle_exception("{}会话调用API失败:{}".format(session_name, e),
                                          "[bot]err:RateLimitError,请重试或联系作者，或等待修复")
         except openai.error.InvalidRequestError as e:
-            reply = handle_exception("{}API调用参数错误:{}\n\n这可能是由于config.py中的prompt_submit_length参数或"
-                             "completion_api_params中的max_tokens参数数值过大导致的，请尝试将其降低".format(
+            reply = handle_exception("{}API调用参数错误:{}\n".format(
                              session_name, e), "[bot]err:API调用参数错误，请联系管理员，或等待修复")
         except openai.error.ServiceUnavailableError as e:
             reply = handle_exception("{}API调用服务不可用:{}".format(session_name, e), "[bot]err:API调用服务不可用，请重试或联系管理员，或等待修复")

pkg/qqbot/process.py

@@ -26,6 +26,7 @@ import pkg.plugin.host as plugin_host
 import pkg.plugin.models as plugin_models
 import pkg.qqbot.ignore as ignore
 import pkg.qqbot.banlist as banlist
+import pkg.qqbot.blob as blob
 
 processing = []
 
@@ -157,6 +158,7 @@ def process_message(launcher_type: str, launcher_id: int, text_message: str, mes
                                                  reply[0][:min(100, len(reply[0]))] + (
                                                      "..." if len(reply[0]) > 100 else "")))
                 reply = [mgr.reply_filter.process(reply[0])]
+                reply = blob.check_text(reply[0])
             else:
                 logging.info("回复[{}]消息".format(session_name))
 

pkg/utils/__init__.py

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

pkg/utils/announcement.py

@@ -0,0 +1,47 @@
+import base64
+import os
+
+import requests
+
+import pkg.utils.network as network
+
+
+def read_latest() -> str:
+    resp = requests.get(
+        url="https://api.github.com/repos/RockChinQ/QChatGPT/contents/res/announcement",
+        proxies=network.wrapper_proxies()
+    )
+    obj_json = resp.json()
+    b64_content = obj_json["content"]
+    # 解码
+    content = base64.b64decode(b64_content).decode("utf-8")
+    return content
+
+
+def read_saved() -> str:
+    # 已保存的在res/announcement_saved
+    # 检查是否存在
+    if not os.path.exists("res/announcement_saved"):
+        with open("res/announcement_saved", "w") as f:
+            f.write("")
+
+    with open("res/announcement_saved", "r") as f:
+        content = f.read()
+
+    return content
+
+
+def write_saved(content: str):
+    # 已保存的在res/announcement_saved
+    with open("res/announcement_saved", "w") as f:
+        f.write(content)
+
+
+def fetch_new() -> str:
+    latest = read_latest()
+    saved = read_saved()
+    if latest.replace(saved, "").strip() == "":
+        return ""
+    else:
+        write_saved(latest)
+        return latest.replace(saved, "").strip()

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/credit.py

@@ -1,13 +1,19 @@
 # OpenAI账号免费额度剩余查询
 import requests
 
-
-def fetch_credit_data(api_key: str) -> dict:
+def fetch_credit_data(api_key: str, http_proxy: str) -> dict:
     """OpenAI账号免费额度剩余查询"""
+    proxies = {
+        "http":http_proxy,
+        "https":http_proxy
+    } if http_proxy is not None else None
+
     resp = requests.get(
         url="https://api.openai.com/dashboard/billing/credit_grants",
         headers={
             "Authorization": "Bearer {}".format(api_key),
-        }
+        },
+        proxies=proxies
     )
+
     return resp.json()

pkg/utils/network.py

@@ -0,0 +1,9 @@
+
+def wrapper_proxies() -> dict:
+    """获取代理"""
+    import config
+
+    return {
+        "http": config.openai_config['proxy'],
+        "https": config.openai_config['proxy']
+    } if 'proxy' in config.openai_config and (config.openai_config['proxy'] is not None) else None

pkg/utils/reloader.py

@@ -3,37 +3,45 @@ import threading
 
 import importlib
 import pkgutil
-import pkg.utils.context
+import pkg.utils.context as context
 import pkg.plugin.host
 
 
-def walk(module, prefix=''):
+def walk(module, prefix='', path_prefix=''):
     """遍历并重载所有模块"""
     for item in pkgutil.iter_modules(module.__path__):
         if item.ispkg:
-            walk(__import__(module.__name__ + '.' + item.name, fromlist=['']), prefix + item.name + '.')
+
+            walk(__import__(module.__name__ + '.' + item.name, fromlist=['']), prefix + item.name + '.', path_prefix + item.name + '/')
         else:
-            logging.info('reload module: {}'.format(prefix + item.name))
+            logging.info('reload module: {}, path: {}'.format(prefix + item.name, path_prefix + item.name + '.py'))
+            pkg.plugin.host.__current_module_path__ = "plugins/" + path_prefix + item.name + '.py'
             importlib.reload(__import__(module.__name__ + '.' + item.name, fromlist=['']))
 
 
 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 = pkg.utils.context.context
+    context.context['exceeded_keys'] = context.get_openai_manager().key_mgr.exceeded
+    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
@@ -41,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/text2img.py

@@ -1,8 +1,37 @@
+import logging
+
 from PIL import Image, ImageDraw, ImageFont
 import re
 import os
+import config
+import traceback
 
-text_render_font = ImageFont.truetype("res/simhei.ttf", 32, encoding="utf-8")
+text_render_font: ImageFont = None
+
+if hasattr(config, "blob_message_strategy") and config.blob_message_strategy == "image":  # 仅在启用了image时才加载字体
+    use_font = config.font_path if hasattr(config, "font_path") else ""
+    try:
+
+        # 检查是否存在
+        if not os.path.exists(use_font):
+            # 若是windows系统，使用微软雅黑
+            if os.name == "nt":
+                use_font = "C:/Windows/Fonts/msyh.ttc"
+                if not os.path.exists(use_font):
+                    logging.warn("未找到字体文件，且无法使用Windows自带字体，更换为转发消息组件以发送长消息，您可以在config.py中调整相关设置。")
+                    config.blob_message_strategy = "forward"
+                else:
+                    logging.info("使用Windows自带字体：" + use_font)
+                    text_render_font = ImageFont.truetype(use_font, 32, encoding="utf-8")
+            else:
+                logging.warn("未找到字体文件，且无法使用Windows自带字体，更换为转发消息组件以发送长消息，您可以在config.py中调整相关设置。")
+                config.blob_message_strategy = "forward"
+        else:
+            text_render_font = ImageFont.truetype(use_font, 32, encoding="utf-8")
+    except:
+        traceback.print_exc()
+        logging.error("加载字体文件失败({})，更换为转发消息组件以发送长消息，您可以在config.py中调整相关设置。".format(use_font))
+        config.blob_message_strategy = "forward"
 
 
 def indexNumber(path=''):
@@ -123,7 +152,7 @@ def text_to_image(text_str: str, save_as="temp.png", width=800):
                 else:
                     continue
     # 准备画布
-    img = Image.new('RGBA', (width, max(280, len(final_lines) * 35 + 45)), (255, 255, 255, 255))
+    img = Image.new('RGBA', (width, max(280, len(final_lines) * 35 + 65)), (255, 255, 255, 255))
     draw = ImageDraw.Draw(img, mode='RGBA')
 
     

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__)

pkg/utils/updater.py

@@ -6,6 +6,7 @@ import requests
 import json
 
 import pkg.utils.constants
+import pkg.utils.network as network
 
 
 def check_dulwich_closure():
@@ -36,7 +37,8 @@ def pull_latest(repo_path: str) -> bool:
 def get_release_list() -> list:
     """获取发行列表"""
     rls_list_resp = requests.get(
-        url="https://api.github.com/repos/RockChinQ/QChatGPT/releases"
+        url="https://api.github.com/repos/RockChinQ/QChatGPT/releases",
+        proxies=network.wrapper_proxies()
     )
 
     rls_list = rls_list_resp.json()
@@ -54,7 +56,7 @@ def get_current_tag() -> str:
     return current_tag
 
 
-def update_all() -> bool:
+def update_all(cli: bool = False) -> bool:
     """检查更新并下载源码"""
     current_tag = get_current_tag()
 
@@ -69,14 +71,24 @@ def update_all() -> bool:
 
         if latest_rls == {}:
             latest_rls = rls
-    logging.info("更新日志: {}".format(rls_notes))
+    if not cli:
+        logging.info("更新日志: {}".format(rls_notes))
+    else:
+        print("更新日志: {}".format(rls_notes))
+
     if latest_rls == {}:  # 没有新版本
         return False
 
     # 下载最新版本的zip到temp目录
-    logging.info("开始下载最新版本: {}".format(latest_rls['zipball_url']))
+    if not cli:
+        logging.info("开始下载最新版本: {}".format(latest_rls['zipball_url']))
+    else:
+        print("开始下载最新版本: {}".format(latest_rls['zipball_url']))
     zip_url = latest_rls['zipball_url']
-    zip_resp = requests.get(url=zip_url)
+    zip_resp = requests.get(
+        url=zip_url,
+        proxies=network.wrapper_proxies()
+    )
     zip_data = zip_resp.content
 
     # 检查temp/updater目录
@@ -87,7 +99,10 @@ def update_all() -> bool:
     with open("temp/updater/{}.zip".format(latest_rls['tag_name']), "wb") as f:
         f.write(zip_data)
 
-    logging.info("下载最新版本完成: {}".format("temp/updater/{}.zip".format(latest_rls['tag_name'])))
+    if not cli:
+        logging.info("下载最新版本完成: {}".format("temp/updater/{}.zip".format(latest_rls['tag_name'])))
+    else:
+        print("下载最新版本完成: {}".format("temp/updater/{}.zip".format(latest_rls['tag_name'])))
 
     # 解压zip到temp/updater/<tag_name>/
     import zipfile
@@ -116,6 +131,15 @@ def update_all() -> bool:
             dst = src.replace(source_root, ".")
             if os.path.exists(dst):
                 os.remove(dst)
+
+            # 检查目标文件夹是否存在
+            if not os.path.exists(os.path.dirname(dst)):
+                os.makedirs(os.path.dirname(dst))
+            # 检查目标文件是否存在
+            if not os.path.exists(dst):
+                # 创建目标文件
+                open(dst, "w").close()
+
             shutil.copy(src, dst)
 
     # 把current_tag写入文件
@@ -124,8 +148,11 @@ def update_all() -> bool:
         f.write(current_tag)
 
     # 通知管理员
-    import pkg.utils.context
-    pkg.utils.context.get_qqbot_manager().notify_admin("已更新到最新版本: {}\n更新日志:\n{}\n新功能通常可以在config-template.py中看到，完整的更新日志请前往 https://github.com/RockChinQ/QChatGPT/releases 查看".format(current_tag, "\n".join(rls_notes)))
+    if not cli:
+        import pkg.utils.context
+        pkg.utils.context.get_qqbot_manager().notify_admin("已更新到最新版本: {}\n更新日志:\n{}\n新功能通常可以在config-template.py中看到，完整的更新日志请前往 https://github.com/RockChinQ/QChatGPT/releases 查看".format(current_tag, "\n".join(rls_notes)))
+    else:
+        print("已更新到最新版本: {}\n更新日志:\n{}\n新功能通常可以在config-template.py中看到，完整的更新日志请前往 https://github.com/RockChinQ/QChatGPT/releases 查看".format(current_tag, "\n".join(rls_notes)))
     return True
 
 
@@ -152,24 +179,12 @@ def get_remote_url(repo_path: str) -> str:
 
 def get_current_version_info() -> str:
     """获取当前版本信息"""
-    check_dulwich_closure()
-
-    from dulwich import porcelain
-
-    repo = porcelain.open_repo('.')
-
-    version_str = ""
-
-    for entry in repo.get_walker():
-        version_str += "提交编号: "+str(entry.commit.id)[2:9] + "\n"
-        tz = datetime.timezone(datetime.timedelta(hours=entry.commit.commit_timezone // 3600))
-        dt = datetime.datetime.fromtimestamp(entry.commit.commit_time, tz)
-        version_str += "时间: "+dt.strftime('%m-%d %H:%M:%S') + "\n"
-        version_str += "说明: "+str(entry.commit.message, encoding="utf-8").strip() + "\n"
-        version_str += "提交作者: '" + str(entry.commit.author)[2:-1] + "'"
-        break
-
-    return version_str
+    rls_list = get_release_list()
+    current_tag = get_current_tag()
+    for rls in rls_list:
+        if rls['tag_name'] == current_tag:
+            return rls['name'] + "\n" + rls['body']
+    return "未知版本"
 
 
 def get_commit_id_and_time_and_msg() -> str:

requirements.txt

@@ -1,5 +1,5 @@
 requests~=2.28.1
-openai~=0.27.0
+openai~=0.27.2
 dulwich~=0.21.3
 colorlog~=6.6.0
 yiri-mirai~=0.2.6.1

res/announcement

@@ -0,0 +1 @@
+

scenario/default-template.json

@@ -0,0 +1,12 @@
+{
+    "prompt": [
+        {
+            "role": "system",
+            "content": "You are a helpful assistant. 如果我需要帮助，你要说“输入!help获得帮助”"
+        },
+        {
+            "role": "assistant",
+            "content": "好的，我是一个能干的AI助手。 如果你需要帮助，我会说“输入!help获得帮助”"
+        }
+    ]
+}

sensitive-template.json

@@ -1,4 +1,7 @@
 {
+  "说明": "mask将替换敏感词中的每一个字，若mask_word值不为空，则将敏感词整个替换为mask_word的值",
+  "mask": "*",
+  "mask_word": "",
   "words": [
     "习近平",
     "胡锦涛",