chore: release v3.4.0.1

feat: 添加对 Gitee AI 的支持

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -3,61 +3,37 @@ description: 报错或漏洞请使用这个模板创建，不使用此模板创
 title: "[Bug]: "
 labels: ["bug?"]
 body:
-  - type: dropdown
-    attributes:
-      label: 部署方式
-      description: "主程序使用的部署方式"
-      options:
-        - 手动部署
-        - 安装器部署
-        - 一键安装包部署
-        - Docker部署
-    validations:
-      required: true
   - type: dropdown
     attributes:
       label: 消息平台适配器
       description: "连接QQ使用的框架"
       options:
-        - yiri-mirai（Mirai）
         - Nakuru（go-cqhttp）
         - aiocqhttp（使用 OneBot 协议接入的）
         - qq-botpy（QQ官方API）
+        - yiri-mirai（Mirai）
     validations:
       required: false
   - type: input
     attributes:
-      label: 系统环境
+      label: 运行环境
-      description: 操作系统、系统架构、**主机地理位置**，地理位置最好写清楚，涉及网络问题排查。
+      description: 操作系统、系统架构、**Python版本**、**主机地理位置**
-      placeholder: 例如： CentOS x64 中国大陆、Windows11 美国
+      placeholder: 例如： CentOS x64 Python 3.10.3、Docker 的直接写 Docker 就行
     validations:
       required: true
   - type: input
     attributes:
-      label: Python环境
+      label: LangBot 版本
-      description: 运行程序的Python版本
+      description: LangBot (QChatGPT) 版本号
-      placeholder: 例如： Python 3.10
+      placeholder: 例如：v3.3.0，可以使用`!version`命令查看，或者到 pkg/utils/constants.py 查看
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: QChatGPT版本
-      description: QChatGPT版本号
-      placeholder: 例如： v2.6.0，可以使用`!version`命令查看
     validations:
       required: true
   - type: textarea
     attributes:
       label: 异常情况
-      description: 完整描述异常情况，什么时候发生的、发生了什么，尽可能详细
+      description: 完整描述异常情况，什么时候发生的、发生了什么。**请附带日志信息。**
     validations:
       required: true
-  - type: textarea
-    attributes:
-      label: 日志信息
-      description: 请提供完整的 **登录框架 和 QChatGPT控制台**的相关日志信息（若有），不提供日志信息**无法**为您排查问题，请尽可能详细
-    validations:
-      required: false
   - type: textarea
     attributes:
       label: 启用的插件

.github/dependabot.yml

@@ -10,5 +10,4 @@ updates:
     schedule:
       interval: "weekly"
     allow:
-      - dependency-name: "yiri-mirai-rc"
       - dependency-name: "openai"

.github/pull_request_template.md

@@ -2,24 +2,19 @@
 
 实现/解决/优化的内容: 
 
-### 事务
+## 检查清单
 
-- [ ] 已阅读仓库[贡献指引](https://github.com/RockChinQ/QChatGPT/blob/master/CONTRIBUTING.md)
+### PR 作者完成
-- [ ] 已与维护者在issues或其他平台沟通此PR大致内容
 
-## 以下内容可在起草PR后、合并PR前逐步完成
+*请在方括号间写`x`以打勾
 
-### 功能
+- [ ] 阅读仓库[贡献指引](https://github.com/RockChinQ/LangBot/blob/master/CONTRIBUTING.md)了吗？
+- [ ] 与项目所有者沟通过了吗？
+- [ ] 我确定已自行测试所作的更改，确保功能符合预期。
 
-- [ ] 已编写完善的配置文件字段说明（若有新增）
+### 项目所有者完成
-- [ ] 已编写面向用户的新功能说明（若有必要）
-- [ ] 已测试新功能或更改
 
-### 兼容性
+- [ ] 相关 issues 链接了吗？
-
+- [ ] 配置项写好了吗？迁移写好了吗？生效了吗？
-- [ ] 已处理版本兼容性
+- [ ] 依赖写到 requirements.txt 和 core/bootutils/deps.py 了吗
-- [ ] 已处理插件兼容问题
+- [ ] 文档编写了吗？
-
-### 风险
-
-可能导致或已知的问题: 

.github/workflows/build-dev-image.yaml

@@ -0,0 +1,24 @@
+name: Build Dev Image
+
+on:
+  push:
+  workflow_dispatch:
+
+jobs:
+  build-dev-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Generate Tag
+        id: generate_tag
+        run: |
+          # 获取分支名称，把/替换为-
+          echo ${{ github.ref }} | sed 's/refs\/heads\///g' | sed 's/\//-/g'
+          echo ::set-output name=tag::$(echo ${{ github.ref }} | sed 's/refs\/heads\///g' | sed 's/\//-/g')
+      - name: Login to Registry
+        run: docker login --username=${{ secrets.DOCKER_USERNAME }} --password ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build Docker Image
+        run: |
+          docker buildx create --name mybuilder --use
+          docker build -t rockchin/langbot:${{ steps.generate_tag.outputs.tag }} . --push

.github/workflows/build-docker-image.yml

@@ -19,12 +19,6 @@ jobs:
             export GITHUB_REF=${{ github.ref }}
             echo $GITHUB_REF
           fi
-      # - name: Check GITHUB_REF env
-      #   run: echo $GITHUB_REF
-      # - name: Get version  # 在 GitHub Actions 运行环境
-      #   id: get_version
-      #   if: (startsWith(env.GITHUB_REF, 'refs/tags/')||startsWith(github.ref, 'refs/tags/')) && startsWith(github.repository, 'RockChinQ/QChatGPT')
-      #   run: export GITHUB_REF=${GITHUB_REF/refs\/tags\//}
       - name: Check version
         id: check_version
         run: |
@@ -44,5 +38,5 @@ jobs:
         run: docker login --username=${{ secrets.DOCKER_USERNAME }} --password ${{ secrets.DOCKER_PASSWORD }}
       - name: Create Buildx
         run: docker buildx create --name mybuilder --use
-      - name: Build  # image name: rockchin/qchatgpt:<VERSION>
+      - name: Build  # image name: rockchin/langbot:<VERSION>
-        run: docker buildx build --platform linux/arm64,linux/amd64 -t rockchin/qchatgpt:${{ steps.check_version.outputs.version }} -t rockchin/qchatgpt:latest . --push
+        run: docker buildx build --platform linux/arm64,linux/amd64 -t rockchin/langbot:${{ steps.check_version.outputs.version }} -t rockchin/langbot:latest . --push

.github/workflows/build-release-artifacts.yaml

@@ -0,0 +1,52 @@
+name: Build Release Artifacts
+
+on:
+  workflow_dispatch:
+  ## 发布release的时候会自动构建
+  release:
+    types: [published]
+
+jobs:
+  build-artifacts:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Check version
+        id: check_version
+        run: |
+          echo $GITHUB_REF
+          # 如果是tag，则去掉refs/tags/前缀
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            echo "It's a tag"
+            echo $GITHUB_REF
+            echo $GITHUB_REF | awk -F '/' '{print $3}'
+            echo ::set-output name=version::$(echo $GITHUB_REF | awk -F '/' '{print $3}')
+          else
+            echo "It's not a tag"
+            echo $GITHUB_REF
+            echo ::set-output name=version::${GITHUB_REF}
+          fi
+
+      - name: Make Temp Directory
+        run: |
+          mkdir -p /tmp/langbot_build_web
+          cp -r . /tmp/langbot_build_web
+      - name: Setup Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '22'
+      - name: Build Web
+        run: |
+          cd /tmp/langbot_build_web/web
+          npm install
+          npm run build
+      - name: Package Output
+        run: |
+          cp -r /tmp/langbot_build_web/web/dist ./web
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: langbot-${{ steps.check_version.outputs.version }}-all
+          path: .

.github/workflows/sync-wiki.yml

@@ -1,43 +0,0 @@
-name: Update Wiki
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - 'res/wiki/**'
-
-jobs:
-  update-wiki:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup Git
-      run: |
-        git config --global user.name "GitHub Actions"
-        git config --global user.email "github-actions[bot]@users.noreply.github.com"
-    - name: Clone Wiki Repository
-      uses: actions/checkout@v2
-      with:
-        repository: RockChinQ/QChatGPT.wiki
-        path: wiki
-    - name: Delete old wiki content
-      run: |
-        rm -rf wiki/*
-    - name: Copy res/wiki content to wiki
-      run: |
-        cp -r res/wiki/* wiki/
-    - name: Check for changes
-      run: |
-        cd wiki
-        if git diff --quiet; then
-          echo "No changes to commit."
-          exit 0
-        fi
-    - name: Commit and Push Changes
-      run: |
-        cd wiki
-        git add .
-        git commit -m "Update wiki"
-        git push

.gitignore

@@ -3,9 +3,10 @@
 __pycache__/
 database.db
 qchatgpt.log
+langbot.log
 /banlist.py
-plugins/
+/plugins/
-!plugins/__init__.py
+!/plugins/__init__.py
 /revcfg.py
 prompts/
 logs/
@@ -34,4 +35,5 @@ bard.json
 res/instance_id.json
 .DS_Store
 /data
-botpy.log*
+botpy.log*
+/poc

Dockerfile

@@ -1,8 +1,19 @@
+FROM node:22-alpine AS node
+
+WORKDIR /app
+
+COPY web ./web
+
+RUN cd web && npm install && npm run build
+
 FROM python:3.10.13-slim
+
 WORKDIR /app
 
 COPY . .
 
+COPY --from=node /app/web/dist ./web/dist
+
 RUN apt update \
     && apt install gcc -y \
     && python -m pip install -r requirements.txt \

README.md

@@ -1,17 +1,14 @@
 
 <p align="center">
-<img src="https://qchatgpt.rockchin.top/logo.png" alt="QChatGPT" width="180" />
+<img src="https://docs.langbot.app/langbot-logo-0.5x.png" alt="QChatGPT" width="180" />
 </p>
 <div align="center">
 
-# QChatGPT
+# LangBot
 
 <a href="https://trendshift.io/repositories/6187" target="_blank"><img src="https://trendshift.io/api/badge/repositories/6187" alt="RockChinQ%2FQChatGPT | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 
-[![GitHub release (latest by date)](https://img.shields.io/github/v/release/RockChinQ/QChatGPT)](https://github.com/RockChinQ/QChatGPT/releases/latest)
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/RockChinQ/LangBot)](https://github.com/RockChinQ/LangBot/releases/latest)
-<a href="https://hub.docker.com/repository/docker/rockchin/qchatgpt">
-    <img src="https://img.shields.io/docker/pulls/rockchin/qchatgpt?color=blue" alt="docker pull">
-  </a>
  ![Dynamic JSON Badge](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fapi.qchatgpt.rockchin.top%2Fapi%2Fv2%2Fview%2Frealtime%2Fcount_query%3Fminute%3D10080&query=%24.data.count&label=%E4%BD%BF%E7%94%A8%E9%87%8F%EF%BC%887%E6%97%A5%EF%BC%89)
 ![Wakapi Count](https://wakapi.rockchin.top/api/badge/RockChinQ/interval:any/project:QChatGPT)
 <br/>
@@ -19,21 +16,18 @@
 <a href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=66-aWvn8cbP4c1ut_1YYkvvGVeEtyTH8&authKey=pTaKBK5C%2B8dFzQ4XlENf6MHTCLaHnlKcCRx7c14EeVVlpX2nRSaS8lJm8YeM4mCU&noverify=0&group_code=195992197">
 <img alt="Static Badge" src="https://img.shields.io/badge/%E5%AE%98%E6%96%B9%E7%BE%A4-195992197-purple">
 </a>
-<a href="https://qm.qq.com/q/1yxEaIgXMA">
+<a href="https://qm.qq.com/q/PClALFK242">
 <img alt="Static Badge" src="https://img.shields.io/badge/%E7%A4%BE%E5%8C%BA%E7%BE%A4-619154800-purple">
 </a>
-<a href="https://codecov.io/gh/RockChinQ/QChatGPT" > 
- <img src="https://codecov.io/gh/RockChinQ/QChatGPT/graph/badge.svg?token=pjxYIL2kbC"/> 
- </a>
  
 ## 使用文档
 
-<a href="https://qchatgpt.rockchin.top">项目主页</a> ｜
+<a href="https://docs.langbot.app">项目主页</a> ｜
-<a href="https://qchatgpt.rockchin.top/posts/feature.html">功能介绍</a> ｜
+<a href="https://docs.langbot.app/insight/intro.htmll">功能介绍</a> ｜
-<a href="https://qchatgpt.rockchin.top/posts/deploy/">部署文档</a> ｜
+<a href="https://docs.langbot.app/insight/guide.html">部署文档</a> ｜
-<a href="https://qchatgpt.rockchin.top/posts/error/">常见问题</a> ｜
+<a href="https://docs.langbot.app/usage/faq.html">常见问题</a> ｜
-<a href="https://qchatgpt.rockchin.top/posts/plugin/intro.html">插件介绍</a> ｜
+<a href="https://docs.langbot.app/plugin/plugin-intro.html">插件介绍</a> ｜
-<a href="https://github.com/RockChinQ/QChatGPT/issues/new?assignees=&labels=%E7%8B%AC%E7%AB%8B%E6%8F%92%E4%BB%B6&projects=&template=submit-plugin.yml&title=%5BPlugin%5D%3A+%E8%AF%B7%E6%B1%82%E7%99%BB%E8%AE%B0%E6%96%B0%E6%8F%92%E4%BB%B6">提交插件</a>
+<a href="https://github.com/RockChinQ/LangBot/issues/new?assignees=&labels=%E7%8B%AC%E7%AB%8B%E6%8F%92%E4%BB%B6&projects=&template=submit-plugin.yml&title=%5BPlugin%5D%3A+%E8%AF%B7%E6%B1%82%E7%99%BB%E8%AE%B0%E6%96%B0%E6%8F%92%E4%BB%B6">提交插件</a>
 
 ## 相关链接
 
@@ -42,5 +36,5 @@
 <a href="https://github.com/RockChinQ/qcg-center">遥测服务端源码</a> ｜
 <a href="https://github.com/the-lazy-me/QChatGPT-Wiki">官方文档储存库</a>
 
-<img alt="回复效果（带有联网插件）" src="https://qchatgpt.rockchin.top/assets/image/QChatGPT-0516.png" width="500px"/>
+<img alt="回复效果（带有联网插件）" src="https://docs.langbot.app/QChatGPT-0516.png" width="500px"/>
 </div>

docker-compose.yaml

@@ -1,10 +1,14 @@
 version: "3"
 
 services:
-  qchatgpt:
+  langbot:
-    image: rockchin/qchatgpt:latest
+    image: rockchin/langbot:latest
+    container_name: langbot
     volumes:
       - ./data:/app/data
       - ./plugins:/app/plugins
     restart: on-failure
-    # 根据具体环境配置网络
+    ports:
+      - 5300:5300  # 供 WebUI 使用
+      - 2280-2290:2280-2290  # 供消息平台适配器方向连接
+    # 根据具体环境配置网络

main.py

@@ -1,19 +1,23 @@
-# QChatGPT 终端启动入口
+# LangBot 终端启动入口
 # 在此层级解决依赖项检查。
-# QChatGPT/main.py
+# LangBot/main.py
 
 asciiart = r"""
-  ___   ___ _         _    ___ ___ _____ 
+ _                   ___      _   
- / _ \ / __| |_  __ _| |_ / __| _ \_   _|
+| |   __ _ _ _  __ _| _ ) ___| |_ 
-| (_) | (__| ' \/ _` |  _| (_ |  _/ | |  
+| |__/ _` | ' \/ _` | _ \/ _ \  _|
- \__\_\\___|_||_\__,_|\__|\___|_|   |_|  
+|____\__,_|_||_\__, |___/\___/\__|
+               |___/              
 
-⭐️开源地址: https://github.com/RockChinQ/QChatGPT
+⭐️开源地址: https://github.com/RockChinQ/LangBot
-📖文档地址: https://q.rkcn.top
+📖文档地址: https://docs.langbot.app
 """
 
 
-async def main_entry():
+import asyncio
+
+
+async def main_entry(loop: asyncio.AbstractEventLoop):
     print(asciiart)
 
     import sys
@@ -32,6 +36,12 @@ async def main_entry():
         print("已自动安装缺失的依赖包，请重启程序。")
         sys.exit(0)
 
+    # 检查pydantic版本，如果没有 pydantic.v1，则把 pydantic 映射为 v1
+    import pydantic.version
+    if pydantic.version.VERSION < '2.0':
+        import pydantic
+        sys.modules['pydantic.v1'] = pydantic
+
     # 检查配置文件
 
     from pkg.core.bootutils import files
@@ -46,13 +56,20 @@ async def main_entry():
         sys.exit(0)
 
     from pkg.core import boot
-    await boot.main()
+    await boot.main(loop)
 
 
 if __name__ == '__main__':
     import os
+    import sys
 
-    # 检查本目录是否有main.py，且包含QChatGPT字符串
+    # 必须大于 3.10.1
+    if sys.version_info < (3, 10, 1):
+        print("需要 Python 3.10.1 及以上版本，当前 Python 版本为：", sys.version)
+        input("按任意键退出...")
+        exit(1)
+
+    # 检查本目录是否有main.py，且包含LangBot字符串
     invalid_pwd = False
 
     if not os.path.exists('main.py'):
@@ -60,13 +77,13 @@ if __name__ == '__main__':
     else:
         with open('main.py', 'r', encoding='utf-8') as f:
             content = f.read()
-            if "QChatGPT/main.py" not in content:
+            if "LangBot/main.py" not in content:
                 invalid_pwd = True
     if invalid_pwd:
-        print("请在QChatGPT项目根目录下以命令形式运行此程序。")
+        print("请在 LangBot 项目根目录下以命令形式运行此程序。")
         input("按任意键退出...")
-        exit(0)
+        exit(1)
 
-    import asyncio
+    loop = asyncio.new_event_loop()
 
-    asyncio.run(main_entry())
+    loop.run_until_complete(main_entry(loop))

pkg/api/http/controller/group.py

@@ -0,0 +1,107 @@
+from __future__ import annotations
+
+import abc
+import typing
+import enum
+import quart
+from quart.typing import RouteCallable
+
+from ....core import app
+
+
+preregistered_groups: list[type[RouterGroup]] = []
+"""RouterGroup 的预注册列表"""
+
+def group_class(name: str, path: str) -> None:
+    """注册一个 RouterGroup"""
+
+    def decorator(cls: typing.Type[RouterGroup]) -> typing.Type[RouterGroup]:
+        cls.name = name
+        cls.path = path
+        preregistered_groups.append(cls)
+        return cls
+
+    return decorator
+
+
+class AuthType(enum.Enum):
+    """认证类型"""
+    NONE = 'none'
+    USER_TOKEN = 'user-token'
+
+
+class RouterGroup(abc.ABC):
+
+    name: str
+
+    path: str
+
+    ap: app.Application
+
+    quart_app: quart.Quart
+
+    def __init__(self, ap: app.Application, quart_app: quart.Quart) -> None:
+        self.ap = ap
+        self.quart_app = quart_app
+
+    @abc.abstractmethod
+    async def initialize(self) -> None:
+        pass
+
+    def route(self, rule: str, auth_type: AuthType = AuthType.USER_TOKEN, **options: typing.Any) -> typing.Callable[[RouteCallable], RouteCallable]:  # decorator
+        """注册一个路由"""
+        def decorator(f: RouteCallable) -> RouteCallable:
+            nonlocal rule
+            rule = self.path + rule
+
+            async def handler_error(*args, **kwargs):
+
+                if auth_type == AuthType.USER_TOKEN:
+                    # 从Authorization头中获取token
+                    token = quart.request.headers.get('Authorization', '').replace('Bearer ', '')
+
+                    if not token:
+                        return self.http_status(401, -1, '未提供有效的用户令牌')
+
+                    try:
+                        user_email = await self.ap.user_service.verify_jwt_token(token)
+
+                        # 检查f是否接受user_email参数
+                        if 'user_email' in f.__code__.co_varnames:
+                            kwargs['user_email'] = user_email
+                    except Exception as e:
+                        return self.http_status(401, -1, str(e))
+
+                try:
+                    return await f(*args, **kwargs)
+                except Exception as e:  # 自动 500
+                    return self.http_status(500, -2, str(e))
+                
+            new_f = handler_error
+            new_f.__name__ = (self.name + rule).replace('/', '__')
+            new_f.__doc__ = f.__doc__
+
+            self.quart_app.route(rule, **options)(new_f)
+            return f
+
+        return decorator
+
+    def success(self, data: typing.Any = None) -> quart.Response:
+        """返回一个 200 响应"""
+        return quart.jsonify({
+            'code': 0,
+            'msg': 'ok',
+            'data': data,
+        })
+    
+    def fail(self, code: int, msg: str) -> quart.Response:
+        """返回一个异常响应"""
+
+        return quart.jsonify({
+            'code': code,
+            'msg': msg,
+        })
+    
+    def http_status(self, status: int, code: int, msg: str) -> quart.Response:
+        """返回一个指定状态码的响应"""
+        return self.fail(code, msg), status

pkg/api/http/controller/groups/logs.py

@@ -0,0 +1,32 @@
+from __future__ import annotations
+
+import traceback
+
+import quart
+
+from .....core import app
+from .. import group
+
+
+@group.group_class('logs', '/api/v1/logs')
+class LogsRouterGroup(group.RouterGroup):
+    
+    async def initialize(self) -> None:
+        @self.route('', methods=['GET'])
+        async def _() -> str:
+
+            start_page_number = int(quart.request.args.get('start_page_number', 0))
+            start_offset = int(quart.request.args.get('start_offset', 0))
+
+            logs_str, end_page_number, end_offset = self.ap.log_cache.get_log_by_pointer(
+                start_page_number=start_page_number,
+                start_offset=start_offset
+            )
+
+            return self.success(
+                data={
+                    "logs": logs_str,
+                    "end_page_number": end_page_number,
+                    "end_offset": end_offset
+                }
+            )

pkg/api/http/controller/groups/plugins.py

@@ -0,0 +1,84 @@
+from __future__ import annotations
+
+
+import traceback
+
+import quart
+
+from .....core import app, taskmgr
+from .. import group
+
+
+@group.group_class('plugins', '/api/v1/plugins')
+class PluginsRouterGroup(group.RouterGroup):
+
+    async def initialize(self) -> None:
+        @self.route('', methods=['GET'])
+        async def _() -> str:
+            plugins = self.ap.plugin_mgr.plugins()
+
+            plugins_data = [plugin.model_dump() for plugin in plugins]
+
+            return self.success(data={
+                'plugins': plugins_data
+            })
+        
+        @self.route('/<author>/<plugin_name>/toggle', methods=['PUT'])
+        async def _(author: str, plugin_name: str) -> str:
+            data = await quart.request.json
+            target_enabled = data.get('target_enabled')
+            await self.ap.plugin_mgr.update_plugin_switch(plugin_name, target_enabled)
+            return self.success()
+        
+        @self.route('/<author>/<plugin_name>/update', methods=['POST'])
+        async def _(author: str, plugin_name: str) -> str:
+            ctx = taskmgr.TaskContext.new()
+            wrapper = self.ap.task_mgr.create_user_task(
+                self.ap.plugin_mgr.update_plugin(plugin_name, task_context=ctx),
+                kind="plugin-operation",
+                name=f"plugin-update-{plugin_name}",
+                label=f"更新插件 {plugin_name}",
+                context=ctx
+            )
+            return self.success(data={
+                'task_id': wrapper.id
+            })
+        
+        @self.route('/<author>/<plugin_name>', methods=['DELETE'])
+        async def _(author: str, plugin_name: str) -> str:
+            ctx = taskmgr.TaskContext.new()
+            wrapper = self.ap.task_mgr.create_user_task(
+                self.ap.plugin_mgr.uninstall_plugin(plugin_name, task_context=ctx),
+                kind="plugin-operation",
+                name=f'plugin-remove-{plugin_name}',
+                label=f'删除插件 {plugin_name}',
+                context=ctx
+            )
+
+            return self.success(data={
+                'task_id': wrapper.id
+            })
+
+        @self.route('/reorder', methods=['PUT'])
+        async def _() -> str:
+            data = await quart.request.json
+            await self.ap.plugin_mgr.reorder_plugins(data.get('plugins'))
+            return self.success()
+        
+        @self.route('/install/github', methods=['POST'])
+        async def _() -> str:
+            data = await quart.request.json
+            
+            ctx = taskmgr.TaskContext.new()
+            short_source_str = data['source'][-8:]
+            wrapper = self.ap.task_mgr.create_user_task(
+                self.ap.plugin_mgr.install_plugin(data['source'], task_context=ctx),
+                kind="plugin-operation",
+                name=f'plugin-install-github',
+                label=f'安装插件 ...{short_source_str}',
+                context=ctx
+            )
+
+            return self.success(data={
+                'task_id': wrapper.id
+            })

pkg/api/http/controller/groups/settings.py

@@ -0,0 +1,62 @@
+import quart
+
+from .....core import app
+from .. import group
+
+
+@group.group_class('settings', '/api/v1/settings')
+class SettingsRouterGroup(group.RouterGroup):
+    
+    async def initialize(self) -> None:
+        
+        @self.route('', methods=['GET'])
+        async def _() -> str:
+            return self.success(
+                data={
+                    "managers": [
+                        {
+                            "name": m.name,
+                            "description": m.description,
+                        }
+                        for m in self.ap.settings_mgr.get_manager_list()
+                    ]
+                }
+            )
+        
+        @self.route('/<manager_name>', methods=['GET'])
+        async def _(manager_name: str) -> str:
+
+            manager = self.ap.settings_mgr.get_manager(manager_name)
+
+            if manager is None:
+                return self.fail(1, '配置管理器不存在')
+
+            return self.success(
+                data={
+                    "manager": {
+                        "name": manager.name,
+                        "description": manager.description,
+                        "schema": manager.schema,
+                        "file": manager.file.config_file_name,
+                        "data": manager.data,
+                        "doc_link": manager.doc_link
+                    }
+                }
+            )
+        
+        @self.route('/<manager_name>/data', methods=['PUT'])
+        async def _(manager_name: str) -> str:
+            data = await quart.request.json
+            manager = self.ap.settings_mgr.get_manager(manager_name)
+
+            if manager is None:
+                return self.fail(code=1, msg='配置管理器不存在')
+
+            # manager.data = data['data']
+            for k, v in data['data'].items():
+                manager.data[k] = v
+
+            await manager.dump_config()
+            return self.success(data={
+                "data": manager.data
+            })

pkg/api/http/controller/groups/stats.py

@@ -0,0 +1,23 @@
+import quart
+import asyncio
+
+from .....core import app, taskmgr
+from .. import group
+
+
+@group.group_class('stats', '/api/v1/stats')
+class StatsRouterGroup(group.RouterGroup):
+    
+    async def initialize(self) -> None:
+        @self.route('/basic', methods=['GET'])
+        async def _() -> str:
+
+            conv_count = 0
+            for session in self.ap.sess_mgr.session_list:
+                conv_count += len(session.conversations if session.conversations is not None else [])
+
+            return self.success(data={
+                'active_session_count': len(self.ap.sess_mgr.session_list),
+                'conversation_count': conv_count,
+                'query_count': self.ap.query_pool.query_id_counter,
+            })

pkg/api/http/controller/groups/system.py

@@ -0,0 +1,63 @@
+import quart
+import asyncio
+
+from .....core import app, taskmgr
+from .. import group
+from .....utils import constants
+
+
+@group.group_class('system', '/api/v1/system')
+class SystemRouterGroup(group.RouterGroup):
+    
+    async def initialize(self) -> None:
+        @self.route('/info', methods=['GET'], auth_type=group.AuthType.NONE)
+        async def _() -> str:
+            return self.success(
+                data={
+                    "version": constants.semantic_version,
+                    "debug": constants.debug_mode,
+                    "enabled_platform_count": len(self.ap.platform_mgr.adapters)
+                }
+            )
+
+        @self.route('/tasks', methods=['GET'])
+        async def _() -> str:
+            task_type = quart.request.args.get("type")
+
+            if task_type == '':
+                task_type = None
+
+            return self.success(
+                data=self.ap.task_mgr.get_tasks_dict(task_type)
+            )
+        
+        @self.route('/tasks/<task_id>', methods=['GET'])
+        async def _(task_id: str) -> str:
+            task = self.ap.task_mgr.get_task_by_id(int(task_id))
+
+            if task is None:
+                return self.http_status(404, 404, "Task not found")
+            
+            return self.success(data=task.to_dict())
+        
+        @self.route('/reload', methods=['POST'])
+        async def _() -> str:
+            json_data = await quart.request.json
+
+            scope = json_data.get("scope")
+
+            await self.ap.reload(
+                scope=scope
+            )
+            return self.success()
+
+        @self.route('/_debug/exec', methods=['POST'])
+        async def _() -> str:
+            if not constants.debug_mode:
+                return self.http_status(403, 403, "Forbidden")
+            
+            py_code = await quart.request.data
+
+            ap = self.ap
+
+            return self.success(data=exec(py_code, {"ap": ap}))

pkg/api/http/controller/groups/user.py

@@ -0,0 +1,47 @@
+import quart
+import sqlalchemy
+import argon2
+
+from .. import group
+from .....persistence.entities import user
+
+
+@group.group_class('user', '/api/v1/user')
+class UserRouterGroup(group.RouterGroup):
+    
+    async def initialize(self) -> None:
+        @self.route('/init', methods=['GET', 'POST'], auth_type=group.AuthType.NONE)
+        async def _() -> str:
+            if quart.request.method == 'GET':
+                return self.success(data={
+                    'initialized': await self.ap.user_service.is_initialized()
+                })
+            
+            if await self.ap.user_service.is_initialized():
+                return self.fail(1, '系统已初始化')
+
+            json_data = await quart.request.json
+
+            user_email = json_data['user']
+            password = json_data['password']
+
+            await self.ap.user_service.create_user(user_email, password)
+
+            return self.success()
+        
+        @self.route('/auth', methods=['POST'], auth_type=group.AuthType.NONE)
+        async def _() -> str:
+            json_data = await quart.request.json
+
+            try:
+                token = await self.ap.user_service.authenticate(json_data['user'], json_data['password'])
+            except argon2.exceptions.VerifyMismatchError:
+                return self.fail(1, '用户名或密码错误')
+
+            return self.success(data={
+                'token': token
+            })
+
+        @self.route('/check-token', methods=['GET'])
+        async def _() -> str:
+            return self.success()

pkg/api/http/controller/main.py

@@ -0,0 +1,73 @@
+from __future__ import annotations
+
+import asyncio
+import os
+
+import quart
+import quart_cors
+
+from ....core import app, entities as core_entities
+from .groups import logs, system, settings, plugins, stats, user
+from . import group
+
+
+class HTTPController:
+
+    ap: app.Application
+
+    quart_app: quart.Quart
+
+    def __init__(self, ap: app.Application) -> None:
+        self.ap = ap
+        self.quart_app = quart.Quart(__name__)
+        quart_cors.cors(self.quart_app, allow_origin="*")
+
+    async def initialize(self) -> None:
+        await self.register_routes()
+
+    async def run(self) -> None:
+        if self.ap.system_cfg.data["http-api"]["enable"]:
+
+            async def shutdown_trigger_placeholder():
+                while True:
+                    await asyncio.sleep(1)
+
+            async def exception_handler(*args, **kwargs):
+                try:
+                    await self.quart_app.run_task(
+                        *args, **kwargs
+                    )
+                except Exception as e:
+                    self.ap.logger.error(f"启动 HTTP 服务失败： {e}")
+
+            self.ap.task_mgr.create_task(
+                exception_handler(
+                    host=self.ap.system_cfg.data["http-api"]["host"],
+                    port=self.ap.system_cfg.data["http-api"]["port"],
+                    shutdown_trigger=shutdown_trigger_placeholder,
+                ),
+                name="http-api-quart",
+                scopes=[core_entities.LifecycleControlScope.APPLICATION],
+            )
+
+            # await asyncio.sleep(5)
+
+    async def register_routes(self) -> None:
+
+        @self.quart_app.route("/healthz")
+        async def healthz():
+            return {"code": 0, "msg": "ok"}
+
+        for g in group.preregistered_groups:
+            ginst = g(self.ap, self.quart_app)
+            await ginst.initialize()
+
+        frontend_path = "web/dist"
+
+        @self.quart_app.route("/")
+        async def index():
+            return await quart.send_from_directory(frontend_path, "index.html")
+
+        @self.quart_app.route("/<path:path>")
+        async def static_file(path: str):
+            return await quart.send_from_directory(frontend_path, path)

pkg/api/http/service/user.py

@@ -0,0 +1,73 @@
+from __future__ import annotations
+
+import sqlalchemy
+import argon2
+import jwt
+import datetime
+
+from ....core import app
+from ....persistence.entities import user
+from ....utils import constants
+
+
+class UserService:
+
+    ap: app.Application
+
+    def __init__(self, ap: app.Application) -> None:
+        self.ap = ap
+
+    async def is_initialized(self) -> bool:
+        result = await self.ap.persistence_mgr.execute_async(
+            sqlalchemy.select(user.User).limit(1)
+        )
+
+        result_list = result.all()
+        return result_list is not None and len(result_list) > 0
+    
+    async def create_user(self, user_email: str, password: str) -> None:
+        ph = argon2.PasswordHasher()
+
+        hashed_password = ph.hash(password)
+
+        await self.ap.persistence_mgr.execute_async(
+            sqlalchemy.insert(user.User).values(
+                user=user_email,
+                password=hashed_password
+            )
+        )
+
+    async def authenticate(self, user_email: str, password: str) -> str | None:
+        result = await self.ap.persistence_mgr.execute_async(
+            sqlalchemy.select(user.User).where(user.User.user == user_email)
+        )
+
+        result_list = result.all()
+
+        if result_list is None or len(result_list) == 0:
+            raise ValueError('用户不存在')
+
+        user_obj = result_list[0]
+
+        ph = argon2.PasswordHasher()
+
+        ph.verify(user_obj.password, password)
+
+        return await self.generate_jwt_token(user_email)
+
+    async def generate_jwt_token(self, user_email: str) -> str:
+        jwt_secret = self.ap.instance_secret_meta.data['jwt_secret']
+        jwt_expire = self.ap.system_cfg.data['http-api']['jwt-expire']
+
+        payload = {
+            'user': user_email,
+            'iss': 'LangBot-'+constants.edition,
+            'exp': datetime.datetime.now() + datetime.timedelta(seconds=jwt_expire)
+        }
+
+        return jwt.encode(payload, jwt_secret, algorithm='HS256')
+    
+    async def verify_jwt_token(self, token: str) -> str:
+        jwt_secret = self.ap.instance_secret_meta.data['jwt_secret']
+
+        return jwt.decode(token, jwt_secret, algorithms=['HS256'])['user']

pkg/audit/center/apigroup.py

@@ -9,11 +9,12 @@ import asyncio
 import aiohttp
 import requests
 
-from ...core import app
+from ...core import app, entities as core_entities
 
 
 class APIGroup(metaclass=abc.ABCMeta):
     """API 组抽象类"""
+
     _basic_info: dict = None
     _runtime_info: dict = None
 
@@ -32,33 +33,28 @@ class APIGroup(metaclass=abc.ABCMeta):
         data: dict = None,
         params: dict = None,
         headers: dict = {},
-        **kwargs
+        **kwargs,
     ):
         """
         执行请求
         """
-        self._runtime_info['account_id'] = "-1"
+        self._runtime_info["account_id"] = "-1"
-        
+
         url = self.prefix + path
         data = json.dumps(data)
-        headers['Content-Type'] = 'application/json'
+        headers["Content-Type"] = "application/json"
 
         try:
             async with aiohttp.ClientSession() as session:
                 async with session.request(
-                    method,
+                    method, url, data=data, params=params, headers=headers, **kwargs
-                    url,
-                    data=data,
-                    params=params,
-                    headers=headers,
-                    **kwargs
                 ) as resp:
                     self.ap.logger.debug("data: %s", data)
                     self.ap.logger.debug("ret: %s", await resp.text())
 
         except Exception as e:
-            self.ap.logger.debug(f'上报失败: {e}')
+            self.ap.logger.debug(f"上报失败: {e}")
-    
+
     async def do(
         self,
         method: str,
@@ -66,27 +62,27 @@ class APIGroup(metaclass=abc.ABCMeta):
         data: dict = None,
         params: dict = None,
         headers: dict = {},
-        **kwargs
+        **kwargs,
     ) -> asyncio.Task:
         """执行请求"""
-        asyncio.create_task(self._do(method, path, data, params, headers, **kwargs))
 
-    def gen_rid(
+        return self.ap.task_mgr.create_task(
-        self
+            self._do(method, path, data, params, headers, **kwargs),
-    ):
+            kind="telemetry-operation",
+            name=f"{method} {path}",
+            scopes=[core_entities.LifecycleControlScope.APPLICATION],
+        ).task
+
+    def gen_rid(self):
         """生成一个请求 ID"""
         return str(uuid.uuid4())
 
-    def basic_info(
+    def basic_info(self):
-        self
-    ):
         """获取基本信息"""
         basic_info = APIGroup._basic_info.copy()
-        basic_info['rid'] = self.gen_rid()
+        basic_info["rid"] = self.gen_rid()
         return basic_info
-    
+
-    def runtime_info(
+    def runtime_info(self):
-        self
-    ):
         """获取运行时信息"""
         return APIGroup._runtime_info

pkg/command/cmdmgr.py

@@ -8,7 +8,7 @@ from . import entities, operator, errors
 from ..config import manager as cfg_mgr
 
 # 引入所有算子以便注册
-from .operators import func, plugin, default, reset, list as list_cmd, last, next, delc, resend, prompt, cmd, help, version, update
+from .operators import func, plugin, default, reset, list as list_cmd, last, next, delc, resend, prompt, cmd, help, version, update, ollama, model
 
 
 class CommandManager:

pkg/command/entities.py

@@ -2,11 +2,11 @@ from __future__ import annotations
 
 import typing
 
-import pydantic
+import pydantic.v1 as pydantic
-import mirai
 
 from ..core import app, entities as core_entities
 from . import errors, operator
+from ..platform.types import message as platform_message
 
 
 class CommandReturn(pydantic.BaseModel):
@@ -17,7 +17,7 @@ class CommandReturn(pydantic.BaseModel):
     """文本
     """
 
-    image: typing.Optional[mirai.Image] = None
+    image: typing.Optional[platform_message.Image] = None
     """弃用"""
 
     image_url: typing.Optional[str] = None

pkg/command/operators/func.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 from typing import AsyncGenerator
 
 from .. import operator, entities, cmdmgr
+from ...plugin import context as plugin_context
 
 
 @operator.operator_class(name="func", help="查看所有已注册的内容函数", usage='!func')
@@ -9,16 +10,18 @@ class FuncOperator(operator.CommandOperator):
     async def execute(
         self, context: entities.ExecuteContext
     ) -> AsyncGenerator[entities.CommandReturn, None]:
-        reply_str = "当前已加载的内容函数: \n\n"
+        reply_str = "当前已启用的内容函数: \n\n"
 
         index = 1
 
-        all_functions = await self.ap.tool_mgr.get_all_functions()
+        all_functions = await self.ap.tool_mgr.get_all_functions(
+            plugin_enabled=True,
+            plugin_status=plugin_context.RuntimeContainerStatus.INITIALIZED,
+        )
 
         for func in all_functions:
-            reply_str += "{}. {}{}:\n{}\n\n".format(
+            reply_str += "{}. {}:\n{}\n\n".format(
                 index,
-                ("(已禁用) " if not func.enable else ""),
                 func.name,
                 func.description,
             )

pkg/command/operators/model.py

@@ -0,0 +1,86 @@
+from __future__ import annotations
+
+import typing
+
+from .. import operator, entities, cmdmgr, errors
+
+@operator.operator_class(
+    name="model",
+    help='显示和切换模型列表',
+    usage='!model\n!model show <模型名>\n!model set <模型名>',
+    privilege=2
+)
+class ModelOperator(operator.CommandOperator):
+    """Model命令"""
+    
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
+        content = '模型列表:\n'
+
+        model_list = self.ap.model_mgr.model_list
+
+        for model in model_list:
+            content += f"\n名称: {model.name}\n"
+            content += f"请求器: {model.requester.name}\n"
+
+        content += f"\n当前对话使用模型: {context.query.use_model.name}\n"
+        content += f"新对话默认使用模型: {self.ap.provider_cfg.data.get('model')}\n"
+
+        yield entities.CommandReturn(text=content.strip())
+
+
+@operator.operator_class(
+    name="show",
+    help='显示模型详情',
+    privilege=2,
+    parent_class=ModelOperator
+)
+class ModelShowOperator(operator.CommandOperator):
+    """Model Show命令"""
+    
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
+        model_name = context.crt_params[0]
+
+        model = None
+        for _model in self.ap.model_mgr.model_list:
+            if model_name == _model.name:
+                model = _model
+                break
+
+        if model is None:
+            yield entities.CommandReturn(error=errors.CommandError(f"未找到模型 {model_name}"))
+        else:
+            content = f"模型详情\n"
+            content += f"名称: {model.name}\n"
+            if model.model_name is not None:
+                content += f"请求模型名称: {model.model_name}\n"
+            content += f"请求器: {model.requester.name}\n"
+            content += f"密钥组: {model.token_mgr.provider}\n"
+            content += f"支持视觉: {model.vision_supported}\n"
+            content += f"支持工具: {model.tool_call_supported}\n"
+
+            yield entities.CommandReturn(text=content.strip())
+
+@operator.operator_class(
+    name="set",
+    help='设置默认使用模型',
+    privilege=2,
+    parent_class=ModelOperator
+)
+class ModelSetOperator(operator.CommandOperator):
+    """Model Set命令"""
+    
+    async def execute(self, context: entities.ExecuteContext) -> typing.AsyncGenerator[entities.CommandReturn, None]:
+        model_name = context.crt_params[0]
+
+        model = None
+        for _model in self.ap.model_mgr.model_list:
+            if model_name == _model.name:
+                model = _model
+                break
+
+        if model is None:
+            yield entities.CommandReturn(error=errors.CommandError(f"未找到模型 {model_name}"))
+        else:
+            self.ap.provider_cfg.data['model'] = model_name
+            await self.ap.provider_cfg.dump_config()
+            yield entities.CommandReturn(text=f"已设置当前使用模型为 {model_name}，重置会话以生效")

pkg/command/operators/ollama.py

@@ -0,0 +1,121 @@
+from __future__ import annotations
+
+import json
+import typing
+import traceback
+
+import ollama
+from .. import operator, entities, errors
+
+
+@operator.operator_class(
+    name="ollama",
+    help="ollama平台操作",
+    usage="!ollama\n!ollama show <模型名>\n!ollama pull <模型名>\n!ollama del <模型名>"
+)
+class OllamaOperator(operator.CommandOperator):
+    async def execute(
+            self, context: entities.ExecuteContext
+    ) -> typing.AsyncGenerator[entities.CommandReturn, None]:
+        try:
+            content: str = '模型列表:\n'
+            model_list: list = ollama.list().get('models', [])
+            for model in model_list:
+                content += f"名称: {model['name']}\n"
+                content += f"修改时间: {model['modified_at']}\n"
+                content += f"大小: {bytes_to_mb(model['size'])}MB\n\n"
+            yield entities.CommandReturn(text=f"{content.strip()}")
+        except ollama.ResponseError as e:
+            yield entities.CommandReturn(error=errors.CommandError(f"无法获取模型列表，请确认 Ollama 服务正常"))
+
+
+def bytes_to_mb(num_bytes):
+    mb: float = num_bytes / 1024 / 1024
+    return format(mb, '.2f')
+
+
+@operator.operator_class(
+    name="show",
+    help="ollama模型详情",
+    privilege=2,
+    parent_class=OllamaOperator
+)
+class OllamaShowOperator(operator.CommandOperator):
+    async def execute(
+            self, context: entities.ExecuteContext
+    ) -> typing.AsyncGenerator[entities.CommandReturn, None]:
+        content: str = '模型详情:\n'
+        try:
+            show: dict = ollama.show(model=context.crt_params[0])
+            model_info: dict = show.get('model_info', {})
+            ignore_show: str = 'too long to show...'
+
+            for key in ['license', 'modelfile']:
+                show[key] = ignore_show
+
+            for key in ['tokenizer.chat_template.rag', 'tokenizer.chat_template.tool_use']:
+                model_info[key] = ignore_show
+
+            content += json.dumps(show, indent=4)
+            yield entities.CommandReturn(text=content.strip())
+        except ollama.ResponseError as e:
+            yield entities.CommandReturn(error=errors.CommandError(f"无法获取模型详情，请确认 Ollama 服务正常"))
+
+@operator.operator_class(
+    name="pull",
+    help="ollama模型拉取",
+    privilege=2,
+    parent_class=OllamaOperator
+)
+class OllamaPullOperator(operator.CommandOperator):
+    async def execute(
+            self, context: entities.ExecuteContext
+    ) -> typing.AsyncGenerator[entities.CommandReturn, None]:
+        try:
+            model_list: list = ollama.list().get('models', [])
+            if context.crt_params[0] in [model['name'] for model in model_list]:
+                yield entities.CommandReturn(text="模型已存在")
+                return
+        except ollama.ResponseError as e:
+            yield entities.CommandReturn(error=errors.CommandError(f"无法获取模型列表，请确认 Ollama 服务正常"))
+            return
+
+        on_progress: bool = False
+        progress_count: int = 0
+        try:
+            for resp in ollama.pull(model=context.crt_params[0], stream=True):
+                total: typing.Any = resp.get('total')
+                if not on_progress:
+                    if total is not None:
+                        on_progress = True
+                    yield entities.CommandReturn(text=resp.get('status'))
+                else:
+                    if total is None:
+                        on_progress = False
+
+                    completed: typing.Any = resp.get('completed')
+                    if isinstance(completed, int) and isinstance(total, int):
+                        percentage_completed = (completed / total) * 100
+                        if percentage_completed > progress_count:
+                            progress_count += 10
+                            yield entities.CommandReturn(
+                                text=f"下载进度: {completed}/{total} ({percentage_completed:.2f}%)")
+        except ollama.ResponseError as e:
+            yield entities.CommandReturn(text=f"拉取失败: {e.error}")
+
+
+@operator.operator_class(
+    name="del",
+    help="ollama模型删除",
+    privilege=2,
+    parent_class=OllamaOperator
+)
+class OllamaDelOperator(operator.CommandOperator):
+    async def execute(
+            self, context: entities.ExecuteContext
+    ) -> typing.AsyncGenerator[entities.CommandReturn, None]:
+        try:
+            ret: str = ollama.delete(model=context.crt_params[0])['status']
+        except ollama.ResponseError as e:
+            ret = f"{e.error}"
+        yield entities.CommandReturn(text=ret)

pkg/command/operators/plugin.py

@@ -18,7 +18,7 @@ class PluginOperator(operator.CommandOperator):
         context: entities.ExecuteContext
     ) -> typing.AsyncGenerator[entities.CommandReturn, None]:
         
-        plugin_list = self.ap.plugin_mgr.plugins
+        plugin_list = self.ap.plugin_mgr.plugins()
         reply_str = "所有插件({}):\n".format(len(plugin_list))
         idx = 0
         for plugin in plugin_list:
@@ -110,7 +110,7 @@ class PluginUpdateAllOperator(operator.CommandOperator):
         try:
             plugins = [
                 p.plugin_name
-                for p in self.ap.plugin_mgr.plugins
+                for p in self.ap.plugin_mgr.plugins()
             ]
 
             if plugins:
@@ -163,24 +163,6 @@ class PluginDelOperator(operator.CommandOperator):
                 yield entities.CommandReturn(error=errors.CommandError("插件删除失败: "+str(e)))
 
 
-async def update_plugin_status(plugin_name: str, new_status: bool, ap: app.Application):
-    if ap.plugin_mgr.get_plugin_by_name(plugin_name) is not None:
-        for plugin in ap.plugin_mgr.plugins:
-            if plugin.plugin_name == plugin_name:
-                plugin.enabled = new_status
-
-                for func in plugin.content_functions:
-                    func.enable = new_status
-                
-                await ap.plugin_mgr.setting.dump_container_setting(ap.plugin_mgr.plugins)
-
-                break
-
-        return True
-    else:
-        return False
-
-
 @operator.operator_class(
     name="on",
     help="启用插件",
@@ -200,7 +182,7 @@ class PluginEnableOperator(operator.CommandOperator):
             plugin_name = context.crt_params[0]
 
             try:
-                if await update_plugin_status(plugin_name, True, self.ap):
+                if await self.ap.plugin_mgr.update_plugin_switch(plugin_name, True):
                     yield entities.CommandReturn(text="已启用插件: {}".format(plugin_name))
                 else:
                     yield entities.CommandReturn(error=errors.CommandError("插件状态修改失败: 未找到插件 {}".format(plugin_name)))
@@ -228,7 +210,7 @@ class PluginDisableOperator(operator.CommandOperator):
             plugin_name = context.crt_params[0]
 
             try:
-                if await update_plugin_status(plugin_name, False, self.ap):
+                if await self.ap.plugin_mgr.update_plugin_switch(plugin_name, False):
                     yield entities.CommandReturn(text="已禁用插件: {}".format(plugin_name))
                 else:
                     yield entities.CommandReturn(error=errors.CommandError("插件状态修改失败: 未找到插件 {}".format(plugin_name)))

pkg/command/operators/version.py

@@ -20,7 +20,7 @@ class VersionCommand(operator.CommandOperator):
 
         try:
             if await self.ap.ver_mgr.is_new_version_available():
-                reply_str += "\n\n有新版本可用, 使用 !update 更新"
+                reply_str += "\n\n有新版本可用。"
         except:
             pass
 

pkg/config/impls/yaml.py

@@ -0,0 +1,59 @@
+import os
+import shutil
+import yaml
+
+from .. import model as file_model
+
+
+class YAMLConfigFile(file_model.ConfigFile):
+    """YAML配置文件"""
+
+    def __init__(
+        self, config_file_name: str, template_file_name: str = None, template_data: dict = None
+    ) -> None:
+        self.config_file_name = config_file_name
+        self.template_file_name = template_file_name
+        self.template_data = template_data
+
+    def exists(self) -> bool:
+        return os.path.exists(self.config_file_name)
+
+    async def create(self):
+        if self.template_file_name is not None:
+            shutil.copyfile(self.template_file_name, self.config_file_name)
+        elif self.template_data is not None:
+            with open(self.config_file_name, "w", encoding="utf-8") as f:
+                yaml.dump(self.template_data, f, indent=4, allow_unicode=True)
+        else:
+            raise ValueError("template_file_name or template_data must be provided")
+
+    async def load(self, completion: bool=True) -> dict:
+
+        if not self.exists():
+            await self.create()
+
+        if self.template_file_name is not None:
+            with open(self.template_file_name, "r", encoding="utf-8") as f:
+                self.template_data = yaml.load(f, Loader=yaml.FullLoader)
+
+        with open(self.config_file_name, "r", encoding="utf-8") as f:
+            try:
+                cfg = yaml.load(f, Loader=yaml.FullLoader)
+            except yaml.YAMLError as e:
+                raise Exception(f"配置文件 {self.config_file_name} 语法错误: {e}")
+
+        if completion:
+
+            for key in self.template_data:
+                if key not in cfg:
+                    cfg[key] = self.template_data[key]
+
+        return cfg
+
+    async def save(self, cfg: dict):
+        with open(self.config_file_name, "w", encoding="utf-8") as f:
+            yaml.dump(cfg, f, indent=4, allow_unicode=True)
+
+    def save_sync(self, cfg: dict):
+        with open(self.config_file_name, "w", encoding="utf-8") as f:
+            yaml.dump(cfg, f, indent=4, allow_unicode=True)

pkg/config/manager.py

@@ -1,14 +1,22 @@
 from __future__ import annotations
 
 from . import model as file_model
-from .impls import pymodule, json as json_file
+from .impls import pymodule, json as json_file, yaml as yaml_file
-
-
-managers: ConfigManager = []
 
 
 class ConfigManager:
     """配置文件管理器"""
+    
+    name: str = None
+    """配置管理器名"""
+
+    description: str = None
+    """配置管理器描述"""
+
+    schema: dict = None
+    """配置文件 schema
+    需要符合 JSON Schema Draft 7 规范
+    """
 
     file: file_model.ConfigFile = None
     """配置文件实例"""
@@ -16,6 +24,9 @@ class ConfigManager:
     data: dict = None
     """配置数据"""
 
+    doc_link: str = None
+    """配置文件文档链接"""
+
     def __init__(self, cfg_file: file_model.ConfigFile) -> None:
         self.file = cfg_file
         self.data = {}
@@ -31,7 +42,16 @@ class ConfigManager:
 
 
 async def load_python_module_config(config_name: str, template_name: str, completion: bool=True) -> ConfigManager:
-    """加载Python模块配置文件"""
+    """加载Python模块配置文件
+    
+    Args:
+        config_name (str): 配置文件名
+        template_name (str): 模板文件名
+        completion (bool): 是否自动补全内存中的配置文件
+
+    Returns:
+        ConfigManager: 配置文件管理器
+    """
     cfg_inst = pymodule.PythonModuleConfigFile(
         config_name,
         template_name
@@ -44,7 +64,14 @@ async def load_python_module_config(config_name: str, template_name: str, comple
 
 
 async def load_json_config(config_name: str, template_name: str=None, template_data: dict=None, completion: bool=True) -> ConfigManager:
-    """加载JSON配置文件"""
+    """加载JSON配置文件
+    
+    Args:
+        config_name (str): 配置文件名
+        template_name (str): 模板文件名
+        template_data (dict): 模板数据
+        completion (bool): 是否自动补全内存中的配置文件
+    """
     cfg_inst = json_file.JSONConfigFile(
         config_name,
         template_name,
@@ -54,4 +81,28 @@ async def load_json_config(config_name: str, template_name: str=None, template_d
     cfg_mgr = ConfigManager(cfg_inst)
     await cfg_mgr.load_config(completion=completion)
 
-    return cfg_mgr
+    return cfg_mgr
+
+
+async def load_yaml_config(config_name: str, template_name: str=None, template_data: dict=None, completion: bool=True) -> ConfigManager:
+    """加载YAML配置文件
+    
+    Args:
+        config_name (str): 配置文件名
+        template_name (str): 模板文件名
+        template_data (dict): 模板数据
+        completion (bool): 是否自动补全内存中的配置文件
+
+    Returns:
+        ConfigManager: 配置文件管理器
+    """
+    cfg_inst = yaml_file.YAMLConfigFile(
+        config_name,
+        template_name,
+        template_data
+    )
+
+    cfg_mgr = ConfigManager(cfg_inst)
+    await cfg_mgr.load_config(completion=completion)
+
+    return cfg_mgr

pkg/config/settings.py

@@ -0,0 +1,75 @@
+from __future__ import annotations
+
+from . import manager as config_manager
+from ..core import app
+
+
+class SettingsManager:
+    """设置管理器
+    保存、管理多个配置文件管理器
+    """
+
+    ap: app.Application
+
+    managers: list[config_manager.ConfigManager] = []
+    """配置文件管理器列表"""
+
+    def __init__(self, ap: app.Application) -> None:
+        self.ap = ap
+        self.managers = []
+
+    async def initialize(self) -> None:
+        pass
+
+    def register_manager(
+        self,
+        name: str,
+        description: str,
+        manager: config_manager.ConfigManager,
+        schema: dict=None,
+        doc_link: str=None,
+    ) -> None:
+        """注册配置管理器
+        
+        Args:
+            name (str): 配置管理器名
+            description (str): 配置管理器描述
+            manager (ConfigManager): 配置管理器
+            schema (dict): 配置文件 schema，符合 JSON Schema Draft 7 规范
+        """
+
+        for m in self.managers:
+            if m.name == name:
+                raise ValueError(f'配置管理器名 {name} 已存在')
+
+        manager.name = name
+        manager.description = description
+        manager.schema = schema
+        manager.doc_link = doc_link
+        self.managers.append(manager)
+
+    def get_manager(self, name: str) -> config_manager.ConfigManager | None:
+        """获取配置管理器
+        
+        Args:
+            name (str): 配置管理器名
+        
+        Returns:
+            ConfigManager: 配置管理器
+        """
+
+        for m in self.managers:
+            if m.name == name:
+                return m
+
+        return None
+    
+    def get_manager_list(self) -> list[config_manager.ConfigManager]:
+        """获取配置管理器列表
+        
+        Returns:
+            list[ConfigManager]: 配置管理器列表
+        """
+
+        return self.managers
+    

pkg/core/app.py

@@ -2,25 +2,42 @@ from __future__ import annotations
 
 import logging
 import asyncio
+import threading
 import traceback
+import enum
+import sys
+import os
 
 from ..platform import manager as im_mgr
 from ..provider.session import sessionmgr as llm_session_mgr
 from ..provider.modelmgr import modelmgr as llm_model_mgr
 from ..provider.sysprompt import sysprompt as llm_prompt_mgr
 from ..provider.tools import toolmgr as llm_tool_mgr
+from ..provider import runnermgr
 from ..config import manager as config_mgr
+from ..config import settings as settings_mgr
 from ..audit.center import v2 as center_mgr
 from ..command import cmdmgr
 from ..plugin import manager as plugin_mgr
 from ..pipeline import pool
 from ..pipeline import controller, stagemgr
 from ..utils import version as version_mgr, proxy as proxy_mgr, announce as announce_mgr
+from ..persistence import mgr as persistencemgr
+from ..api.http.controller import main as http_controller
+from ..api.http.service import user as user_service
+from ..utils import logcache, ip
+from . import taskmgr
+from . import entities as core_entities
 
 
 class Application:
     """运行时应用对象和上下文"""
 
+    event_loop: asyncio.AbstractEventLoop = None
+
+    # asyncio_tasks: list[asyncio.Task] = []
+    task_mgr: taskmgr.AsyncTaskManager = None
+
     platform_mgr: im_mgr.PlatformManager = None
 
     cmd_mgr: cmdmgr.CommandManager = None
@@ -33,6 +50,10 @@ class Application:
 
     tool_mgr: llm_tool_mgr.ToolManager = None
 
+    runner_mgr: runnermgr.RunnerManager = None
+
+    settings_mgr: settings_mgr.SettingsManager = None
+
     # ======= 配置管理器 =======
 
     command_cfg: config_mgr.ConfigManager = None
@@ -55,6 +76,8 @@ class Application:
 
     llm_models_meta: config_mgr.ConfigManager = None
 
+    instance_secret_meta: config_mgr.ConfigManager = None
+
     # =========================
 
     ctr_mgr: center_mgr.V2CenterAPI = None
@@ -75,6 +98,16 @@ class Application:
 
     logger: logging.Logger = None
 
+    persistence_mgr: persistencemgr.PersistenceManager = None
+
+    http_ctrl: http_controller.HTTPController = None
+
+    log_cache: logcache.LogCache = None
+
+    # ========= HTTP Services =========
+
+    user_service: user_service.UserService = None
+
     def __init__(self):
         pass
 
@@ -82,34 +115,89 @@ class Application:
         pass
 
     async def run(self):
-        await self.plugin_mgr.initialize_plugins()
-
-        tasks = []
-
         try:
-   
+            await self.plugin_mgr.initialize_plugins()
-            tasks = [
+            # 后续可能会允许动态重启其他任务
-                asyncio.create_task(self.platform_mgr.run()),
+            # 故为了防止程序在非 Ctrl-C 情况下退出，这里创建一个不会结束的协程
-                asyncio.create_task(self.ctrl.run())
+            async def never_ending():
-            ]
+                while True:
+                    await asyncio.sleep(1)
 
-            # 挂信号处理
+            self.task_mgr.create_task(self.platform_mgr.run(), name="platform-manager", scopes=[core_entities.LifecycleControlScope.APPLICATION, core_entities.LifecycleControlScope.PLATFORM])
-
+            self.task_mgr.create_task(self.ctrl.run(), name="query-controller", scopes=[core_entities.LifecycleControlScope.APPLICATION])
-            import signal
+            self.task_mgr.create_task(self.http_ctrl.run(), name="http-api-controller", scopes=[core_entities.LifecycleControlScope.APPLICATION])
-
+            self.task_mgr.create_task(never_ending(), name="never-ending-task", scopes=[core_entities.LifecycleControlScope.APPLICATION])
-            def signal_handler(sig, frame):
-                for task in tasks:
-                    task.cancel()
-                self.logger.info("程序退出.")
-                exit(0)
-
-            signal.signal(signal.SIGINT, signal_handler)
-
-            await asyncio.gather(*tasks, return_exceptions=True)
 
+            await self.print_web_access_info()
+            await self.task_mgr.wait_all()
         except asyncio.CancelledError:
             pass
         except Exception as e:
             self.logger.error(f"应用运行致命异常: {e}")
             self.logger.debug(f"Traceback: {traceback.format_exc()}")
 
+    async def print_web_access_info(self):
+        """打印访问 webui 的提示"""
+
+        if not os.path.exists(os.path.join(".", "web/dist")):
+            self.logger.warning("WebUI 文件缺失，请根据文档获取：https://docs.langbot.app/webui/intro.html")
+            return
+
+        import socket
+
+        host_ip = socket.gethostbyname(socket.gethostname())
+
+        public_ip = await ip.get_myip()
+
+        port = self.system_cfg.data['http-api']['port']
+
+        tips = f"""
+=======================================
+✨ 您可通过以下方式访问管理面板
+
+🏠 本地地址：http://{host_ip}:{port}/
+🌐 公网地址：http://{public_ip}:{port}/
+
+📌 如果您在容器中运行此程序，请确保容器的 {port} 端口已对外暴露
+🔗 若要使用公网地址访问，请阅读以下须知
+   1. 公网地址仅供参考，请以您的主机公网 IP 为准；
+   2. 要使用公网地址访问，请确保您的主机具有公网 IP，并且系统防火墙已放行 {port} 端口；
+
+🤯 WebUI 仍处于 Beta 测试阶段，如有问题或建议请反馈到 https://github.com/RockChinQ/LangBot/issues
+=======================================
+""".strip()
+        for line in tips.split("\n"):
+            self.logger.info(line)
+
+    async def reload(
+        self,
+        scope: core_entities.LifecycleControlScope,
+    ):
+        match scope:
+            case core_entities.LifecycleControlScope.PLATFORM.value:
+                self.logger.info("执行热重载 scope="+scope)
+                await self.platform_mgr.shutdown()
+
+                self.platform_mgr = im_mgr.PlatformManager(self)
+
+                await self.platform_mgr.initialize()
+
+                self.task_mgr.create_task(self.platform_mgr.run(), name="platform-manager", scopes=[core_entities.LifecycleControlScope.APPLICATION, core_entities.LifecycleControlScope.PLATFORM])
+            case core_entities.LifecycleControlScope.PLUGIN.value:
+                self.logger.info("执行热重载 scope="+scope)
+                await self.plugin_mgr.destroy_plugins()
+
+                # 删除 sys.module 中所有的 plugins/* 下的模块
+                for mod in list(sys.modules.keys()):
+                    if mod.startswith("plugins."):
+                        del sys.modules[mod]
+
+                self.plugin_mgr = plugin_mgr.PluginManager(self)
+                await self.plugin_mgr.initialize()
+
+                await self.plugin_mgr.initialize_plugins()
+
+                await self.plugin_mgr.load_plugins()
+                await self.plugin_mgr.initialize_plugins()
+            case _:
+                pass

pkg/core/boot.py

@@ -1,10 +1,13 @@
 from __future__ import print_function
 
 import traceback
+import asyncio
+import os
 
 from . import app
 from ..audit import identifier
 from . import stage
+from ..utils import constants
 
 # 引入启动阶段实现以便注册
 from .stages import load_config, setup_logger, build_app, migrate, show_notes
@@ -19,13 +22,19 @@ stage_order = [
 ]
 
 
-async def make_app() -> app.Application:
+async def make_app(loop: asyncio.AbstractEventLoop) -> app.Application:
 
     # 生成标识符
     identifier.init()
 
+    # 确定是否为调试模式
+    if "DEBUG" in os.environ and os.environ["DEBUG"] in ["true", "1"]:
+        constants.debug_mode = True
+
     ap = app.Application()
 
+    ap.event_loop = loop
+
     # 执行启动阶段
     for stage_name in stage_order:
         stage_cls = stage.preregistered_stages[stage_name]
@@ -38,9 +47,23 @@ async def make_app() -> app.Application:
     return ap
 
 
-async def main():
+async def main(loop: asyncio.AbstractEventLoop):
     try:
-        app_inst = await make_app()
+
+        # 挂系统信号处理
+        import signal
+
+        ap: app.Application
+
+        def signal_handler(sig, frame):
+            print("[Signal] 程序退出.")
+            # ap.shutdown()
+            os._exit(0)
+
+        signal.signal(signal.SIGINT, signal_handler)
+
+        app_inst = await make_app(loop)
+        ap = app_inst
         await app_inst.run()
     except Exception as e:
         traceback.print_exc()

pkg/core/bootutils/deps.py

@@ -5,9 +5,8 @@ required_deps = {
     "openai": "openai",
     "anthropic": "anthropic",
     "colorlog": "colorlog",
-    "mirai": "yiri-mirai-rc",
     "aiocqhttp": "aiocqhttp",
-    "botpy": "qq-botpy",
+    "botpy": "qq-botpy-rc",
     "PIL": "pillow",
     "nakuru": "nakuru-project-idk",
     "tiktoken": "tiktoken",
@@ -15,6 +14,15 @@ required_deps = {
     "aiohttp": "aiohttp",
     "psutil": "psutil",
     "async_lru": "async-lru",
+    "ollama": "ollama",
+    "quart": "quart",
+    "quart_cors": "quart-cors",
+    "sqlalchemy": "sqlalchemy[asyncio]",
+    "aiosqlite": "aiosqlite",
+    "aiofiles": "aiofiles",
+    "aioshutil": "aioshutil",
+    "argon2": "argon2-cffi",
+    "jwt": "pyjwt",
 }
 
 

pkg/core/bootutils/log.py

@@ -5,6 +5,8 @@ import time
 
 import colorlog
 
+from ...utils import constants
+
 
 log_colors_config = {
     "DEBUG": "green",  # cyan white
@@ -15,18 +17,18 @@ log_colors_config = {
 }
 
 
-async def init_logging() -> logging.Logger:
+async def init_logging(extra_handlers: list[logging.Handler] = None) -> logging.Logger:
     # 删除所有现有的logger
     for handler in logging.root.handlers[:]:
         logging.root.removeHandler(handler)
 
     level = logging.INFO
 
-    if "DEBUG" in os.environ and os.environ["DEBUG"] in ["true", "1"]:
+    if constants.debug_mode:
         level = logging.DEBUG
 
-    log_file_name = "data/logs/qcg-%s.log" % time.strftime(
+    log_file_name = "data/logs/langbot-%s.log" % time.strftime(
-        "%Y-%m-%d-%H-%M-%S", time.localtime()
+        "%Y-%m-%d", time.localtime()
     )
 
     qcg_logger = logging.getLogger("qcg")
@@ -34,14 +36,18 @@ async def init_logging() -> logging.Logger:
     qcg_logger.setLevel(level)
 
     color_formatter = colorlog.ColoredFormatter(
-        fmt="%(log_color)s[%(asctime)s.%(msecs)03d] %(pathname)s (%(lineno)d) - [%(levelname)s] :\n    %(message)s",
+        fmt="%(log_color)s[%(asctime)s.%(msecs)03d] %(filename)s (%(lineno)d) - [%(levelname)s] : %(message)s",
-        datefmt="%Y-%m-%d %H:%M:%S",
+        datefmt="%m-%d %H:%M:%S",
         log_colors=log_colors_config,
     )
 
     stream_handler = logging.StreamHandler(sys.stdout)
+    # stream_handler.setLevel(level)
+    # stream_handler.setFormatter(color_formatter)
+    stream_handler.stream = open(sys.stdout.fileno(), mode='w', encoding='utf-8', buffering=1)
 
-    log_handlers: logging.Handler = [stream_handler, logging.FileHandler(log_file_name)]
+    log_handlers: list[logging.Handler] = [stream_handler, logging.FileHandler(log_file_name, encoding='utf-8')]
+    log_handlers += extra_handlers if extra_handlers is not None else []
 
     for handler in log_handlers:
         handler.setLevel(level)

pkg/core/entities.py

@@ -5,14 +5,24 @@ import typing
 import datetime
 import asyncio
 
-import pydantic
+import pydantic.v1 as pydantic
-import mirai
 
 from ..provider import entities as llm_entities
 from ..provider.modelmgr import entities
 from ..provider.sysprompt import entities as sysprompt_entities
 from ..provider.tools import entities as tools_entities
 from ..platform import adapter as msadapter
+from ..platform.types import message as platform_message
+from ..platform.types import events as platform_events
+from ..platform.types import entities as platform_entities
+
+
+
+class LifecycleControlScope(enum.Enum):
+
+    APPLICATION = "application"
+    PLATFORM = "platform"
+    PLUGIN = "plugin"
 
 
 class LauncherTypes(enum.Enum):
@@ -40,10 +50,10 @@ class Query(pydantic.BaseModel):
     sender_id: int
     """发送者ID，platform处理阶段设置"""
 
-    message_event: mirai.MessageEvent
+    message_event: platform_events.MessageEvent
     """事件，platform收到的原始事件"""
 
-    message_chain: mirai.MessageChain
+    message_chain: platform_message.MessageChain
     """消息链，platform收到的原始消息链"""
 
     adapter: msadapter.MessageSourceAdapter
@@ -67,10 +77,10 @@ class Query(pydantic.BaseModel):
     use_funcs: typing.Optional[list[tools_entities.LLMFunction]] = None
     """使用的函数，由前置处理器阶段设置"""
 
-    resp_messages: typing.Optional[list[llm_entities.Message]] | typing.Optional[list[mirai.MessageChain]] = []
+    resp_messages: typing.Optional[list[llm_entities.Message]] | typing.Optional[list[platform_message.MessageChain]] = []
     """由Process阶段生成的回复消息对象列表"""
 
-    resp_message_chain: typing.Optional[list[mirai.MessageChain]] = None
+    resp_message_chain: typing.Optional[list[platform_message.MessageChain]] = None
     """回复消息链，从resp_messages包装而得"""
 
     # ======= 内部保留 =======
@@ -108,7 +118,7 @@ class Session(pydantic.BaseModel):
 
     using_conversation: typing.Optional[Conversation] = None
 
-    conversations: typing.Optional[list[Conversation]] = []
+    conversations: typing.Optional[list[Conversation]] = pydantic.Field(default_factory=list)
 
     create_time: typing.Optional[datetime.datetime] = pydantic.Field(default_factory=datetime.datetime.now)
 

pkg/core/migration.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import abc
 import typing
 
-from ..core import app
+from . import app
 
 
 preregistered_migrations: list[typing.Type[Migration]] = []

pkg/core/migrations/m010_ollama_requester_config.py

@@ -0,0 +1,23 @@
+from __future__ import annotations
+
+from .. import migration
+
+
+@migration.migration_class("ollama-requester-config", 10)
+class MsgTruncatorConfigMigration(migration.Migration):
+    """迁移"""
+
+    async def need_migrate(self) -> bool:
+        """判断当前环境是否需要运行此迁移"""
+        return 'ollama-chat' not in self.ap.provider_cfg.data['requester']
+
+    async def run(self):
+        """执行迁移"""
+        
+        self.ap.provider_cfg.data['requester']['ollama-chat'] = {
+            "base-url": "http://127.0.0.1:11434",
+            "args": {},
+            "timeout": 600
+        }
+
+        await self.ap.provider_cfg.dump_config()

pkg/core/migrations/m011_command_prefix_config.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+from .. import migration
+
+
+@migration.migration_class("command-prefix-config", 11)
+class CommandPrefixConfigMigration(migration.Migration):
+    """迁移"""
+
+    async def need_migrate(self) -> bool:
+        """判断当前环境是否需要运行此迁移"""
+        return 'command-prefix' not in self.ap.command_cfg.data
+
+    async def run(self):
+        """执行迁移"""
+        
+        self.ap.command_cfg.data['command-prefix'] = [
+            "!", "！"
+        ]
+
+        await self.ap.command_cfg.dump_config()

pkg/core/migrations/m012_runner_config.py

@@ -0,0 +1,19 @@
+from __future__ import annotations
+
+from .. import migration
+
+
+@migration.migration_class("runner-config", 12)
+class RunnerConfigMigration(migration.Migration):
+    """迁移"""
+
+    async def need_migrate(self) -> bool:
+        """判断当前环境是否需要运行此迁移"""
+        return 'runner' not in self.ap.provider_cfg.data
+
+    async def run(self):
+        """执行迁移"""
+        
+        self.ap.provider_cfg.data['runner'] = 'local-agent'
+
+        await self.ap.provider_cfg.dump_config()

pkg/core/migrations/m013_http_api_config.py

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+from .. import migration
+
+
+@migration.migration_class("http-api-config", 13)
+class HttpApiConfigMigration(migration.Migration):
+    """迁移"""
+
+    async def need_migrate(self) -> bool:
+        """判断当前环境是否需要运行此迁移"""
+        return 'http-api' not in self.ap.system_cfg.data or "persistence" not in self.ap.system_cfg.data
+
+    async def run(self):
+        """执行迁移"""
+        
+        self.ap.system_cfg.data['http-api'] = {
+            "enable": True,
+            "host": "0.0.0.0",
+            "port": 5300,
+            "jwt-expire": 604800
+        }
+
+        self.ap.system_cfg.data['persistence'] = {
+            "sqlite": {
+                "path": "data/persistence.db"
+            },
+            "use": "sqlite"
+        }
+
+        await self.ap.system_cfg.dump_config()

pkg/core/migrations/m014_force_delay_config.py

@@ -0,0 +1,22 @@
+from __future__ import annotations
+
+from .. import migration
+
+
+@migration.migration_class("force-delay-config", 14)
+class ForceDelayConfigMigration(migration.Migration):
+    """迁移"""
+
+    async def need_migrate(self) -> bool:
+        """判断当前环境是否需要运行此迁移"""
+        return type(self.ap.platform_cfg.data['force-delay']) == list
+
+    async def run(self):
+        """执行迁移"""
+
+        self.ap.platform_cfg.data['force-delay'] = {
+            "min": self.ap.platform_cfg.data['force-delay'][0],
+            "max": self.ap.platform_cfg.data['force-delay'][1]
+        }
+
+        await self.ap.platform_cfg.dump_config()

pkg/core/migrations/m015_gitee_ai_config.py

@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+from .. import migration
+
+
+@migration.migration_class("gitee-ai-config", 15)
+class GiteeAIConfigMigration(migration.Migration):
+    """迁移"""
+
+    async def need_migrate(self) -> bool:
+        """判断当前环境是否需要运行此迁移"""
+        return 'gitee-ai-chat-completions' not in self.ap.provider_cfg.data['requester'] or 'gitee-ai' not in self.ap.provider_cfg.data['keys']
+
+    async def run(self):
+        """执行迁移"""
+        self.ap.provider_cfg.data['requester']['gitee-ai-chat-completions'] = {
+            "base-url": "https://ai.gitee.com/v1",
+            "args": {},
+            "timeout": 120
+        }
+
+        self.ap.provider_cfg.data['keys']['gitee-ai'] = [
+            "XXXXX"
+        ]
+
+        await self.ap.provider_cfg.dump_config()

pkg/core/stages/build_app.py

@@ -13,7 +13,14 @@ from ...provider.session import sessionmgr as llm_session_mgr
 from ...provider.modelmgr import modelmgr as llm_model_mgr
 from ...provider.sysprompt import sysprompt as llm_prompt_mgr
 from ...provider.tools import toolmgr as llm_tool_mgr
+from ...provider import runnermgr
 from ...platform import manager as im_mgr
+from ...persistence import mgr as persistencemgr
+from ...api.http.controller import main as http_controller
+from ...api.http.service import user as user_service
+from ...utils import logcache
+from .. import taskmgr
+
 
 @stage.stage_class("BuildAppStage")
 class BuildAppStage(stage.BootingStage):
@@ -23,6 +30,7 @@ class BuildAppStage(stage.BootingStage):
     async def run(self, ap: app.Application):
         """构建app对象的各个组件对象并初始化
         """
+        ap.task_mgr = taskmgr.AsyncTaskManager(ap)
 
         proxy_mgr = proxy.ProxyManager(ap)
         await proxy_mgr.initialize()
@@ -57,6 +65,13 @@ class BuildAppStage(stage.BootingStage):
 
         ap.query_pool = pool.QueryPool()
 
+        log_cache = logcache.LogCache()
+        ap.log_cache = log_cache
+
+        persistence_mgr_inst = persistencemgr.PersistenceManager(ap)
+        await persistence_mgr_inst.initialize()
+        ap.persistence_mgr = persistence_mgr_inst
+
         plugin_mgr_inst = plugin_mgr.PluginManager(ap)
         await plugin_mgr_inst.initialize()
         ap.plugin_mgr = plugin_mgr_inst
@@ -81,6 +96,11 @@ class BuildAppStage(stage.BootingStage):
         llm_tool_mgr_inst = llm_tool_mgr.ToolManager(ap)
         await llm_tool_mgr_inst.initialize()
         ap.tool_mgr = llm_tool_mgr_inst
+
+        runner_mgr_inst = runnermgr.RunnerManager(ap)
+        await runner_mgr_inst.initialize()
+        ap.runner_mgr = runner_mgr_inst
+
         im_mgr_inst = im_mgr.PlatformManager(ap=ap)
         await im_mgr_inst.initialize()
         ap.platform_mgr = im_mgr_inst
@@ -89,6 +109,12 @@ class BuildAppStage(stage.BootingStage):
         await stage_mgr.initialize()
         ap.stage_mgr = stage_mgr
 
+        http_ctrl = http_controller.HTTPController(ap)
+        await http_ctrl.initialize()
+        ap.http_ctrl = http_ctrl
+
+        user_service_inst = user_service.UserService(ap)
+        ap.user_service = user_service_inst
 
         ctrl = controller.Controller(ap)
         ap.ctrl = ctrl

pkg/core/stages/load_config.py

@@ -1,7 +1,11 @@
 from __future__ import annotations
 
+import secrets
+
 from .. import stage, app
 from ..bootutils import config
+from ...config import settings as settings_mgr
+from ...utils import schema
 
 
 @stage.stage_class("LoadConfigStage")
@@ -12,12 +16,56 @@ class LoadConfigStage(stage.BootingStage):
     async def run(self, ap: app.Application):
         """启动
         """
+        
+        ap.settings_mgr = settings_mgr.SettingsManager(ap)
+        await ap.settings_mgr.initialize()
+
         ap.command_cfg = await config.load_json_config("data/config/command.json", "templates/command.json", completion=False)
         ap.pipeline_cfg = await config.load_json_config("data/config/pipeline.json", "templates/pipeline.json", completion=False)
         ap.platform_cfg = await config.load_json_config("data/config/platform.json", "templates/platform.json", completion=False)
         ap.provider_cfg = await config.load_json_config("data/config/provider.json", "templates/provider.json", completion=False)
         ap.system_cfg = await config.load_json_config("data/config/system.json", "templates/system.json", completion=False)
 
+        ap.settings_mgr.register_manager(
+            name="command.json",
+            description="命令配置",
+            manager=ap.command_cfg,
+            schema=schema.CONFIG_COMMAND_SCHEMA,
+            doc_link="https://docs.langbot.app/config/function/command.html"
+        )
+
+        ap.settings_mgr.register_manager(
+            name="pipeline.json",
+            description="消息处理流水线配置",
+            manager=ap.pipeline_cfg,
+            schema=schema.CONFIG_PIPELINE_SCHEMA,
+            doc_link="https://docs.langbot.app/config/function/pipeline.html"
+        )
+
+        ap.settings_mgr.register_manager(
+            name="platform.json",
+            description="消息平台配置",
+            manager=ap.platform_cfg,
+            schema=schema.CONFIG_PLATFORM_SCHEMA,
+            doc_link="https://docs.langbot.app/config/function/platform.html"
+        )
+
+        ap.settings_mgr.register_manager(
+            name="provider.json",
+            description="大模型能力配置",
+            manager=ap.provider_cfg,
+            schema=schema.CONFIG_PROVIDER_SCHEMA,
+            doc_link="https://docs.langbot.app/config/function/provider.html"
+        )
+
+        ap.settings_mgr.register_manager(
+            name="system.json",
+            description="系统配置",
+            manager=ap.system_cfg,
+            schema=schema.CONFIG_SYSTEM_SCHEMA,
+            doc_link="https://docs.langbot.app/config/function/system.html"
+        )
+
         ap.plugin_setting_meta = await config.load_json_config("plugins/plugins.json", "templates/plugin-settings.json")
         await ap.plugin_setting_meta.dump_config()
 
@@ -29,3 +77,8 @@ class LoadConfigStage(stage.BootingStage):
 
         ap.llm_models_meta = await config.load_json_config("data/metadata/llm-models.json", "templates/metadata/llm-models.json")
         await ap.llm_models_meta.dump_config()
+
+        ap.instance_secret_meta = await config.load_json_config("data/metadata/instance-secret.json", template_data={
+            'jwt_secret': secrets.token_hex(16)
+        })
+        await ap.instance_secret_meta.dump_config()

pkg/core/stages/migrate.py

@@ -3,9 +3,11 @@ from __future__ import annotations
 import importlib
 
 from .. import stage, app
-from ...config import migration
+from .. import migration
-from ...config.migrations import m001_sensitive_word_migration, m002_openai_config_migration, m003_anthropic_requester_cfg_completion, m004_moonshot_cfg_completion
+from ..migrations import m001_sensitive_word_migration, m002_openai_config_migration, m003_anthropic_requester_cfg_completion, m004_moonshot_cfg_completion
-from ...config.migrations import m005_deepseek_cfg_completion, m006_vision_config, m007_qcg_center_url, m008_ad_fixwin_config_migrate, m009_msg_truncator_cfg
+from ..migrations import m005_deepseek_cfg_completion, m006_vision_config, m007_qcg_center_url, m008_ad_fixwin_config_migrate, m009_msg_truncator_cfg
+from ..migrations import m010_ollama_requester_config, m011_command_prefix_config, m012_runner_config, m013_http_api_config, m014_force_delay_config
+from ..migrations import m015_gitee_ai_config
 
 
 @stage.stage_class("MigrationStage")
@@ -27,3 +29,4 @@ class MigrationStage(stage.BootingStage):
 
             if await migration_instance.need_migrate():
                 await migration_instance.run()
+                print(f'已执行迁移 {migration_instance.name}')

pkg/core/stages/setup_logger.py

@@ -1,9 +1,38 @@
 from __future__ import annotations
 
+import logging
+import asyncio
+from datetime import datetime
+
 from .. import stage, app
 from ..bootutils import log
 
 
+class PersistenceHandler(logging.Handler, object):
+    """
+    保存日志到数据库
+    """
+    ap: app.Application
+
+    def __init__(self, name, ap: app.Application):
+        logging.Handler.__init__(self)
+        self.ap = ap
+
+    def emit(self, record):
+        """
+        emit函数为自定义handler类时必重写的函数，这里可以根据需要对日志消息做一些处理，比如发送日志到服务器
+
+        发出记录(Emit a record)
+        """
+        try:
+            msg = self.format(record)
+            if self.ap.log_cache is not None:
+                self.ap.log_cache.add_log(msg)
+                
+        except Exception:
+            self.handleError(record)
+
+
 @stage.stage_class("SetupLoggerStage")
 class SetupLoggerStage(stage.BootingStage):
     """设置日志器阶段
@@ -12,4 +41,9 @@ class SetupLoggerStage(stage.BootingStage):
     async def run(self, ap: app.Application):
         """启动
         """
-        ap.logger = await log.init_logging()
+        persistence_handler = PersistenceHandler('LoggerHandler', ap)
+
+        extra_handlers = []
+        extra_handlers = [persistence_handler]
+
+        ap.logger = await log.init_logging(extra_handlers)

pkg/core/taskmgr.py

@@ -0,0 +1,235 @@
+from __future__ import annotations
+
+import asyncio
+import typing
+import datetime
+import traceback
+
+from . import app
+from . import entities as core_entities
+
+
+class TaskContext:
+    """任务跟踪上下文"""
+
+    current_action: str
+    """当前正在执行的动作"""
+
+    log: str
+    """记录日志"""
+
+    def __init__(self):
+        self.current_action = "default"
+        self.log = ""
+
+    def _log(self, msg: str):
+        self.log += msg + "\n"
+
+    def set_current_action(self, action: str):
+        self.current_action = action
+
+    def trace(
+        self,
+        msg: str,
+        action: str = None,
+    ):
+        if action is not None:
+            self.set_current_action(action)
+
+        self._log(
+            f"{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')} | {self.current_action} | {msg}"
+        )
+
+    def to_dict(self) -> dict:
+        return {"current_action": self.current_action, "log": self.log}
+    
+    @staticmethod
+    def new() -> TaskContext:
+        return TaskContext()
+    
+    @staticmethod
+    def placeholder() -> TaskContext:
+        global placeholder_context
+
+        if placeholder_context is None:
+            placeholder_context = TaskContext()
+
+        return placeholder_context
+
+
+placeholder_context: TaskContext | None = None
+
+
+class TaskWrapper:
+    """任务包装器"""
+
+    _id_index: int = 0
+    """任务ID索引"""
+
+    id: int
+    """任务ID"""
+
+    task_type: str = "system"  # 任务类型: system 或 user
+    """任务类型"""
+
+    kind: str = "system_task"  # 由发起者确定任务种类，通常同质化的任务种类相同
+    """任务种类"""
+
+    name: str = ""
+    """任务唯一名称"""
+
+    label: str = ""
+    """任务显示名称"""
+
+    task_context: TaskContext
+    """任务上下文"""
+
+    task: asyncio.Task
+    """任务"""
+
+    task_stack: list = None
+    """任务堆栈"""
+
+    ap: app.Application
+    """应用实例"""
+
+    scopes: list[core_entities.LifecycleControlScope]
+    """任务所属生命周期控制范围"""
+
+    def __init__(
+        self,
+        ap: app.Application,
+        coro: typing.Coroutine,
+        task_type: str = "system",
+        kind: str = "system_task",
+        name: str = "",
+        label: str = "",
+        context: TaskContext = None,
+        scopes: list[core_entities.LifecycleControlScope] = [core_entities.LifecycleControlScope.APPLICATION],
+    ):
+        self.id = TaskWrapper._id_index
+        TaskWrapper._id_index += 1
+        self.ap = ap
+        self.task_context = context or TaskContext()
+        self.task = self.ap.event_loop.create_task(coro)
+        self.task_type = task_type
+        self.kind = kind
+        self.name = name
+        self.label = label if label != "" else name
+        self.task.set_name(name)
+        self.scopes = scopes
+
+    def assume_exception(self):
+        try:
+            exception = self.task.exception()
+            if self.task_stack is None:
+                self.task_stack = self.task.get_stack()
+            return exception
+        except:
+            return None
+
+    def assume_result(self):
+        try:
+            return self.task.result()
+        except:
+            return None
+
+    def to_dict(self) -> dict:
+
+        exception_traceback = None
+        if self.assume_exception() is not None:
+            exception_traceback = 'Traceback (most recent call last):\n'
+
+            for frame in self.task_stack:
+                exception_traceback += f"  File \"{frame.f_code.co_filename}\", line {frame.f_lineno}, in {frame.f_code.co_name}\n"
+
+            exception_traceback += f"    {self.assume_exception().__str__()}\n"
+
+        return {
+            "id": self.id,
+            "task_type": self.task_type,
+            "kind": self.kind,
+            "name": self.name,
+            "label": self.label,
+            "scopes": [scope.value for scope in self.scopes],
+            "task_context": self.task_context.to_dict(),
+            "runtime": {
+                "done": self.task.done(),
+                "state": self.task._state,
+                "exception": self.assume_exception().__str__() if self.assume_exception() is not None else None,
+                "exception_traceback": exception_traceback,
+                "result": self.assume_result().__str__() if self.assume_result() is not None else None,
+            },
+        }
+    
+    def cancel(self):
+        self.task.cancel()
+
+
+class AsyncTaskManager:
+    """保存app中的所有异步任务
+    包含系统级的和用户级（插件安装、更新等由用户直接发起的）的"""
+
+    ap: app.Application
+
+    tasks: list[TaskWrapper]
+    """所有任务"""
+
+    def __init__(self, ap: app.Application):
+        self.ap = ap
+        self.tasks = []
+
+    def create_task(
+        self,
+        coro: typing.Coroutine,
+        task_type: str = "system",
+        kind: str = "system-task",
+        name: str = "",
+        label: str = "",
+        context: TaskContext = None,
+        scopes: list[core_entities.LifecycleControlScope] = [core_entities.LifecycleControlScope.APPLICATION],
+    ) -> TaskWrapper:
+        wrapper = TaskWrapper(self.ap, coro, task_type, kind, name, label, context, scopes)
+        self.tasks.append(wrapper)
+        return wrapper
+
+    def create_user_task(
+        self,
+        coro: typing.Coroutine,
+        kind: str = "user-task",
+        name: str = "",
+        label: str = "",
+        context: TaskContext = None,
+        scopes: list[core_entities.LifecycleControlScope] = [core_entities.LifecycleControlScope.APPLICATION],
+    ) -> TaskWrapper:
+        return self.create_task(coro, "user", kind, name, label, context, scopes)
+
+    async def wait_all(self):
+        await asyncio.gather(*[t.task for t in self.tasks], return_exceptions=True)
+
+    def get_all_tasks(self) -> list[TaskWrapper]:
+        return self.tasks
+
+    def get_tasks_dict(
+        self,
+        type: str = None,
+    ) -> dict:
+        return {
+            "tasks": [
+                t.to_dict() for t in self.tasks if type is None or t.task_type == type
+            ],
+            "id_index": TaskWrapper._id_index,
+        }
+    
+    def get_task_by_id(self, id: int) -> TaskWrapper | None:
+        for t in self.tasks:
+            if t.id == id:
+                return t
+        return None
+
+    def cancel_by_scope(self, scope: core_entities.LifecycleControlScope):
+        for wrapper in self.tasks:
+            
+            if not wrapper.task.done() and scope in wrapper.scopes:
+
+                wrapper.task.cancel()

pkg/persistence/database.py

@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+import abc
+
+import sqlalchemy.ext.asyncio as sqlalchemy_asyncio
+
+from ..core import app
+
+
+preregistered_managers: list[type[BaseDatabaseManager]] = []
+
+def manager_class(name: str) -> None:
+    """注册一个数据库管理类"""
+
+    def decorator(cls: type[BaseDatabaseManager]) -> type[BaseDatabaseManager]:
+        cls.name = name
+        preregistered_managers.append(cls)
+        return cls
+
+    return decorator
+
+
+class BaseDatabaseManager(abc.ABC):
+    """基础数据库管理类"""
+
+    name: str
+
+    ap: app.Application
+
+    engine: sqlalchemy_asyncio.AsyncEngine
+
+    def __init__(self, ap: app.Application) -> None:
+        self.ap = ap
+
+    @abc.abstractmethod
+    async def initialize(self) -> None:
+        pass
+
+    def get_engine(self) -> sqlalchemy_asyncio.AsyncEngine:
+        return self.engine

pkg/persistence/databases/sqlite.py

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+import sqlalchemy.ext.asyncio as sqlalchemy_asyncio
+
+from .. import database
+
+
+@database.manager_class("sqlite")
+class SQLiteDatabaseManager(database.BaseDatabaseManager):
+    """SQLite 数据库管理类"""
+    
+    async def initialize(self) -> None:
+        self.engine = sqlalchemy_asyncio.create_async_engine(f"sqlite+aiosqlite:///{self.ap.system_cfg.data['persistence']['sqlite']['path']}")

pkg/persistence/entities/base.py

@@ -0,0 +1,5 @@
+import sqlalchemy.orm
+
+
+class Base(sqlalchemy.orm.DeclarativeBase):
+    pass

pkg/persistence/entities/user.py

@@ -0,0 +1,11 @@
+import sqlalchemy
+
+from .base import Base
+
+
+class User(Base):
+    __tablename__ = 'users'
+
+    id = sqlalchemy.Column(sqlalchemy.Integer, primary_key=True)
+    user = sqlalchemy.Column(sqlalchemy.String(255), nullable=False)
+    password = sqlalchemy.Column(sqlalchemy.String(255), nullable=False)

pkg/persistence/mgr.py

@@ -0,0 +1,57 @@
+from __future__ import annotations
+
+import asyncio
+import datetime
+
+import sqlalchemy.ext.asyncio as sqlalchemy_asyncio
+import sqlalchemy
+
+from . import database
+from .entities import user, base
+from ..core import app
+from .databases import sqlite
+
+
+class PersistenceManager:
+    """持久化模块管理器"""
+
+    ap: app.Application
+
+    db: database.BaseDatabaseManager
+    """数据库管理器"""
+
+    meta: sqlalchemy.MetaData
+
+    def __init__(self, ap: app.Application):
+        self.ap = ap
+        self.meta = base.Base.metadata
+
+    async def initialize(self):
+        
+        for manager in database.preregistered_managers:
+            self.db = manager(self.ap)
+            await self.db.initialize()
+
+        await self.create_tables()
+
+    async def create_tables(self):
+        # TODO: 对扩展友好
+        
+        # 日志
+        async with self.get_db_engine().connect() as conn:
+            await conn.run_sync(self.meta.create_all)
+
+            await conn.commit()
+
+    async def execute_async(
+        self,
+        *args,
+        **kwargs
+    ) -> sqlalchemy.engine.cursor.CursorResult:
+        async with self.get_db_engine().connect() as conn:
+            result = await conn.execute(*args, **kwargs)
+            await conn.commit()
+            return result
+
+    def get_db_engine(self) -> sqlalchemy_asyncio.AsyncEngine:
+        return self.db.get_engine()

pkg/pipeline/cntfilter/cntfilter.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import mirai
-
 from ...core import app
 
 from .. import stage, entities, stagemgr
@@ -10,6 +8,9 @@ from ...config import manager as cfg_mgr
 from . import filter as filter_model, entities as filter_entities
 from .filters import cntignore, banwords, baiduexamine
 from ...provider import entities as llm_entities
+from ...platform.types import message as platform_message
+from ...platform.types import events as platform_events
+from ...platform.types import entities as platform_entities
 
 
 @stage.stage_class('PostContentFilterStage')
@@ -63,6 +64,7 @@ class ContentFilterStage(stage.PipelineStage):
         """请求llm前处理消息
         只要有一个不通过就不放行，只放行 PASS 的消息
         """
+
         if not self.ap.pipeline_cfg.data['income-msg-check']:
             return entities.StageProcessResult(
                 result_type=entities.ResultType.CONTINUE,
@@ -86,8 +88,8 @@ class ContentFilterStage(stage.PipelineStage):
                     elif result.level == filter_entities.ResultLevel.PASS:  # 传到下一个
                         message = result.replacement
             
-            query.message_chain = mirai.MessageChain(
+            query.message_chain = platform_message.MessageChain(
-                mirai.Plain(message)
+                platform_message.Plain(message)
             )
 
             return entities.StageProcessResult(
@@ -145,11 +147,13 @@ class ContentFilterStage(stage.PipelineStage):
             
             contain_non_text = False
 
+            text_components = [platform_message.Plain, platform_message.Source]
+
             for me in query.message_chain:
-                if not isinstance(me, mirai.Plain):
+                if type(me) not in text_components:
                     contain_non_text = True
                     break
-            
+
             if contain_non_text:
                 self.ap.logger.debug(f"消息中包含非文本消息，跳过内容过滤器检查。")
                 return entities.StageProcessResult(

pkg/pipeline/cntfilter/entities.py

@@ -2,7 +2,7 @@
 import typing
 import enum
 
-import pydantic
+import pydantic.v1 as pydantic
 
 from ...provider import entities as llm_entities
 

pkg/pipeline/controller.py

@@ -4,11 +4,10 @@ import asyncio
 import typing
 import traceback
 
-import mirai
-
 from ..core import app, entities
 from . import entities as pipeline_entities
 from ..plugin import events
+from ..platform.types import message as platform_message
 
 
 class Controller:
@@ -59,8 +58,13 @@ class Controller:
                             (await self.ap.sess_mgr.get_session(selected_query)).semaphore.release()
                             # 通知其他协程，有新的请求可以处理了
                             self.ap.query_pool.condition.notify_all()
-                    
+                    self.ap.task_mgr.create_task(
-                    asyncio.create_task(_process_query(selected_query))
+                        _process_query(selected_query),
+                        kind="query",
+                        name=f"query-{selected_query.query_id}",
+                        scopes=[entities.LifecycleControlScope.APPLICATION, entities.LifecycleControlScope.PLATFORM],
+                    )
+
         except Exception as e:
             # traceback.print_exc()
             self.ap.logger.error(f"控制器循环出错: {e}")
@@ -73,11 +77,11 @@ class Controller:
             # 处理str类型
 
             if isinstance(result.user_notice, str):
-                result.user_notice = mirai.MessageChain(
+                result.user_notice = platform_message.MessageChain(
-                    mirai.Plain(result.user_notice)
+                    platform_message.Plain(result.user_notice)
                 )
             elif isinstance(result.user_notice, list):
-                result.user_notice = mirai.MessageChain(
+                result.user_notice = platform_message.MessageChain(
                     *result.user_notice
                 )
 
@@ -159,6 +163,23 @@ class Controller:
     async def process_query(self, query: entities.Query):
         """处理请求
         """
+
+        # ======== 触发 MessageReceived 事件 ========
+        event_type = events.PersonMessageReceived if query.launcher_type == entities.LauncherTypes.PERSON else events.GroupMessageReceived
+
+        event_ctx = await self.ap.plugin_mgr.emit_event(
+            event=event_type(
+                launcher_type=query.launcher_type.value,
+                launcher_id=query.launcher_id,
+                sender_id=query.sender_id,
+                message_chain=query.message_chain,
+                query=query
+            )
+        )
+
+        if event_ctx.is_prevented_default():
+            return
+        
         self.ap.logger.debug(f"Processing query {query}")
 
         try:
@@ -166,7 +187,6 @@ class Controller:
         except Exception as e:
             self.ap.logger.error(f"处理请求时出错 query_id={query.query_id} stage={query.current_stage.inst_name} : {e}")
             self.ap.logger.debug(f"Traceback: {traceback.format_exc()}")
-            # traceback.print_exc()
         finally:
             self.ap.logger.debug(f"Query {query} processed")
 

pkg/pipeline/entities.py

@@ -3,9 +3,8 @@ from __future__ import annotations
 import enum
 import typing
 
-import pydantic
+import pydantic.v1 as pydantic
-import mirai
+from ..platform.types import message as platform_message
-import mirai.models.message as mirai_message
 
 from ..core import entities
 
@@ -25,13 +24,9 @@ class StageProcessResult(pydantic.BaseModel):
 
     new_query: entities.Query
 
-    user_notice: typing.Optional[typing.Union[str, list[mirai_message.MessageComponent], mirai.MessageChain, None]] = []
+    user_notice: typing.Optional[typing.Union[str, list[platform_message.MessageComponent], platform_message.MessageChain, None]] = []
     """只要设置了就会发送给用户"""
 
-    # TODO delete
-    # admin_notice: typing.Optional[typing.Union[str, list[mirai_message.MessageComponent], mirai.MessageChain, None]] = []
-    """只要设置了就会发送给管理员"""
-
     console_notice: typing.Optional[str] = ''
     """只要设置了就会输出到控制台"""
 

pkg/pipeline/longtext/longtext.py

@@ -3,7 +3,6 @@ import os
 import traceback
 
 from PIL import Image, ImageDraw, ImageFont
-from mirai.models.message import MessageComponent, Plain, MessageChain
 
 from ...core import app
 from . import strategy
@@ -11,6 +10,7 @@ from .strategies import image, forward
 from .. import stage, entities, stagemgr
 from ...core import entities as core_entities
 from ...config import manager as cfg_mgr
+from ...platform.types import message as platform_message
 
 
 @stage.stage_class("LongTextProcessStage")
@@ -63,14 +63,14 @@ class LongTextProcessStage(stage.PipelineStage):
         contains_non_plain = False
 
         for msg in query.resp_message_chain[-1]:
-            if not isinstance(msg, Plain):
+            if not isinstance(msg, platform_message.Plain):
                 contains_non_plain = True
                 break
         
         if contains_non_plain:
             self.ap.logger.debug("消息中包含非 Plain 组件，跳过长消息处理。")
         elif len(str(query.resp_message_chain[-1])) > self.ap.platform_cfg.data['long-text-process']['threshold']:
-            query.resp_message_chain[-1] = MessageChain(await self.strategy_impl.process(str(query.resp_message_chain[-1]), query))
+            query.resp_message_chain[-1] = platform_message.MessageChain(await self.strategy_impl.process(str(query.resp_message_chain[-1]), query))
 
         return entities.StageProcessResult(
             result_type=entities.ResultType.CONTINUE,

pkg/pipeline/longtext/strategies/forward.py

@@ -2,15 +2,14 @@
 from __future__ import annotations
 import typing
 
-from mirai.models import MessageChain
+import pydantic.v1 as pydantic
-from mirai.models.message import MessageComponent, ForwardMessageNode
-from mirai.models.base import MiraiBaseModel
 
 from .. import strategy as strategy_model
 from ....core import entities as core_entities
+from ....platform.types import message as platform_message
 
 
-class ForwardMessageDiaplay(MiraiBaseModel):
+class ForwardMessageDiaplay(pydantic.BaseModel):
     title: str = "群聊的聊天记录"
     brief: str = "[聊天记录]"
     source: str = "聊天记录"
@@ -18,13 +17,13 @@ class ForwardMessageDiaplay(MiraiBaseModel):
     summary: str = "查看x条转发消息"
 
 
-class Forward(MessageComponent):
+class Forward(platform_message.MessageComponent):
     """合并转发。"""
     type: str = "Forward"
     """消息组件类型。"""
     display: ForwardMessageDiaplay
     """显示信息"""
-    node_list: typing.List[ForwardMessageNode]
+    node_list: typing.List[platform_message.ForwardMessageNode]
     """转发消息节点列表。"""
     def __init__(self, *args, **kwargs):
         if len(args) == 1:
@@ -39,7 +38,7 @@ class Forward(MessageComponent):
 @strategy_model.strategy_class("forward")
 class ForwardComponentStrategy(strategy_model.LongTextStrategy):
 
-    async def process(self, message: str, query: core_entities.Query) -> list[MessageComponent]:
+    async def process(self, message: str, query: core_entities.Query) -> list[platform_message.MessageComponent]:
         display = ForwardMessageDiaplay(
             title="群聊的聊天记录",
             brief="[聊天记录]",
@@ -49,10 +48,10 @@ class ForwardComponentStrategy(strategy_model.LongTextStrategy):
         )
 
         node_list = [
-            ForwardMessageNode(
+            platform_message.ForwardMessageNode(
                 sender_id=query.adapter.bot_account_id,
                 sender_name='QQ用户',
-                message_chain=MessageChain([message])
+                message_chain=platform_message.MessageChain([message])
             )
         ]
 

pkg/pipeline/longtext/strategies/image.py

@@ -8,8 +8,7 @@ import re
 
 from PIL import Image, ImageDraw, ImageFont
 
-from mirai.models import MessageChain, Image as ImageComponent
+from ....platform.types import message as platform_message
-from mirai.models.message import MessageComponent
 
 from .. import strategy as strategy_model
 from ....core import entities as core_entities
@@ -23,7 +22,7 @@ class Text2ImageStrategy(strategy_model.LongTextStrategy):
     async def initialize(self):
         self.text_render_font = ImageFont.truetype(self.ap.platform_cfg.data['long-text-process']['font-path'], 32, encoding="utf-8")
     
-    async def process(self, message: str, query: core_entities.Query) -> list[MessageComponent]:
+    async def process(self, message: str, query: core_entities.Query) -> list[platform_message.MessageComponent]:
         img_path = self.text_to_image(
             text_str=message,
             save_as='temp/{}.png'.format(int(time.time()))
@@ -46,7 +45,7 @@ class Text2ImageStrategy(strategy_model.LongTextStrategy):
             os.remove(compressed_path)
 
         return [
-            ImageComponent(
+            platform_message.Image(
                 base64=b64.decode('utf-8'),
             )
         ]
@@ -59,7 +58,7 @@ class Text2ImageStrategy(strategy_model.LongTextStrategy):
         """
         kv = []
         nums = []
-        beforeDatas = re.findall('[\d]+', path)
+        beforeDatas = re.findall('[\\d]+', path)
         for num in beforeDatas:
             indexV = []
             times = path.count(num)

pkg/pipeline/longtext/strategy.py

@@ -2,11 +2,10 @@ from __future__ import annotations
 import abc
 import typing
 
-import mirai
-from mirai.models.message import MessageComponent
 
 from ...core import app
 from ...core import entities as core_entities
+from ...platform.types import message as platform_message
 
 
 preregistered_strategies: list[typing.Type[LongTextStrategy]] = []
@@ -51,7 +50,7 @@ class LongTextStrategy(metaclass=abc.ABCMeta):
         pass
     
     @abc.abstractmethod
-    async def process(self, message: str, query: core_entities.Query) -> list[MessageComponent]:
+    async def process(self, message: str, query: core_entities.Query) -> list[platform_message.MessageComponent]:
         """处理长文本
 
         在 platform.json 中配置 long-text-process 字段，只要 文本长度超过了 threshold 就会调用此方法
@@ -61,6 +60,6 @@ class LongTextStrategy(metaclass=abc.ABCMeta):
             query (core_entities.Query): 此次请求的上下文对象
 
         Returns:
-            list[mirai.models.messages.MessageComponent]: 转换后的 YiriMirai 消息组件列表
+            list[platform_message.MessageComponent]: 转换后的 平台 消息组件列表
         """
         return []

pkg/pipeline/pool.py

@@ -2,10 +2,11 @@ from __future__ import annotations
 
 import asyncio
 
-import mirai
 
 from ..core import entities
 from ..platform import adapter as msadapter
+from ..platform.types import message as platform_message
+from ..platform.types import events as platform_events
 
 
 class QueryPool:
@@ -30,8 +31,8 @@ class QueryPool:
         launcher_type: entities.LauncherTypes,
         launcher_id: int,
         sender_id: int,
-        message_event: mirai.MessageEvent,
+        message_event: platform_events.MessageEvent,
-        message_chain: mirai.MessageChain,
+        message_chain: platform_message.MessageChain,
         adapter: msadapter.MessageSourceAdapter
     ) -> entities.Query:
         async with self.condition:

pkg/pipeline/preproc/preproc.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-import mirai
 
 from .. import stage, entities, stagemgr
 from ...core import entities as core_entities
 from ...provider import entities as llm_entities
 from ...plugin import events
+from ...platform.types import message as platform_message
 
 
 @stage.stage_class("PreProcessor")
@@ -55,11 +55,11 @@ class PreProcessor(stage.PipelineStage):
         content_list = []
 
         for me in query.message_chain:
-            if isinstance(me, mirai.Plain):
+            if isinstance(me, platform_message.Plain):
                 content_list.append(
                     llm_entities.ContentElement.from_text(me.text)
                 )
-            elif isinstance(me, mirai.Image):
+            elif isinstance(me, platform_message.Image):
                 if self.ap.provider_cfg.data['enable-vision'] and query.use_model.vision_supported:
                     if me.url is not None:
                         content_list.append(

pkg/pipeline/process/handlers/chat.py

@@ -5,14 +5,15 @@ import time
 import traceback
 import json
 
-import mirai
 
 from .. import handler
 from ... import entities
 from ....core import entities as core_entities
-from ....provider import entities as llm_entities
+from ....provider import entities as llm_entities, runnermgr
 from ....plugin import events
 
+from ....platform.types import message as platform_message
+
 
 class ChatMessageHandler(handler.MessageHandler):
 
@@ -40,7 +41,7 @@ class ChatMessageHandler(handler.MessageHandler):
 
         if event_ctx.is_prevented_default():
             if event_ctx.event.reply is not None:
-                mc = mirai.MessageChain(event_ctx.event.reply)
+                mc = platform_message.MessageChain(event_ctx.event.reply)
 
                 query.resp_messages.append(mc)
 
@@ -71,7 +72,9 @@ class ChatMessageHandler(handler.MessageHandler):
 
             try:
 
-                async for result in self.runner(query):
+                runner = self.ap.runner_mgr.get_runner()
+
+                async for result in runner.run(query):
                     query.resp_messages.append(result)
 
                     self.ap.logger.info(f'对话({query.query_id})响应: {self.cut_str(result.readable_str())}')
@@ -108,64 +111,3 @@ class ChatMessageHandler(handler.MessageHandler):
                     response_seconds=int(time.time() - start_time),
                     retry_times=-1,
                 )
-
-    async def runner(
-        self,
-        query: core_entities.Query,
-    ) -> typing.AsyncGenerator[llm_entities.Message, None]:
-        """执行一个请求处理过程中的LLM接口请求、函数调用的循环
-        
-        这是临时处理方案，后续可能改为使用LangChain或者自研的工作流处理器
-        """
-        await query.use_model.requester.preprocess(query)
-
-        pending_tool_calls = []
-
-        req_messages = query.prompt.messages.copy() + query.messages.copy() + [query.user_message]
-
-        # 首次请求
-        msg = await query.use_model.requester.call(query.use_model, req_messages, query.use_funcs)
-
-        yield msg
-
-        pending_tool_calls = msg.tool_calls
-
-        req_messages.append(msg)
-
-        # 持续请求，只要还有待处理的工具调用就继续处理调用
-        while pending_tool_calls:
-            for tool_call in pending_tool_calls:
-                try:
-                    func = tool_call.function
-                    
-                    parameters = json.loads(func.arguments)
-
-                    func_ret = await self.ap.tool_mgr.execute_func_call(
-                        query, func.name, parameters
-                    )
-
-                    msg = llm_entities.Message(
-                        role="tool", content=json.dumps(func_ret, ensure_ascii=False), tool_call_id=tool_call.id
-                    )
-
-                    yield msg
-
-                    req_messages.append(msg)
-                except Exception as e:
-                    # 工具调用出错，添加一个报错信息到 req_messages
-                    err_msg = llm_entities.Message(
-                        role="tool", content=f"err: {e}", tool_call_id=tool_call.id
-                    )
-
-                    yield err_msg
-
-                    req_messages.append(err_msg)
-
-            # 处理完所有调用，再次请求
-            msg = await query.use_model.requester.call(query.use_model, req_messages, query.use_funcs)
-
-            yield msg
-
-            pending_tool_calls = msg.tool_calls
-
-            req_messages.append(msg)

pkg/pipeline/process/handlers/command.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 import typing
 
-import mirai
 
 from .. import handler
 from ... import entities
 from ....core import entities as core_entities
 from ....provider import entities as llm_entities
 from ....plugin import events
+from ....platform.types import message as platform_message
 
 
 class CommandHandler(handler.MessageHandler):
@@ -46,7 +46,7 @@ class CommandHandler(handler.MessageHandler):
         if event_ctx.is_prevented_default():
 
             if event_ctx.event.reply is not None:
-                mc = mirai.MessageChain(event_ctx.event.reply)
+                mc = platform_message.MessageChain(event_ctx.event.reply)
 
                 query.resp_messages.append(mc)
 
@@ -63,8 +63,8 @@ class CommandHandler(handler.MessageHandler):
         else:
 
             if event_ctx.event.alter is not None:
-                query.message_chain = mirai.MessageChain([
+                query.message_chain = platform_message.MessageChain([
-                    mirai.Plain(event_ctx.event.alter)
+                    platform_message.Plain(event_ctx.event.alter)
                 ])
 
             session = await self.ap.sess_mgr.get_session(query)

pkg/pipeline/process/process.py

@@ -42,7 +42,9 @@ class Processor(stage.PipelineStage):
         self.ap.logger.info(f"处理 {query.launcher_type.value}_{query.launcher_id} 的请求({query.query_id}): {message_text}")
 
         async def generator():
-            if message_text.startswith('!') or message_text.startswith('！'):
+            cmd_prefix = self.ap.command_cfg.data['command-prefix']
+
+            if any(message_text.startswith(prefix) for prefix in cmd_prefix):
                 async for result in self.cmd_handler.handle(query):
                     yield result
             else:

pkg/pipeline/respback/respback.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import random
 import asyncio
 
-import mirai
 
 from ...core import app
 
@@ -20,7 +19,10 @@ class SendResponseBackStage(stage.PipelineStage):
     async def process(self, query: core_entities.Query, stage_inst_name: str) -> entities.StageProcessResult:
         """处理
         """
-        random_delay = random.uniform(*self.ap.platform_cfg.data['force-delay'])
+        
+        random_range = (self.ap.platform_cfg.data['force-delay']['min'], self.ap.platform_cfg.data['force-delay']['max'])
+
+        random_delay = random.uniform(*random_range)
 
         self.ap.logger.debug(
             "根据规则强制延迟回复: %s s",

pkg/pipeline/resprule/entities.py

@@ -1,9 +1,10 @@
-import pydantic
+import pydantic.v1 as pydantic
-import mirai
+
+from ...platform.types import message as platform_message
 
 
 class RuleJudgeResult(pydantic.BaseModel):
 
     matching: bool = False
 
-    replacement: mirai.MessageChain = None
+    replacement: platform_message.MessageChain = None

pkg/pipeline/resprule/resprule.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import mirai
 
 from ...core import app
 from . import entities as rule_entities, rule

pkg/pipeline/resprule/rule.py

@@ -2,11 +2,11 @@ from __future__ import annotations
 import abc
 import typing
 
-import mirai
-
 from ...core import app, entities as core_entities
 from . import entities
 
+from ...platform.types import message as platform_message
+
 
 preregisetered_rules: list[typing.Type[GroupRespondRule]] = []
 
@@ -35,7 +35,7 @@ class GroupRespondRule(metaclass=abc.ABCMeta):
     async def match(
         self,
         message_text: str,
-        message_chain: mirai.MessageChain,
+        message_chain: platform_message.MessageChain,
         rule_dict: dict,
         query: core_entities.Query
     ) -> entities.RuleJudgeResult:

pkg/pipeline/resprule/rules/atbot.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-import mirai
 
 from .. import rule as rule_model
 from .. import entities
 from ....core import entities as core_entities
+from ....platform.types import message as platform_message
 
 
 @rule_model.rule_class("at-bot")
@@ -13,16 +13,16 @@ class AtBotRule(rule_model.GroupRespondRule):
     async def match(
         self,
         message_text: str,
-        message_chain: mirai.MessageChain,
+        message_chain: platform_message.MessageChain,
         rule_dict: dict,
         query: core_entities.Query
     ) -> entities.RuleJudgeResult:
         
-        if message_chain.has(mirai.At(query.adapter.bot_account_id)) and rule_dict['at']:
+        if message_chain.has(platform_message.At(query.adapter.bot_account_id)) and rule_dict['at']:
-            message_chain.remove(mirai.At(query.adapter.bot_account_id))
+            message_chain.remove(platform_message.At(query.adapter.bot_account_id))
 
-            if message_chain.has(mirai.At(query.adapter.bot_account_id)):  # 回复消息时会at两次，检查并删除重复的
+            if message_chain.has(platform_message.At(query.adapter.bot_account_id)):  # 回复消息时会at两次，检查并删除重复的
-                message_chain.remove(mirai.At(query.adapter.bot_account_id))
+                message_chain.remove(platform_message.At(query.adapter.bot_account_id))
 
             return entities.RuleJudgeResult(
                 matching=True,

pkg/pipeline/resprule/rules/prefix.py

@@ -1,8 +1,8 @@
-import mirai
 
 from .. import rule as rule_model
 from .. import entities
 from ....core import entities as core_entities
+from ....platform.types import message as platform_message
 
 
 @rule_model.rule_class("prefix")
@@ -11,7 +11,7 @@ class PrefixRule(rule_model.GroupRespondRule):
     async def match(
         self,
         message_text: str,
-        message_chain: mirai.MessageChain,
+        message_chain: platform_message.MessageChain,
         rule_dict: dict,
         query: core_entities.Query
     ) -> entities.RuleJudgeResult:
@@ -22,7 +22,7 @@ class PrefixRule(rule_model.GroupRespondRule):
 
                 # 查找第一个plain元素
                 for me in message_chain:
-                    if isinstance(me, mirai.Plain):
+                    if isinstance(me, platform_message.Plain):
                         me.text = me.text[len(prefix):]
 
                 return entities.RuleJudgeResult(

pkg/pipeline/resprule/rules/random.py

@@ -1,10 +1,10 @@
 import random
 
-import mirai
 
 from .. import rule as rule_model
 from .. import entities
 from ....core import entities as core_entities
+from ....platform.types import message as platform_message
 
 
 @rule_model.rule_class("random")
@@ -13,7 +13,7 @@ class RandomRespRule(rule_model.GroupRespondRule):
     async def match(
         self,
         message_text: str,
-        message_chain: mirai.MessageChain,
+        message_chain: platform_message.MessageChain,
         rule_dict: dict,
         query: core_entities.Query
     ) -> entities.RuleJudgeResult:

pkg/pipeline/resprule/rules/regexp.py

@@ -1,10 +1,10 @@
 import re
 
-import mirai
 
 from .. import rule as rule_model
 from .. import entities
 from ....core import entities as core_entities
+from ....platform.types import message as platform_message
 
 
 @rule_model.rule_class("regexp")
@@ -13,7 +13,7 @@ class RegExpRule(rule_model.GroupRespondRule):
     async def match(
         self,
         message_text: str,
-        message_chain: mirai.MessageChain,
+        message_chain: platform_message.MessageChain,
         rule_dict: dict,
         query: core_entities.Query
     ) -> entities.RuleJudgeResult:

pkg/pipeline/stagemgr.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-import pydantic
-
 from ..core import app
 from . import stage
 from .resprule import resprule

pkg/pipeline/wrapper/wrapper.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import typing
 
-import mirai
 
 from ...core import app, entities as core_entities
 from .. import entities
@@ -10,6 +9,7 @@ from .. import stage, entities, stagemgr
 from ...core import entities as core_entities
 from ...config import manager as cfg_mgr
 from ...plugin import events
+from ...platform.types import message as platform_message
 
 
 @stage.stage_class("ResponseWrapper")
@@ -34,7 +34,7 @@ class ResponseWrapper(stage.PipelineStage):
         """
 
         # 如果 resp_messages[-1] 已经是 MessageChain 了
-        if isinstance(query.resp_messages[-1], mirai.MessageChain):
+        if isinstance(query.resp_messages[-1], platform_message.MessageChain):
             query.resp_message_chain.append(query.resp_messages[-1])
 
             yield entities.StageProcessResult(
@@ -45,19 +45,14 @@ class ResponseWrapper(stage.PipelineStage):
         else:
         
             if query.resp_messages[-1].role == 'command':
-                # query.resp_message_chain.append(mirai.MessageChain("[bot] "+query.resp_messages[-1].content))
+                query.resp_message_chain.append(query.resp_messages[-1].get_content_platform_message_chain(prefix_text='[bot] '))
-                query.resp_message_chain.append(query.resp_messages[-1].get_content_mirai_message_chain(prefix_text='[bot] '))
 
                 yield entities.StageProcessResult(
                     result_type=entities.ResultType.CONTINUE,
                     new_query=query
                 )
             elif query.resp_messages[-1].role == 'plugin':
-                # if not isinstance(query.resp_messages[-1].content, mirai.MessageChain):
+                query.resp_message_chain.append(query.resp_messages[-1].get_content_platform_message_chain())
-                #     query.resp_message_chain.append(mirai.MessageChain(query.resp_messages[-1].content))
-                # else:
-                #     query.resp_message_chain.append(query.resp_messages[-1].content)
-                query.resp_message_chain.append(query.resp_messages[-1].get_content_mirai_message_chain())
 
                 yield entities.StageProcessResult(
                     result_type=entities.ResultType.CONTINUE,
@@ -72,7 +67,7 @@ class ResponseWrapper(stage.PipelineStage):
                     reply_text = ''
 
                     if result.content:  # 有内容
-                        reply_text = str(result.get_content_mirai_message_chain())
+                        reply_text = str(result.get_content_platform_message_chain())
 
                         # ============= 触发插件事件 ===============
                         event_ctx = await self.ap.plugin_mgr.emit_event(
@@ -96,11 +91,11 @@ class ResponseWrapper(stage.PipelineStage):
                         else:
                             if event_ctx.event.reply is not None:
                                 
-                                query.resp_message_chain.append(mirai.MessageChain(event_ctx.event.reply))
+                                query.resp_message_chain.append(platform_message.MessageChain(event_ctx.event.reply))
 
                             else:
 
-                                query.resp_message_chain.append(result.get_content_mirai_message_chain())
+                                query.resp_message_chain.append(result.get_content_platform_message_chain())
 
                             yield entities.StageProcessResult(
                                 result_type=entities.ResultType.CONTINUE,
@@ -113,7 +108,7 @@ class ResponseWrapper(stage.PipelineStage):
 
                         reply_text = f'调用函数 {".".join(function_names)}...'
 
-                        query.resp_message_chain.append(mirai.MessageChain([mirai.Plain(reply_text)]))
+                        query.resp_message_chain.append(platform_message.MessageChain([platform_message.Plain(reply_text)]))
 
                         if self.ap.platform_cfg.data['track-function-calls']:
                             
@@ -139,11 +134,11 @@ class ResponseWrapper(stage.PipelineStage):
                             else:
                                 if event_ctx.event.reply is not None:
                                     
-                                    query.resp_message_chain.append(mirai.MessageChain(event_ctx.event.reply))
+                                    query.resp_message_chain.append(platform_message.MessageChain(event_ctx.event.reply))
 
                                 else:
 
-                                    query.resp_message_chain.append(mirai.MessageChain([mirai.Plain(reply_text)]))
+                                    query.resp_message_chain.append(platform_message.MessageChain([platform_message.Plain(reply_text)]))
 
                                 yield entities.StageProcessResult(
                                     result_type=entities.ResultType.CONTINUE,

pkg/platform/adapter.py

@@ -4,9 +4,10 @@ from __future__ import annotations
 import typing
 import abc
 
-import mirai
 
 from ..core import app
+from .types import message as platform_message
+from .types import events as platform_events
 
 
 preregistered_adapters: list[typing.Type[MessageSourceAdapter]] = []
@@ -55,28 +56,28 @@ class MessageSourceAdapter(metaclass=abc.ABCMeta):
         self,
         target_type: str,
         target_id: str,
-        message: mirai.MessageChain
+        message: platform_message.MessageChain
     ):
         """主动发送消息
         
         Args:
             target_type (str): 目标类型，`person`或`group`
             target_id (str): 目标ID
-            message (mirai.MessageChain): YiriMirai库的消息链
+            message (platform.types.MessageChain): 消息链
         """
         raise NotImplementedError
 
     async def reply_message(
         self,
-        message_source: mirai.MessageEvent,
+        message_source: platform_events.MessageEvent,
-        message: mirai.MessageChain,
+        message: platform_message.MessageChain,
         quote_origin: bool = False
     ):
         """回复消息
 
         Args:
-            message_source (mirai.MessageEvent): YiriMirai消息源事件
+            message_source (platform.types.MessageEvent): 消息源事件
-            message (mirai.MessageChain): YiriMirai库的消息链
+            message (platform.types.MessageChain): 消息链
             quote_origin (bool, optional): 是否引用原消息. Defaults to False.
         """
         raise NotImplementedError
@@ -87,27 +88,27 @@ class MessageSourceAdapter(metaclass=abc.ABCMeta):
 
     def register_listener(
         self,
-        event_type: typing.Type[mirai.Event],
+        event_type: typing.Type[platform_message.Event],
-        callback: typing.Callable[[mirai.Event, MessageSourceAdapter], None]
+        callback: typing.Callable[[platform_message.Event, MessageSourceAdapter], None]
     ):
         """注册事件监听器
         
         Args:
-            event_type (typing.Type[mirai.Event]): YiriMirai事件类型
+            event_type (typing.Type[platform.types.Event]): 事件类型
-            callback (typing.Callable[[mirai.Event], None]): 回调函数，接收一个参数，为YiriMirai事件
+            callback (typing.Callable[[platform.types.Event], None]): 回调函数，接收一个参数，为事件
         """
         raise NotImplementedError
     
     def unregister_listener(
         self,
-        event_type: typing.Type[mirai.Event],
+        event_type: typing.Type[platform_message.Event],
-        callback: typing.Callable[[mirai.Event, MessageSourceAdapter], None]
+        callback: typing.Callable[[platform_message.Event, MessageSourceAdapter], None]
     ):
         """注销事件监听器
         
         Args:
-            event_type (typing.Type[mirai.Event]): YiriMirai事件类型
+            event_type (typing.Type[platform.types.Event]): 事件类型
-            callback (typing.Callable[[mirai.Event], None]): 回调函数，接收一个参数，为YiriMirai事件
+            callback (typing.Callable[[platform.types.Event], None]): 回调函数，接收一个参数，为事件
         """
         raise NotImplementedError
 
@@ -127,26 +128,26 @@ class MessageSourceAdapter(metaclass=abc.ABCMeta):
 class MessageConverter:
     """消息链转换器基类"""
     @staticmethod
-    def yiri2target(message_chain: mirai.MessageChain):
+    def yiri2target(message_chain: platform_message.MessageChain):
-        """将YiriMirai消息链转换为目标消息链
+        """将源平台消息链转换为目标平台消息链
 
         Args:
-            message_chain (mirai.MessageChain): YiriMirai消息链
+            message_chain (platform.types.MessageChain): 源平台消息链
 
         Returns:
-            typing.Any: 目标消息链
+            typing.Any: 目标平台消息链
         """
         raise NotImplementedError
 
     @staticmethod
-    def target2yiri(message_chain: typing.Any) -> mirai.MessageChain:
+    def target2yiri(message_chain: typing.Any) -> platform_message.MessageChain:
-        """将目标消息链转换为YiriMirai消息链
+        """将目标平台消息链转换为源平台消息链
 
         Args:
-            message_chain (typing.Any): 目标消息链
+            message_chain (typing.Any): 目标平台消息链
 
         Returns:
-            mirai.MessageChain: YiriMirai消息链
+            platform.types.MessageChain: 源平台消息链
         """
         raise NotImplementedError
 
@@ -155,25 +156,25 @@ class EventConverter:
     """事件转换器基类"""
 
     @staticmethod
-    def yiri2target(event: typing.Type[mirai.Event]):
+    def yiri2target(event: typing.Type[platform_message.Event]):
-        """将YiriMirai事件转换为目标事件
+        """将源平台事件转换为目标平台事件
 
         Args:
-            event (typing.Type[mirai.Event]): YiriMirai事件
+            event (typing.Type[platform.types.Event]): 源平台事件
 
         Returns:
-            typing.Any: 目标事件
+            typing.Any: 目标平台事件
         """
         raise NotImplementedError
 
     @staticmethod
-    def target2yiri(event: typing.Any) -> mirai.Event:
+    def target2yiri(event: typing.Any) -> platform_message.Event:
-        """将目标事件的调用参数转换为YiriMirai的事件参数对象
+        """将目标平台事件的调用参数转换为源平台的事件参数对象
 
         Args:
-            event (typing.Any): 目标事件
+            event (typing.Any): 目标平台事件
 
         Returns:
-            typing.Type[mirai.Event]: YiriMirai事件
+            typing.Type[platform.types.Event]: 源平台事件
         """
         raise NotImplementedError

pkg/platform/manager.py

@@ -2,17 +2,24 @@ from __future__ import annotations
 
 import json
 import os
+import sys
 import logging
 import asyncio
 import traceback
 
-from mirai import At, GroupMessage, MessageEvent, StrangerMessage, \
+#     FriendMessage, Image, MessageChain, Plain
-    FriendMessage, Image, MessageChain, Plain
-import mirai
 from ..platform import adapter as msadapter
 
 from ..core import app, entities as core_entities
 from ..plugin import events
+from .types import message as platform_message
+from .types import events as platform_events
+from .types import entities as platform_entities
+
+# 处理 3.4 移除了 YiriMirai 之后，插件的兼容性问题
+from . import types as mirai
+sys.modules['mirai'] = mirai
+
 
 # 控制QQ消息输入输出的类
 class PlatformManager:
@@ -30,76 +37,40 @@ class PlatformManager:
     
     async def initialize(self):
 
-        from .sources import yirimirai, nakuru, aiocqhttp, qqbotpy
+        from .sources import nakuru, aiocqhttp, qqbotpy
 
-        async def on_friend_message(event: FriendMessage, adapter: msadapter.MessageSourceAdapter):
+        async def on_friend_message(event: platform_events.FriendMessage, adapter: msadapter.MessageSourceAdapter):
 
-            event_ctx = await self.ap.plugin_mgr.emit_event(
+            await self.ap.query_pool.add_query(
-                event=events.PersonMessageReceived(
+                launcher_type=core_entities.LauncherTypes.PERSON,
-                    launcher_type='person',
+                launcher_id=event.sender.id,
-                    launcher_id=event.sender.id,
+                sender_id=event.sender.id,
-                    sender_id=event.sender.id,
+                message_event=event,
-                    message_chain=event.message_chain,
+                message_chain=event.message_chain,
-                    query=None
+                adapter=adapter
-                )
             )
 
-            if not event_ctx.is_prevented_default():
+        async def on_stranger_message(event: platform_events.StrangerMessage, adapter: msadapter.MessageSourceAdapter):
-
-                await self.ap.query_pool.add_query(
-                    launcher_type=core_entities.LauncherTypes.PERSON,
-                    launcher_id=event.sender.id,
-                    sender_id=event.sender.id,
-                    message_event=event,
-                    message_chain=event.message_chain,
-                    adapter=adapter
-                )
-
-        async def on_stranger_message(event: StrangerMessage, adapter: msadapter.MessageSourceAdapter):
             
-            event_ctx = await self.ap.plugin_mgr.emit_event(
+            await self.ap.query_pool.add_query(
-                event=events.PersonMessageReceived(
+                launcher_type=core_entities.LauncherTypes.PERSON,
-                    launcher_type='person',
+                launcher_id=event.sender.id,
-                    launcher_id=event.sender.id,
+                sender_id=event.sender.id,
-                    sender_id=event.sender.id,
+                message_event=event,
-                    message_chain=event.message_chain,
+                message_chain=event.message_chain,
-                    query=None
+                adapter=adapter
-                )
             )
 
-            if not event_ctx.is_prevented_default():
+        async def on_group_message(event: platform_events.GroupMessage, adapter: msadapter.MessageSourceAdapter):
 
-                await self.ap.query_pool.add_query(
+            await self.ap.query_pool.add_query(
-                    launcher_type=core_entities.LauncherTypes.PERSON,
+                launcher_type=core_entities.LauncherTypes.GROUP,
-                    launcher_id=event.sender.id,
+                launcher_id=event.group.id,
-                    sender_id=event.sender.id,
+                sender_id=event.sender.id,
-                    message_event=event,
+                message_event=event,
-                    message_chain=event.message_chain,
+                message_chain=event.message_chain,
-                    adapter=adapter
+                adapter=adapter
-                )
-
-        async def on_group_message(event: GroupMessage, adapter: msadapter.MessageSourceAdapter):
-
-            event_ctx = await self.ap.plugin_mgr.emit_event(
-                event=events.GroupMessageReceived(
-                    launcher_type='group',
-                    launcher_id=event.group.id,
-                    sender_id=event.sender.id,
-                    message_chain=event.message_chain,
-                    query=None
-                )
             )
-
-            if not event_ctx.is_prevented_default():
-
-                await self.ap.query_pool.add_query(
-                    launcher_type=core_entities.LauncherTypes.GROUP,
-                    launcher_id=event.group.id,
-                    sender_id=event.sender.id,
-                    message_event=event,
-                    message_chain=event.message_chain,
-                    adapter=adapter
-                )
         
         index = 0
 
@@ -127,16 +98,16 @@ class PlatformManager:
 
                         if adapter_name == 'yiri-mirai':
                             adapter_inst.register_listener(
-                                StrangerMessage,
+                                platform_events.StrangerMessage,
                                 on_stranger_message
                             )
 
                         adapter_inst.register_listener(
-                            FriendMessage,
+                            platform_events.FriendMessage,
                             on_friend_message
                         )
                         adapter_inst.register_listener(
-                            GroupMessage,
+                            platform_events.GroupMessage,
                             on_group_message
                         )
                 
@@ -146,13 +117,13 @@ class PlatformManager:
         if len(self.adapters) == 0:
             self.ap.logger.warning('未运行平台适配器，请根据文档配置并启用平台适配器。')
 
-    async def send(self, event: mirai.MessageEvent, msg: mirai.MessageChain, adapter: msadapter.MessageSourceAdapter, check_quote=True, check_at_sender=True):
+    async def send(self, event: platform_events.MessageEvent, msg: platform_message.MessageChain, adapter: msadapter.MessageSourceAdapter):
         
-        if check_at_sender and self.ap.platform_cfg.data['at-sender'] and isinstance(event, GroupMessage):
+        if self.ap.platform_cfg.data['at-sender'] and isinstance(event, platform_events.GroupMessage):
 
             msg.insert(
                 0,
-                At(
+                platform_message.At(
                     event.sender.id
                 )
             )
@@ -160,26 +131,37 @@ class PlatformManager:
         await adapter.reply_message(
             event,
             msg,
-            quote_origin=True if self.ap.platform_cfg.data['quote-origin'] and check_quote else False
+            quote_origin=True if self.ap.platform_cfg.data['quote-origin'] else False
         )
 
     async def run(self):
         try:
             tasks = []
             for adapter in self.adapters:
-                async def exception_wrapper(adapter):
+                async def exception_wrapper(adapter: msadapter.MessageSourceAdapter):
                     try:
                         await adapter.run_async()
                     except Exception as e:
+                        if isinstance(e, asyncio.CancelledError):
+                            return
                         self.ap.logger.error('平台适配器运行出错: ' + str(e))
                         self.ap.logger.debug(f"Traceback: {traceback.format_exc()}")
 
                 tasks.append(exception_wrapper(adapter))
             
             for task in tasks:
-                asyncio.create_task(task)
+                self.ap.task_mgr.create_task(
+                    task,
+                    kind="platform-adapter",
+                    name=f"platform-adapter-{adapter.name}",
+                    scopes=[core_entities.LifecycleControlScope.APPLICATION, core_entities.LifecycleControlScope.PLATFORM],
+                )
 
         except Exception as e:
             self.ap.logger.error('平台适配器运行出错: ' + str(e))
             self.ap.logger.debug(f"Traceback: {traceback.format_exc()}")
-
+    
+    async def shutdown(self):
+        for adapter in self.adapters:
+            await adapter.kill()
+        self.ap.task_mgr.cancel_by_scope(core_entities.LifecycleControlScope.PLATFORM)

pkg/platform/sources/aiocqhttp.py

@@ -5,31 +5,32 @@ import traceback
 import time
 import datetime
 
-import mirai
-import mirai.models.message as yiri_message
 import aiocqhttp
 
 from .. import adapter
 from ...pipeline.longtext.strategies import forward
 from ...core import app
+from ..types import message as platform_message
+from ..types import events as platform_events
+from ..types import entities as platform_entities
 
 
 class AiocqhttpMessageConverter(adapter.MessageConverter):
 
     @staticmethod
-    def yiri2target(message_chain: mirai.MessageChain) -> typing.Tuple[list, int, datetime.datetime]:
+    def yiri2target(message_chain: platform_message.MessageChain) -> typing.Tuple[list, int, datetime.datetime]:
         msg_list = aiocqhttp.Message()
 
         msg_id = 0
         msg_time = None
 
         for msg in message_chain:
-            if type(msg) is mirai.Plain:
+            if type(msg) is platform_message.Plain:
                 msg_list.append(aiocqhttp.MessageSegment.text(msg.text))
-            elif type(msg) is yiri_message.Source:
+            elif type(msg) is platform_message.Source:
                 msg_id = msg.id
                 msg_time = msg.time
-            elif type(msg) is mirai.Image:
+            elif type(msg) is platform_message.Image:
                 arg = ''
                 if msg.base64:
                     arg = msg.base64
@@ -40,14 +41,21 @@ class AiocqhttpMessageConverter(adapter.MessageConverter):
                 elif msg.path:
                     arg = msg.path
                     msg_list.append(aiocqhttp.MessageSegment.image(arg))
-            elif type(msg) is mirai.At:
+            elif type(msg) is platform_message.At:
                 msg_list.append(aiocqhttp.MessageSegment.at(msg.target))
-            elif type(msg) is mirai.AtAll:
+            elif type(msg) is platform_message.AtAll:
                 msg_list.append(aiocqhttp.MessageSegment.at("all"))
-            elif type(msg) is mirai.Face:
+            elif type(msg) is platform_message.Voice:
-                msg_list.append(aiocqhttp.MessageSegment.face(msg.face_id))
+                arg = ''
-            elif type(msg) is mirai.Voice:
+                if msg.base64:
-                msg_list.append(aiocqhttp.MessageSegment.record(msg.path))
+                    arg = msg.base64
+                    msg_list.append(aiocqhttp.MessageSegment.record(f"base64://{arg}"))
+                elif msg.url:
+                    arg = msg.url
+                    msg_list.append(aiocqhttp.MessageSegment.record(arg))
+                elif msg.path:
+                    arg = msg.path
+                    msg_list.append(aiocqhttp.MessageSegment.record(msg.path))
             elif type(msg) is forward.Forward:
 
                 for node in msg.node_list:
@@ -65,25 +73,25 @@ class AiocqhttpMessageConverter(adapter.MessageConverter):
         yiri_msg_list = []
 
         yiri_msg_list.append(
-            yiri_message.Source(id=message_id, time=datetime.datetime.now())
+            platform_message.Source(id=message_id, time=datetime.datetime.now())
         )
 
         for msg in message:
             if msg.type == "at":
                 if msg.data["qq"] == "all":
-                    yiri_msg_list.append(yiri_message.AtAll())
+                    yiri_msg_list.append(platform_message.AtAll())
                 else:
                     yiri_msg_list.append(
-                        yiri_message.At(
+                        platform_message.At(
                             target=msg.data["qq"],
                         )
                     )
             elif msg.type == "text":
-                yiri_msg_list.append(yiri_message.Plain(text=msg.data["text"]))
+                yiri_msg_list.append(platform_message.Plain(text=msg.data["text"]))
             elif msg.type == "image":
-                yiri_msg_list.append(yiri_message.Image(url=msg.data["url"]))
+                yiri_msg_list.append(platform_message.Image(url=msg.data["url"]))
 
-        chain = mirai.MessageChain(yiri_msg_list)
+        chain = platform_message.MessageChain(yiri_msg_list)
 
         return chain
 
@@ -91,11 +99,11 @@ class AiocqhttpMessageConverter(adapter.MessageConverter):
 class AiocqhttpEventConverter(adapter.EventConverter):
 
     @staticmethod
-    def yiri2target(event: mirai.Event, bot_account_id: int):
+    def yiri2target(event: platform_events.Event, bot_account_id: int):
 
         msg, msg_id, msg_time = AiocqhttpMessageConverter.yiri2target(event.message_chain)
 
-        if type(event) is mirai.GroupMessage:
+        if type(event) is platform_events.GroupMessage:
             role = "member"
 
             if event.sender.permission == "ADMINISTRATOR":
@@ -131,7 +139,7 @@ class AiocqhttpEventConverter(adapter.EventConverter):
             }
 
             return aiocqhttp.Event.from_payload(payload)
-        elif type(event) is mirai.FriendMessage:
+        elif type(event) is platform_events.FriendMessage:
 
             payload = {
                 "post_type": "message",
@@ -164,19 +172,20 @@ class AiocqhttpEventConverter(adapter.EventConverter):
         if event.message_type == "group":
             permission = "MEMBER"
 
-            if event.sender["role"] == "admin":
+            if "role" in event.sender:
-                permission = "ADMINISTRATOR"
+                if event.sender["role"] == "admin":
-            elif event.sender["role"] == "owner":
+                    permission = "ADMINISTRATOR"
-                permission = "OWNER"
+                elif event.sender["role"] == "owner":
-            converted_event = mirai.GroupMessage(
+                    permission = "OWNER"
-                sender=mirai.models.entities.GroupMember(
+            converted_event = platform_events.GroupMessage(
+                sender=platform_entities.GroupMember(
                     id=event.sender["user_id"],  # message_seq 放哪？
                     member_name=event.sender["nickname"],
                     permission=permission,
-                    group=mirai.models.entities.Group(
+                    group=platform_entities.Group(
                         id=event.group_id,
                         name=event.sender["nickname"],
-                        permission=mirai.models.entities.Permission.Member,
+                        permission=platform_entities.Permission.Member,
                     ),
                     special_title=event.sender["title"] if "title" in event.sender else "",
                     join_timestamp=0,
@@ -188,8 +197,8 @@ class AiocqhttpEventConverter(adapter.EventConverter):
             )
             return converted_event
         elif event.message_type == "private":
-            return mirai.FriendMessage(
+            return platform_events.FriendMessage(
-                sender=mirai.models.entities.Friend(
+                sender=platform_entities.Friend(
                     id=event.sender["user_id"],
                     nickname=event.sender["nickname"],
                     remark="",
@@ -231,7 +240,7 @@ class AiocqhttpAdapter(adapter.MessageSourceAdapter):
             self.bot = aiocqhttp.CQHttp()
 
     async def send_message(
-        self, target_type: str, target_id: str, message: mirai.MessageChain
+        self, target_type: str, target_id: str, message: platform_message.MessageChain
     ):
         aiocq_msg = AiocqhttpMessageConverter.yiri2target(message)[0]
 
@@ -242,8 +251,8 @@ class AiocqhttpAdapter(adapter.MessageSourceAdapter):
 
     async def reply_message(
         self,
-        message_source: mirai.MessageEvent,
+        message_source: platform_events.MessageEvent,
-        message: mirai.MessageChain,
+        message: platform_message.MessageChain,
         quote_origin: bool = False,
     ):  
         aiocq_event = AiocqhttpEventConverter.yiri2target(message_source, self.bot_account_id)
@@ -261,8 +270,8 @@ class AiocqhttpAdapter(adapter.MessageSourceAdapter):
 
     def register_listener(
         self,
-        event_type: typing.Type[mirai.Event],
+        event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[[mirai.Event, adapter.MessageSourceAdapter], None],
+        callback: typing.Callable[[platform_events.Event, adapter.MessageSourceAdapter], None],
     ):
         async def on_message(event: aiocqhttp.Event):
             self.bot_account_id = event.self_id
@@ -271,15 +280,15 @@ class AiocqhttpAdapter(adapter.MessageSourceAdapter):
             except:
                 traceback.print_exc()
 
-        if event_type == mirai.GroupMessage:
+        if event_type == platform_events.GroupMessage:
             self.bot.on_message("group")(on_message)
-        elif event_type == mirai.FriendMessage:
+        elif event_type == platform_events.FriendMessage:
             self.bot.on_message("private")(on_message)
 
     def unregister_listener(
         self,
-        event_type: typing.Type[mirai.Event],
+        event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[[mirai.Event, adapter.MessageSourceAdapter], None],
+        callback: typing.Callable[[platform_events.Event, adapter.MessageSourceAdapter], None],
     ):
         return super().unregister_listener(event_type, callback)
 

pkg/platform/sources/nakuru.py

@@ -6,26 +6,28 @@ import typing
 import traceback
 import logging
 
-import mirai
 
 import nakuru
 import nakuru.entities.components as nkc
 
 from .. import adapter as adapter_model
 from ...pipeline.longtext.strategies import forward
+from ...platform.types import message as platform_message
+from ...platform.types import entities as platform_entities
+from ...platform.types import events as platform_events
 
 
 class NakuruProjectMessageConverter(adapter_model.MessageConverter):
     """消息转换器"""
     @staticmethod
-    def yiri2target(message_chain: mirai.MessageChain) -> list:
+    def yiri2target(message_chain: platform_message.MessageChain) -> list:
         msg_list = []
-        if type(message_chain) is mirai.MessageChain:
+        if type(message_chain) is platform_message.MessageChain:
             msg_list = message_chain.__root__
         elif type(message_chain) is list:
             msg_list = message_chain
         elif type(message_chain) is str:
-            msg_list = [mirai.Plain(message_chain)]
+            msg_list = [platform_message.Plain(message_chain)]
         else:
             raise Exception("Unknown message type: " + str(message_chain) + str(type(message_chain)))
         
@@ -33,22 +35,20 @@ class NakuruProjectMessageConverter(adapter_model.MessageConverter):
         
         # 遍历并转换
         for component in msg_list:
-            if type(component) is mirai.Plain:
+            if type(component) is platform_message.Plain:
                 nakuru_msg_list.append(nkc.Plain(component.text, False))
-            elif type(component) is mirai.Image:
+            elif type(component) is platform_message.Image:
                 if component.url is not None:
                     nakuru_msg_list.append(nkc.Image.fromURL(component.url))
                 elif component.base64 is not None:
                     nakuru_msg_list.append(nkc.Image.fromBase64(component.base64))
                 elif component.path is not None:
                     nakuru_msg_list.append(nkc.Image.fromFileSystem(component.path))
-            elif type(component) is mirai.Face:
+            elif type(component) is platform_message.At:
-                nakuru_msg_list.append(nkc.Face(id=component.face_id))
-            elif type(component) is mirai.At:
                 nakuru_msg_list.append(nkc.At(qq=component.target))
-            elif type(component) is mirai.AtAll:
+            elif type(component) is platform_message.AtAll:
                 nakuru_msg_list.append(nkc.AtAll())
-            elif type(component) is mirai.Voice:
+            elif type(component) is platform_message.Voice:
                 if component.url is not None:
                     nakuru_msg_list.append(nkc.Record.fromURL(component.url))
                 elif component.path is not None:
@@ -80,49 +80,47 @@ class NakuruProjectMessageConverter(adapter_model.MessageConverter):
         return nakuru_msg_list
 
     @staticmethod
-    def target2yiri(message_chain: typing.Any, message_id: int = -1) -> mirai.MessageChain:
+    def target2yiri(message_chain: typing.Any, message_id: int = -1) -> platform_message.MessageChain:
         """将Yiri的消息链转换为YiriMirai的消息链"""
         assert type(message_chain) is list
 
         yiri_msg_list = []
         import datetime
         # 添加Source组件以标记message_id等信息
-        yiri_msg_list.append(mirai.models.message.Source(id=message_id, time=datetime.datetime.now()))
+        yiri_msg_list.append(platform_message.Source(id=message_id, time=datetime.datetime.now()))
         for component in message_chain:
             if type(component) is nkc.Plain:
-                yiri_msg_list.append(mirai.Plain(text=component.text))
+                yiri_msg_list.append(platform_message.Plain(text=component.text))
             elif type(component) is nkc.Image:
-                yiri_msg_list.append(mirai.Image(url=component.url))
+                yiri_msg_list.append(platform_message.Image(url=component.url))
-            elif type(component) is nkc.Face:
-                yiri_msg_list.append(mirai.Face(face_id=component.id))
             elif type(component) is nkc.At:
-                yiri_msg_list.append(mirai.At(target=component.qq))
+                yiri_msg_list.append(platform_message.At(target=component.qq))
             elif type(component) is nkc.AtAll:
-                yiri_msg_list.append(mirai.AtAll())
+                yiri_msg_list.append(platform_message.AtAll())
             else:
                 pass
         # logging.debug("转换后的消息链: " + str(yiri_msg_list))
-        chain = mirai.MessageChain(yiri_msg_list)
+        chain = platform_message.MessageChain(yiri_msg_list)
         return chain
 
 
 class NakuruProjectEventConverter(adapter_model.EventConverter):
     """事件转换器"""
     @staticmethod
-    def yiri2target(event: typing.Type[mirai.Event]):
+    def yiri2target(event: typing.Type[platform_events.Event]):
-        if event is mirai.GroupMessage:
+        if event is platform_events.GroupMessage:
             return nakuru.GroupMessage
-        elif event is mirai.FriendMessage:
+        elif event is platform_events.FriendMessage:
             return nakuru.FriendMessage
         else:
             raise Exception("未支持转换的事件类型: " + str(event))
 
     @staticmethod
-    def target2yiri(event: typing.Any) -> mirai.Event:
+    def target2yiri(event: typing.Any) -> platform_events.Event:
         yiri_chain = NakuruProjectMessageConverter.target2yiri(event.message, event.message_id)
         if type(event) is nakuru.FriendMessage:  # 私聊消息事件
-            return mirai.FriendMessage(
+            return platform_events.FriendMessage(
-                sender=mirai.models.entities.Friend(
+                sender=platform_entities.Friend(
                     id=event.sender.user_id,
                     nickname=event.sender.nickname,
                     remark=event.sender.nickname
@@ -138,16 +136,15 @@ class NakuruProjectEventConverter(adapter_model.EventConverter):
             elif event.sender.role == "owner":
                 permission = "OWNER"
 
-            import mirai.models.entities as entities
+            return platform_events.GroupMessage(
-            return mirai.GroupMessage(
+                sender=platform_entities.GroupMember(
-                sender=mirai.models.entities.GroupMember(
                     id=event.sender.user_id,
                     member_name=event.sender.nickname,
                     permission=permission,
-                    group=mirai.models.entities.Group(
+                    group=platform_entities.Group(
                         id=event.group_id,
                         name=event.sender.nickname,
-                        permission=entities.Permission.Member
+                        permission=platform_entities.Permission.Member
                     ),
                     special_title=event.sender.title,
                     join_timestamp=0,
@@ -189,7 +186,7 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
         self,
         target_type: str,
         target_id: str,
-        message: typing.Union[mirai.MessageChain, list],
+        message: typing.Union[platform_message.MessageChain, list],
         converted: bool = False
     ):
         task = None
@@ -222,8 +219,8 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
 
     async def reply_message(
         self,
-        message_source: mirai.MessageEvent,
+        message_source: platform_events.MessageEvent,
-        message: mirai.MessageChain,
+        message: platform_message.MessageChain,
         quote_origin: bool = False
     ):
         message = self.message_converter.yiri2target(message)
@@ -233,14 +230,14 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
                     id=message_source.message_chain.message_id,
                 )
             )
-        if type(message_source) is mirai.GroupMessage:
+        if type(message_source) is platform_events.GroupMessage:
             await self.send_message(
                 "group",
                 message_source.sender.group.id,
                 message,
                 converted=True
             )
-        elif type(message_source) is mirai.FriendMessage:
+        elif type(message_source) is platform_events.FriendMessage:
             await self.send_message(
                 "person",
                 message_source.sender.id,
@@ -258,8 +255,8 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
 
     def register_listener(
         self,
-        event_type: typing.Type[mirai.Event],
+        event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[[mirai.Event, adapter_model.MessageSourceAdapter], None]
+        callback: typing.Callable[[platform_events.Event, adapter_model.MessageSourceAdapter], None]
     ):
         try:
 
@@ -286,8 +283,8 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
 
     def unregister_listener(
         self,
-        event_type: typing.Type[mirai.Event],
+        event_type: typing.Type[platform_events.Event],
-        callback: typing.Callable[[mirai.Event, adapter_model.MessageSourceAdapter], None]
+        callback: typing.Callable[[platform_events.Event, adapter_model.MessageSourceAdapter], None]
     ):
         nakuru_event_name = self.event_converter.yiri2target(event_type).__name__
 
@@ -331,5 +328,5 @@ class NakuruProjectAdapter(adapter_model.MessageSourceAdapter):
         while True:
             await asyncio.sleep(1)
 
-    def kill(self) -> bool:
+    async def kill(self) -> bool:
         return False

pkg/platform/sources/qqbotpy.py

@@ -3,13 +3,9 @@ from __future__ import annotations
 import logging
 import typing
 import datetime
-import asyncio
 import re
 import traceback
-import json
-import threading
 
-import mirai
 import botpy
 import botpy.message as botpy_message
 import botpy.types.message as botpy_message_type
@@ -18,15 +14,20 @@ from .. import adapter as adapter_model
 from ...pipeline.longtext.strategies import forward
 from ...core import app
 from ...config import manager as cfg_mgr
+from ...platform.types import entities as platform_entities
+from ...platform.types import events as platform_events
+from ...platform.types import message as platform_message
 
 
-class OfficialGroupMessage(mirai.GroupMessage):
+class OfficialGroupMessage(platform_events.GroupMessage):
     pass
 
+class OfficialFriendMessage(platform_events.FriendMessage):
+    pass
 
 event_handler_mapping = {
-    mirai.GroupMessage: ["on_at_message_create", "on_group_at_message_create"],
+    platform_events.GroupMessage: ["on_at_message_create", "on_group_at_message_create"],
-    mirai.FriendMessage: ["on_direct_message_create"],
+    platform_events.FriendMessage: ["on_direct_message_create", "on_c2c_message_create"],
 }
 
 
@@ -122,16 +123,16 @@ class OfficialMessageConverter(adapter_model.MessageConverter):
     """QQ 官方消息转换器"""
 
     @staticmethod
-    def yiri2target(message_chain: mirai.MessageChain):
+    def yiri2target(message_chain: platform_message.MessageChain):
         """将 YiriMirai 的消息链转换为 QQ 官方消息"""
 
         msg_list = []
-        if type(message_chain) is mirai.MessageChain:
+        if type(message_chain) is platform_message.MessageChain:
             msg_list = message_chain.__root__
         elif type(message_chain) is list:
             msg_list = message_chain
         elif type(message_chain) is str:
-            msg_list = [mirai.Plain(text=message_chain)]
+            msg_list = [platform_message.Plain(text=message_chain)]
         else:
             raise Exception(
                 "Unknown message type: " + str(message_chain) + str(type(message_chain))
@@ -152,22 +153,22 @@ class OfficialMessageConverter(adapter_model.MessageConverter):
 
         # 遍历并转换
         for component in msg_list:
-            if type(component) is mirai.Plain:
+            if type(component) is platform_message.Plain:
                 offcial_messages.append({"type": "text", "content": component.text})
-            elif type(component) is mirai.Image:
+            elif type(component) is platform_message.Image:
                 if component.url is not None:
                     offcial_messages.append({"type": "image", "content": component.url})
                 elif component.path is not None:
                     offcial_messages.append(
                         {"type": "file_image", "content": component.path}
                     )
-            elif type(component) is mirai.At:
+            elif type(component) is platform_message.At:
                 offcial_messages.append({"type": "at", "content": ""})
-            elif type(component) is mirai.AtAll:
+            elif type(component) is platform_message.AtAll:
                 print(
                     "上层组件要求发送 AtAll 消息，但 QQ 官方 API 不支持此消息类型，忽略此消息。"
                 )
-            elif type(component) is mirai.Voice:
+            elif type(component) is platform_message.Voice:
                 print(
                     "上层组件要求发送 Voice 消息，但 QQ 官方 API 不支持此消息类型，忽略此消息。"
                 )
@@ -193,32 +194,32 @@ class OfficialMessageConverter(adapter_model.MessageConverter):
 
     @staticmethod
     def extract_message_chain_from_obj(
-        message: typing.Union[botpy_message.Message, botpy_message.DirectMessage],
+        message: typing.Union[botpy_message.Message, botpy_message.DirectMessage, botpy_message.GroupMessage, botpy_message.C2CMessage],
         message_id: str = None,
         bot_account_id: int = 0,
-    ) -> mirai.MessageChain:
+    ) -> platform_message.MessageChain:
         yiri_msg_list = []
         # 存id
 
         yiri_msg_list.append(
-            mirai.models.message.Source(
+            platform_message.Source(
                 id=save_msg_id(message_id), time=datetime.datetime.now()
             )
         )
 
-        if type(message) is not botpy_message.DirectMessage:
+        if type(message) not in [botpy_message.DirectMessage, botpy_message.C2CMessage]:
-            yiri_msg_list.append(mirai.At(target=bot_account_id))
+            yiri_msg_list.append(platform_message.At(target=bot_account_id))
 
         if hasattr(message, "mentions"):
             for mention in message.mentions:
                 if mention.bot:
                     continue
 
-                yiri_msg_list.append(mirai.At(target=mention.id))
+                yiri_msg_list.append(platform_message.At(target=mention.id))
 
         for attachment in message.attachments:
             if attachment.content_type.startswith("image"):
-                yiri_msg_list.append(mirai.Image(url=attachment.url))
+                yiri_msg_list.append(platform_message.Image(url=attachment.url))
             else:
                 logging.warning(
                     "不支持的附件类型：" + attachment.content_type + "，忽略此附件。"
@@ -226,9 +227,9 @@ class OfficialMessageConverter(adapter_model.MessageConverter):
 
         content = re.sub(r"<@!\d+>", "", str(message.content))
         if content.strip() != "":
-            yiri_msg_list.append(mirai.Plain(text=content))
+            yiri_msg_list.append(platform_message.Plain(text=content))
 
-        chain = mirai.MessageChain(yiri_msg_list)
+        chain = platform_message.MessageChain(yiri_msg_list)
 
         return chain
 
@@ -243,10 +244,10 @@ class OfficialEventConverter(adapter_model.EventConverter):
         self.member_openid_mapping = member_openid_mapping
         self.group_openid_mapping = group_openid_mapping
 
-    def yiri2target(self, event: typing.Type[mirai.Event]):
+    def yiri2target(self, event: typing.Type[platform_events.Event]):
-        if event == mirai.GroupMessage:
+        if event == platform_events.GroupMessage:
             return botpy_message.Message
-        elif event == mirai.FriendMessage:
+        elif event == platform_events.FriendMessage:
             return botpy_message.DirectMessage
         else:
             raise Exception(
@@ -255,9 +256,8 @@ class OfficialEventConverter(adapter_model.EventConverter):
 
     def target2yiri(
         self,
-        event: typing.Union[botpy_message.Message, botpy_message.DirectMessage]
+        event: typing.Union[botpy_message.Message, botpy_message.DirectMessage, botpy_message.GroupMessage, botpy_message.C2CMessage],
-    ) -> mirai.Event:
+    ) -> platform_events.Event:
-        import mirai.models.entities as mirai_entities
 
         if type(event) == botpy_message.Message:  # 频道内，转群聊事件
             permission = "MEMBER"
@@ -267,15 +267,15 @@ class OfficialEventConverter(adapter_model.EventConverter):
             elif "4" in event.member.roles:
                 permission = "OWNER"
 
-            return mirai.GroupMessage(
+            return platform_events.GroupMessage(
-                sender=mirai_entities.GroupMember(
+                sender=platform_entities.GroupMember(
                     id=event.author.id,
                     member_name=event.author.username,
                     permission=permission,
-                    group=mirai_entities.Group(
+                    group=platform_entities.Group(
                         id=event.channel_id,
                         name=event.author.username,
-                        permission=mirai_entities.Permission.Member,
+                        permission=platform_entities.Permission.Member,
                     ),
                     special_title="",
                     join_timestamp=int(
@@ -295,9 +295,9 @@ class OfficialEventConverter(adapter_model.EventConverter):
                     ).timestamp()
                 ),
             )
-        elif type(event) == botpy_message.DirectMessage:  # 私聊，转私聊事件
+        elif type(event) == botpy_message.DirectMessage:  # 频道私聊，转私聊事件
-            return mirai.FriendMessage(
+            return platform_events.FriendMessage(
-                sender=mirai_entities.Friend(
+                sender=platform_entities.Friend(
                     id=event.guild_id,
                     nickname=event.author.username,
                     remark=event.author.username,
@@ -311,19 +311,19 @@ class OfficialEventConverter(adapter_model.EventConverter):
                     ).timestamp()
                 ),
             )
-        elif type(event) == botpy_message.GroupMessage:
+        elif type(event) == botpy_message.GroupMessage:  # 群聊，转群聊事件
 
             replacing_member_id = self.member_openid_mapping.save_openid(event.author.member_openid)
 
             return OfficialGroupMessage(
-                sender=mirai_entities.GroupMember(
+                sender=platform_entities.GroupMember(
                     id=replacing_member_id,
                     member_name=replacing_member_id,
                     permission="MEMBER",
-                    group=mirai_entities.Group(
+                    group=platform_entities.Group(
                         id=self.group_openid_mapping.save_openid(event.group_openid),
                         name=replacing_member_id,
-                        permission=mirai_entities.Permission.Member,
+                        permission=platform_entities.Permission.Member,
                     ),
                     special_title="",
                     join_timestamp=int(0),
@@ -339,6 +339,25 @@ class OfficialEventConverter(adapter_model.EventConverter):
                     ).timestamp()
                 ),
             )
+        elif type(event) == botpy_message.C2CMessage:  # 私聊，转私聊事件
+
+            user_id_alter = self.member_openid_mapping.save_openid(event.author.user_openid)  # 实测这里的user_openid与group的member_openid是一样的
+
+            return OfficialFriendMessage(
+                sender=platform_entities.Friend(
+                    id=user_id_alter,
+                    nickname=user_id_alter,
+                    remark=user_id_alter,
+                ),
+                message_chain=OfficialMessageConverter.extract_message_chain_from_obj(
+                    event, event.id
+                ),
+                time=int(
+                    datetime.datetime.strptime(
+                        event.timestamp, "%Y-%m-%dT%H:%M:%S%z"
+                    ).timestamp()
+                ),
+            )
 
 
 @adapter_model.adapter_class("qq-botpy")
@@ -368,6 +387,7 @@ class OfficialAdapter(adapter_model.MessageSourceAdapter):
     group_openid_mapping: OpenIDMapping[str, int] = None
 
     group_msg_seq = None
+    c2c_msg_seq = None
 
     def __init__(self, cfg: dict, ap: app.Application):
         """初始化适配器"""
@@ -375,6 +395,7 @@ class OfficialAdapter(adapter_model.MessageSourceAdapter):
         self.ap = ap
 
         self.group_msg_seq = 1
+        self.c2c_msg_seq = 1
 
         switchs = {}
 
@@ -388,7 +409,7 @@ class OfficialAdapter(adapter_model.MessageSourceAdapter):
         self.bot = botpy.Client(intents=intents)
 
     async def send_message(
-        self, target_type: str, target_id: str, message: mirai.MessageChain
+        self, target_type: str, target_id: str, message: platform_message.MessageChain
     ):
         message_list = self.message_converter.yiri2target(message)
 
@@ -415,8 +436,8 @@ class OfficialAdapter(adapter_model.MessageSourceAdapter):
 
     async def reply_message(
         self,
-        message_source: mirai.MessageEvent,
+        message_source: platform_events.MessageEvent,
-        message: mirai.MessageChain,
+        message: platform_message.MessageChain,
         quote_origin: bool = False,
     ):
         
@@ -441,40 +462,80 @@ class OfficialAdapter(adapter_model.MessageSourceAdapter):
                     ]
                 )
 
-            if type(message_source) == mirai.GroupMessage:
+            if type(message_source) == platform_events.GroupMessage:
                 args["channel_id"] = str(message_source.sender.group.id)
                 args["msg_id"] = cached_message_ids[
                     str(message_source.message_chain.message_id)
                 ]
                 await self.bot.api.post_message(**args)
-            elif type(message_source) == mirai.FriendMessage:
+            elif type(message_source) == platform_events.FriendMessage:
                 args["guild_id"] = str(message_source.sender.id)
                 args["msg_id"] = cached_message_ids[
                     str(message_source.message_chain.message_id)
                 ]
                 await self.bot.api.post_dms(**args)
             elif type(message_source) == OfficialGroupMessage:
-                if "image" in args or "file_image" in args:
+
+                if "file_image" in args:  # 暂不支持发送文件图片
                     continue
+
                 args["group_openid"] = self.group_openid_mapping.getkey(
                     message_source.sender.group.id
                 )
 
+                if "image" in args:
+                    uploadMedia = await self.bot.api.post_group_file(
+                        group_openid=args["group_openid"],
+                        file_type=1,
+                        url=str(args['image'])
+                    )
+
+                    del args['image']
+                    args['media'] = uploadMedia
+                    args['msg_type'] = 7
+
                 args["msg_id"] = cached_message_ids[
                     str(message_source.message_chain.message_id)
                 ]
                 args["msg_seq"] = self.group_msg_seq
                 self.group_msg_seq += 1
+
                 await self.bot.api.post_group_message(**args)
+            elif type(message_source) == OfficialFriendMessage:
+                if "file_image" in args:
+                    continue
+                args["openid"] = self.member_openid_mapping.getkey(
+                    message_source.sender.id
+                )
+
+                if "image" in args:
+                    uploadMedia = await self.bot.api.post_c2c_file(
+                        openid=args["openid"],
+                        file_type=1,
+                        url=str(args['image'])
+                    )
+
+                    del args['image']
+                    args['media'] = uploadMedia
+                    args['msg_type'] = 7
+
+                args["msg_id"] = cached_message_ids[
+                    str(message_source.message_chain.message_id)
+                ]
+
+                args["msg_seq"] = self.c2c_msg_seq
+                self.c2c_msg_seq += 1
+
+                await self.bot.api.post_c2c_message(**args)
 
     async def is_muted(self, group_id: int) -> bool:
         return False
 
     def register_listener(
         self,
-        event_type: typing.Type[mirai.Event],
+        event_type: typing.Type[platform_events.Event],
         callback: typing.Callable[
-            [mirai.Event, adapter_model.MessageSourceAdapter], None
+            [platform_events.Event, adapter_model.MessageSourceAdapter], None
         ],
     ):
 
@@ -498,9 +559,9 @@ class OfficialAdapter(adapter_model.MessageSourceAdapter):
 
     def unregister_listener(
         self,
-        event_type: typing.Type[mirai.Event],
+        event_type: typing.Type[platform_events.Event],
         callback: typing.Callable[
-            [mirai.Event, adapter_model.MessageSourceAdapter], None
+            [platform_events.Event, adapter_model.MessageSourceAdapter], None
         ],
     ):
         delattr(self.bot, event_handler_mapping[event_type])
@@ -524,8 +585,12 @@ class OfficialAdapter(adapter_model.MessageSourceAdapter):
             self.member_openid_mapping, self.group_openid_mapping
         )
 
-        self.ap.logger.info("运行 QQ 官方适配器")
+        self.cfg['ret_coro'] = True
-        await self.bot.start(**self.cfg)
 
-    def kill(self) -> bool:
+        self.ap.logger.info("运行 QQ 官方适配器")
-        return False
+        await (await self.bot.start(**self.cfg))
+
+    async def kill(self) -> bool:
+        if not self.bot.is_closed():
+            await self.bot.close()
+            return True