Update config.py

fix: metrics
perf: aiocqhttp image url
2024-08-13 15:05:16 +08:00 · 2024-08-12 02:50:31 -04:00 · 2024-08-11 23:24:37 -04:00 · 2024-08-11 23:24:37 -04:00 · 2024-08-11 17:13:49 +08:00 · 2024-08-11 03:55:31 -04:00
31 changed files with 796 additions and 579 deletions
@@ -0,0 +1,18 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+# github acions
+.github/
+.*ignore
+.git/
+# User-specific stuff
+.idea/
+# Byte-compiled / optimized / DLL files
+__pycache__/
+# Environments
+.env
+.venv
+env/
+venv*/
+ENV/
+.conda/
+README*.md
@@ -4,20 +4,39 @@ on:
  release:
    types: [published]
  workflow_dispatch:
+
 jobs:
-  publish-latest-docker-image:
+  publish-docker:
    runs-on: ubuntu-latest
-    name: Build and publish docker image

    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Build image
-        run: |
-          git clone https://github.com/Soulter/AstrBot
-          cd AstrBot
-          docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:latest .
-      - name: Publish image
-        run: |
-          docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} -p ${{ secrets.DOCKER_HUB_PASSWORD }}
-          docker push ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:latest
+      - name: 拉取源码
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+
+      - name: 设置 QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: 设置 Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: 登录到 DockerHub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+
+      - name: 构建和推送 Docker hub
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:latest
+            ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:${{ github.event.release.tag_name }}
+
+      - name: Post build notifications
+        run: echo "Docker image has been built and pushed successfully"
+
@@ -3,6 +3,18 @@ WORKDIR /AstrBot

 COPY . /AstrBot/

+RUN apt-get update && apt-get install -y --no-install-recommends \
+    gcc \
+    build-essential \
+    python3-dev \
+    libffi-dev \
+    libssl-dev \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
 RUN python -m pip install -r requirements.txt

+EXPOSE 6185 
+EXPOSE 6186
+
 CMD [ "python", "main.py" ]
@@ -1,6 +1,6 @@
 <p align="center">

-<img width="806" alt="image" src="https://github.com/Soulter/AstrBot/assets/37870767/c6f057d9-46d7-4144-8116-00a962941746">
+<img width="750" alt="image" src="https://github.com/Soulter/AstrBot/assets/37870767/c6f057d9-46d7-4144-8116-00a962941746">

 </p>
 <div align="center">
@@ -12,36 +12,52 @@
 <img alt="Static Badge" src="https://img.shields.io/badge/QQ群-322154837-purple">
 </a>

-<a href="https://astrbot.soulter.top/center">项目部署</a> ｜
+<a href="https://astrbot.soulter.top/docs/main">快速开始</a> ｜
 <a href="https://github.com/Soulter/AstrBot/issues">问题提交</a> ｜
-<a href="https://astrbot.soulter.top/center/docs/%E5%BC%80%E5%8F%91/%E6%8F%92%E4%BB%B6%E5%BC%80%E5%8F%91">插件开发</a>
+<a href="https://astrbot.soulter.top/docs/develop/plugin4p">插件开发</a>
 </div>

 ## 🛠️ 功能

 🌍 支持的消息平台
 - QQ 群、QQ 频道（OneBot、QQ 官方接口）
- Telegram（由 [astrbot_plugin_telegram](https://github.com/Soulter/astrbot_plugin_telegram) 插件支持）
- WeChat(微信) (由 [astrbot_plugin_vchat](https://github.com/z2z63/astrbot_plugin_vchat) 插件支持)
+- Telegram（[astrbot_plugin_telegram](https://github.com/Soulter/astrbot_plugin_telegram) 插件）
+- WeChat(微信) ([astrbot_plugin_vchat](https://github.com/z2z63/astrbot_plugin_vchat) 插件)

-🌍 支持的大模型一览：
+🌍 支持的大模型/底座：

 - OpenAI GPT、DallE 系列
 - Claude（由[LLMs插件](https://github.com/Soulter/llms)支持）
 - HuggingChat（由[LLMs插件](https://github.com/Soulter/llms)支持）
 - Gemini（由[LLMs插件](https://github.com/Soulter/llms)支持）
+- Ollama 
+- 几乎所有已知模型（可接入 [OneAPI](https://astrbot.soulter.top/docs/docs/adavanced/one-api)）

 🌍 机器人支持的能力一览：
 - 大模型对话、人格、网页搜索
- 可视化管理面板
+- 可视化仪表盘
 - 同时处理多平台消息
 - 精确到个人的会话隔离
 - 插件支持
 - 文本转图片回复（Markdown）

-## 🧩 插件支持
+## 🧩 插件

-有关插件的使用和列表请移步：[AstrBot 文档 - 插件](https://astrbot.soulter.top/center/docs/%E4%BD%BF%E7%94%A8/%E6%8F%92%E4%BB%B6)
+有关插件的使用和列表请移步：[AstrBot 文档 - 插件](https://astrbot.soulter.top/docs/get-started/plugin)
+
+## 云部署
+
+[![Run on Repl.it](https://repl.it/badge/github/Soulter/AstrBot)](https://repl.it/github/Soulter/AstrBot)
+
+## ❤️ 贡献
+
+欢迎任何 Issues/Pull Requests！只需要将你的更改提交到此项目 ：)
+
+对于新功能的添加，请先通过 Issue 进行讨论。
+
+## 🔭 展望
+
+- [ ] 更多、更开放的 LLM Agent 能力

 ## ✨ Demo

@@ -10,6 +10,7 @@ from model.plugin.manager import PluginManager
 from model.platform.manager import PlatformManager
 from typing import Dict, List, Union
 from type.types import Context
+from type.config import VERSION
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
 from util.cmd_config import CmdConfig
@@ -23,15 +24,26 @@ logger: Logger = LogManager.GetLogger(log_name='astrbot')
 class AstrBotBootstrap():
    def __init__(self) -> None:        
        self.context = Context()
-        self.config_helper: CmdConfig = CmdConfig()
+        self.config_helper = CmdConfig()
        
        # load configs and ensure the backward compatibility
-        init_configs()
        try_migrate_config()
-        self.configs = inject_to_context(self.context)
-        logger.info("AstrBot v" + self.context.version)
        self.context.config_helper = self.config_helper
+        self.context.base_config = self.config_helper.cached_config
        
+        self.context.default_personality = {
+            "name": "default",
+            "prompt": self.context.base_config.get("default_personality_str", ""),
+        }
+        self.context.unique_session = self.context.base_config.get("uniqueSessionMode", False)
+        nick_qq = self.context.base_config.get("nick_qq", ('/', '!'))
+        if isinstance(nick_qq, str): nick_qq = (nick_qq, )
+        self.context.nick = nick_qq
+        self.context.t2i_mode = self.context.base_config.get("qq_pic_mode", True)
+        self.context.version = VERSION
+
+        logger.info("AstrBot v" + self.context.version)
+
        # apply proxy settings
        http_proxy = self.context.base_config.get("http_proxy")
        https_proxy = self.context.base_config.get("https_proxy")
@@ -66,6 +78,7 @@ class AstrBotBootstrap():
        self.context.updator = self.updator
        self.context.plugin_updator = self.plugin_manager.updator
        self.context.message_handler = self.message_handler
+        self.context.command_manager = self.command_manager
        
        # load plugins, plugins' commands.
        self.load_plugins()
@@ -87,15 +100,18 @@ class AstrBotBootstrap():
            try:
                result = await task
                return result
+            except asyncio.CancelledError:
+                logger.info(f"{task.get_name()} 任务已取消。")
+                return
            except Exception as e:
                logger.error(traceback.format_exc())
                logger.error(f"{task.get_name()} 任务发生错误，将在 5 秒后重试。")
                await asyncio.sleep(5)
    
    def load_llm(self):
-        if 'openai' in self.configs and \
-            len(self.configs['openai']['key']) and \
-            self.configs['openai']['key'][0] is not None:
+        if 'openai' in self.config_helper.cached_config and \
+            len(self.config_helper.cached_config['openai']['key']) and \
+            self.config_helper.cached_config['openai']['key'][0] is not None:
            from model.provider.openai_official import ProviderOpenAIOfficial
            from model.command.openai_official_handler import OpenAIOfficialCommandHandler
            self.openai_command_handler = OpenAIOfficialCommandHandler(self.command_manager)
@@ -112,9 +112,11 @@ class MessageHandler():
        self.rate_limit_helper = RateLimitHelper(context)
        self.content_safety_helper = ContentSafetyHelper(context)
        self.llm_wake_prefix = self.context.base_config['llm_wake_prefix']
+        if self.llm_wake_prefix:
+            self.llm_wake_prefix = self.llm_wake_prefix.strip()
        self.nicks = self.context.nick
        self.provider = provider
-        self.reply_prefix = self.context.reply_prefix
+        self.reply_prefix = str(self.context.reply_prefix)
    
    def set_provider(self, provider: Provider):
        self.provider = provider
@@ -132,8 +134,8 @@ class MessageHandler():
        self.persist_manager.record_message(message.platform.platform_name, message.session_id)
        
        # TODO: this should be configurable
-        if not message.message_str:
-            return MessageResult("Hi~")
+        # if not message.message_str:
+        #     return MessageResult("Hi~")
        
        # check the rate limit
        if not self.rate_limit_helper.check_frequency(message.message_obj.sender.user_id):
@@ -144,7 +146,8 @@ class MessageHandler():
            if msg_plain.startswith(nick):
                msg_plain = msg_plain.removeprefix(nick)
                break
-            
+        message.message_str = msg_plain
+
        # scan candidate commands
        cmd_res = await self.command_manager.scan_command(message, self.context)
        if cmd_res:
@@ -155,11 +158,18 @@ class MessageHandler():
                use_t2i=cmd_res.is_use_t2i
            )
        
+        # next is the LLM part
+        
+        if message.only_command:
+            return
+        
        # check if the message is a llm-wake-up command
-        if not msg_plain.startswith(self.llm_wake_prefix):
+        if self.llm_wake_prefix and not msg_plain.startswith(self.llm_wake_prefix):
+            logger.debug(f"消息 `{msg_plain}` 没有以 LLM 唤醒前缀 `{self.llm_wake_prefix}` 开头，忽略。")
            return
        
        if not provider:
+            logger.debug("没有任何 LLM 可用，忽略。")
            return
        
        # check the content safety
@@ -179,7 +189,7 @@ class MessageHandler():
        
        try:
            if web_search:
-                llm_result = await web_searcher.web_search(msg_plain, provider, message.session_id, inner_provider)
+                llm_result = await web_searcher.web_search(msg_plain, provider, message.session_id, official_fc=True)
            else:
                llm_result = await provider.text_chat(
                    prompt=msg_plain, 
@@ -45,6 +45,10 @@ class AstrBotDashBoard():
        def index():
            # 返回页面
            return self.dashboard_be.send_static_file("index.html")
+        
+        @self.dashboard_be.get("/auth/login")
+        def _():
+            return self.dashboard_be.send_static_file("index.html")

        @self.dashboard_be.get("/config")
        def rt_config():
@@ -86,12 +90,11 @@ class AstrBotDashBoard():

        @self.dashboard_be.post("/api/change_password")
        def change_password():
-            password = self.context.base_config("dashboard_password", "")
+            password = self.context.base_config.get("dashboard_password", "")
            # 获得请求体
            post_data = request.json
            if post_data["password"] == password:
                self.context.config_helper.put("dashboard_password", post_data["new_password"])
-                self.context.base_config['dashboard_password'] = post_data["new_password"]
                return Response(
                    status="success",
                    message="修改成功。",
@@ -189,10 +192,11 @@ class AstrBotDashBoard():
            try:
                logger.info(f"正在安装插件 {repo_url}")
                self.plugin_manager.install_plugin(repo_url)
-                logger.info(f"安装插件 {repo_url} 成功")
+                threading.Thread(target=self.astrbot_updator._reboot, args=(2, self.context)).start()
+                logger.info(f"安装插件 {repo_url} 成功，2秒后重启")
                return Response(
                    status="success",
-                    message="安装成功~",
+                    message="安装成功，机器人将在 2 秒内重启。",
                    data=None
                ).__dict__
            except Exception as e:
@@ -255,10 +259,11 @@ class AstrBotDashBoard():
            try:
                logger.info(f"正在更新插件 {plugin_name}")
                self.plugin_manager.update_plugin(plugin_name)
-                logger.info(f"更新插件 {plugin_name} 成功")
+                threading.Thread(target=self.astrbot_updator._reboot, args=(2, self.context)).start()
+                logger.info(f"更新插件 {plugin_name} 成功，2秒后重启")
                return Response(
                    status="success",
-                    message="更新成功~",
+                    message="更新成功，机器人将在 2 秒内重启。",
                    data=None
                ).__dict__
            except Exception as e:
@@ -308,7 +313,7 @@ class AstrBotDashBoard():
                latest = False
            try:
                self.astrbot_updator.update(latest=latest, version=version)
-                threading.Thread(target=self.astrbot_updator._reboot, args=(3, )).start()
+                threading.Thread(target=self.astrbot_updator._reboot, args=(2, self.context)).start()
                return Response(
                    status="success",
                    message="更新成功，机器人将在 3 秒内重启。",
@@ -371,7 +376,7 @@ class AstrBotDashBoard():
                self.dashboard_data, self.context.config_helper.get_all())
            # 重启
            threading.Thread(target=self.astrbot_updator._reboot,
-                                args=(2, ), daemon=True).start()
+                                args=(2, self.context), daemon=True).start()
        except Exception as e:
            raise e

@@ -4,12 +4,13 @@ import asyncio
 import sys
 import warnings
 import traceback
+import mimetypes
 from astrbot.bootstrap import AstrBotBootstrap
 from SparkleLogging.utils.core import LogManager
 from logging import Formatter

 warnings.filterwarnings("ignore")
-logo_tmpl = """
+logo_tmpl = r"""
     ___           _______.___________..______      .______     ______   .___________.
    /   \         /       |           ||   _  \     |   _  \   /  __  \  |           |
   /  ^  \       |   (----`---|  |----`|  |_)  |    |  |_)  | |  |  |  | `---|  |----`
@@ -42,12 +43,17 @@ def check_env():
        
    os.makedirs("data/config", exist_ok=True)
    os.makedirs("temp", exist_ok=True)
+
+    # workaround for issue #181
+    mimetypes.add_type("text/javascript", ".js") 
+    mimetypes.add_type("text/javascript", ".mjs")
+    mimetypes.add_type("application/json", ".json")
    
 if __name__ == "__main__":
    check_env()
    
    logger = LogManager.GetLogger(
-    log_name='astrbot',
+        log_name='astrbot',
        out_to_console=True,
        custom_formatter=Formatter('[%(asctime)s| %(name)s - %(levelname)s|%(filename)s:%(lineno)d]: %(message)s', datefmt="%H:%M:%S")
    )
@@ -62,14 +62,16 @@ class InternalCommandHandler:
            return CommandResult().message("你没有权限使用该指令。")
        l = message_str.split(" ")
        if len(l) == 1:
-            return CommandResult().message("设置机器人唤醒词，支持多唤醒词。以唤醒词开头的消息会唤醒机器人处理，起到 @ 的效果。\n示例：wake 昵称1 昵称2 昵称3")
-        nick = l[1:]
+            return CommandResult().message(f"设置机器人唤醒词。以唤醒词开头的消息会唤醒机器人处理，起到 @ 的效果。\n示例：wake 昵称。当前唤醒词有：{context.nick}")
+        nick = l[1].strip()
+        if not nick:
+            return CommandResult().message("wake: 请指定唤醒词。")
        context.config_helper.put("nick_qq", nick)
        context.nick = tuple(nick)
        return CommandResult(
            hit=True,
            success=True,
-            message_chain=f"已经成功将唤醒词设定为 {nick}",
+            message_chain=f"已经成功将唤醒词设定为 {nick}。",
        )
        
    def update(self, message: AstrMessageEvent, context: Context):
@@ -115,11 +117,11 @@ class InternalCommandHandler:
                success=False,
                message_chain="你没有权限使用该指令",
            )
-        context.updator._reboot(5)
+        context.updator._reboot(3, context)
        return CommandResult(
            hit=True,
            success=True,
-            message_chain="AstrBot 将在 5s 后重启。",
+            message_chain="AstrBot 将在 3s 后重启。",
        )
    
    def plugin(self, message: AstrMessageEvent, context: Context):
@@ -230,15 +232,17 @@ class InternalCommandHandler:
            )
    
    def t2i_toggle(self, message: AstrMessageEvent, context: Context):
-        p = context.config_helper.get("qq_pic_mode", True)
+        p = context.t2i_mode
        if p:
            context.config_helper.put("qq_pic_mode", False)
+            context.t2i_mode = False
            return CommandResult(
                hit=True,
                success=True,
                message_chain="已关闭文本转图片模式。",
            )
        context.config_helper.put("qq_pic_mode", True)
+        context.t2i_mode = True
        
        return CommandResult(
            hit=True,
@@ -20,7 +20,9 @@ class CommandMetadata():
    inner_command: bool
    plugin_metadata: PluginMetadata
    handler: callable
-    description: str
+    use_regex: bool = False
+    ignore_prefix: bool = False
+    description: str = ""

 class CommandManager():
    def __init__(self):
@@ -33,10 +35,14 @@ class CommandManager():
                 description: str, 
                 priority: int,
                 handler: callable,
+                 use_regex: bool = False,
+                 ignore_prefix: bool = False,
                 plugin_metadata: PluginMetadata = None,
                ):
        '''
        优先级越高，越先被处理。
+        
+        use_regex: 是否使用正则表达式匹配指令。
        '''
        if command in self.commands_handler:
            raise ValueError(f"Command {command} already exists.")
@@ -48,6 +54,8 @@ class CommandManager():
            inner_command=plugin_metadata == None,
            plugin_metadata=plugin_metadata,
            handler=handler,
+            use_regex=use_regex,
+            ignore_prefix=ignore_prefix,
            description=description
        )
        if plugin_metadata:
@@ -64,15 +72,42 @@ class CommandManager():
                    break
            if not plugin:
                logger.warning(f"插件 {request.plugin_name} 未找到，无法注册指令 {request.command_name}。")
-            self.register(request.command_name, request.description, request.priority, request.handler, plugin.metadata)
+            else:
+                self.register(command=request.command_name, 
+                              description=request.description, 
+                              priority=request.priority, 
+                              handler=request.handler, 
+                              use_regex=request.use_regex,
+                              ignore_prefix=request.ignore_prefix,
+                              plugin_metadata=plugin.metadata)
        self.plugin_commands_waitlist = []
-
+        
+    async def check_command_ignore_prefix(self, message_str: str) -> bool:
+        for _, command in self.commands:
+            command_metadata = self.commands_handler[command]
+            if command_metadata.ignore_prefix:
+                trig = False
+                if self.commands_handler[command].use_regex:
+                    trig = self.command_parser.regex_match(message_str, command)
+                else:
+                    trig = message_str.startswith(command)
+                if trig:
+                    return True
+        return False
+                
    async def scan_command(self, message_event: AstrMessageEvent, context: Context) -> CommandResult:
        message_str = message_event.message_str
        for _, command in self.commands:
-            if message_str.startswith(command):
+            trig = False
+            if self.commands_handler[command].use_regex:
+                trig = self.command_parser.regex_match(message_str, command)
+            else:
+                trig = message_str.startswith(command)
+            if trig:
                logger.info(f"触发 {command} 指令。")
                command_result = await self.execute_handler(command, message_event, context)
+                if not command_result:
+                    continue
                if command_result.hit:
                    return command_result

@@ -1,3 +1,5 @@
+import re
+
 class CommandTokens():
    def __init__(self) -> None:
        self.tokens = []
@@ -16,4 +18,8 @@ class CommandParser():
        cmd_tokens = CommandTokens()
        cmd_tokens.tokens = message.split(" ")
        cmd_tokens.len = len(cmd_tokens.tokens)
-        return cmd_tokens
+        return cmd_tokens
+    
+    def regex_match(self, message: str, command: str) -> bool:
+        return re.search(command, message, re.MULTILINE) is not None
+    
@@ -2,11 +2,14 @@ import abc
 from typing import Union, Any, List
 from nakuru.entities.components import Plain, At, Image, BaseMessageComponent
 from type.astrbot_message import AstrBotMessage
+from type.command import CommandResult
+from type.astrbot_message import MessageType


 class Platform():
-    def __init__(self) -> None:
-        pass
+    def __init__(self, platform_name: str, context) -> None:
+        self.PLATFORM_NAME = platform_name
+        self.context = context

    @abc.abstractmethod
    async def handle_msg(self, message: AstrBotMessage):
@@ -24,7 +27,14 @@ class Platform():
        pass

    @abc.abstractmethod
-    async def send_msg(self, target: Any, result_message: Union[List[BaseMessageComponent], str]):
+    async def send_msg(self, target: Any, result_message: CommandResult):
+        '''
+        发送消息（主动）
+        '''
+        pass
+    
+    @abc.abstractmethod
+    async def send_msg_new(self, message_type: MessageType, target: str, result_message: CommandResult):
        '''
        发送消息（主动）
        '''
@@ -70,4 +80,6 @@ class Platform():
            else:
                rendered_images.append(Image.fromFileSystem(p))
            return rendered_images
-        
+        
+    async def record_metrics(self):
+        self.context.metrics_uploader.increment_platform_stat(self.PLATFORM_NAME)
@@ -58,7 +58,7 @@ class PlatformManager():
        try:
            qq_gocq = QQGOCQ(self.context, self.msg_handler)
            self.context.platforms.append(RegisteredPlatform(
-                platform_name="gocq", platform_instance=qq_gocq, origin="internal"))
+                platform_name="nakuru", platform_instance=qq_gocq, origin="internal"))
            await qq_gocq.run()
        except BaseException as e:
            logger.error("启动 nakuru 适配器时出现错误: " + str(e))
@@ -81,7 +81,7 @@ class PlatformManager():
            from model.platform.qq_official import QQOfficial
            qqchannel_bot = QQOfficial(self.context, self.msg_handler)
            self.context.platforms.append(RegisteredPlatform(
-                platform_name="qqchan", platform_instance=qqchannel_bot, origin="internal"))
+                platform_name="qqofficial", platform_instance=qqchannel_bot, origin="internal"))
            return qqchannel_bot.run()
        except BaseException as e:
            logger.error("启动 QQ官方机器人适配器时出现错误: " + str(e))
@@ -7,6 +7,7 @@ from aiocqhttp.exceptions import ActionFailed
 from . import Platform
 from type.astrbot_message import *
 from type.message_event import *
+from type.command import *
 from typing import Union, List, Dict
 from nakuru.entities.components import *
 from SparkleLogging.utils.core import LogManager
@@ -17,6 +18,7 @@ logger: Logger = LogManager.GetLogger(log_name='astrbot')

 class AIOCQHTTP(Platform):
    def __init__(self, context: Context, message_handler: MessageHandler) -> None:
+        super().__init__("aiocqhttp", context)
        self.message_handler = message_handler
        self.waiting = {}
        self.context = context
@@ -47,6 +49,14 @@ class AIOCQHTTP(Platform):
        abm.message = []
        
        message_str = ""
+        if not isinstance(event.message, list):
+            err = f"aiocqhttp: 无法识别的消息类型: {str(event.message)}，此条消息将被忽略。如果您在使用 go-cqhttp，请将其配置文件中的 message.post-format 更改为 array。"
+            logger.critical(err)
+            try:
+                self.bot.send(event, err)
+            except BaseException as e:
+                logger.error(f"回复消息失败: {e}")
+            return
        for m in event.message:
            t = m['type']
            a = None
@@ -58,7 +68,9 @@ class AIOCQHTTP(Platform):
                message_str += m['data']['text'].strip()
                abm.message.append(a)
            if t == 'image':
-                a = Image(file=m['data']['file'])
+                file = m['data']['file'] if 'file' in m['data'] else None
+                url = m['data']['url'] if 'url' in m['data'] else None
+                a = Image(file=file, url=url)
                abm.message.append(a)
        abm.timestamp = int(time.time())
        abm.message_str = message_str
@@ -74,14 +86,12 @@ class AIOCQHTTP(Platform):
            abm = self.convert_message(event)
            if abm:
                await self.handle_msg(abm)
-            # return {'reply': event.message}
        
        @self.bot.on_message('private')
        async def private(event: Event):
            abm = self.convert_message(event)
            if abm:
                await self.handle_msg(abm)
-            # return {'reply': event.message}
        
        bot = self.bot.run_task(host=self.host, port=int(self.port), shutdown_trigger=self.shutdown_trigger_placeholder)
        
@@ -92,44 +102,65 @@ class AIOCQHTTP(Platform):
        return bot
    
    async def shutdown_trigger_placeholder(self):
-        while True:
+        while self.context.running:
            await asyncio.sleep(1)
    
    def pre_check(self, message: AstrBotMessage) -> bool:
-        # if message chain contains Plain components or At components which points to self_id, return True
+        # if message chain contains Plain components or 
+        # At components which points to self_id, return True
        if message.type == MessageType.FRIEND_MESSAGE:
-            return True
+            return True, "friend"
        for comp in message.message:
            if isinstance(comp, At) and str(comp.qq) == message.self_id:
-                return True
+                return True, "at"
+        # check commands which ignore prefix
+        if self.context.command_manager.check_command_ignore_prefix(message.message_str):
+            return True, "command"
        # check nicks
        if self.check_nick(message.message_str):
-            return True
-        return False
+            return True, "nick"
+        return False, "none"
        
    async def handle_msg(self, message: AstrBotMessage):
        logger.info(
            f"{message.sender.nickname}/{message.sender.user_id} -> {self.parse_message_outline(message)}")
        
-        if not self.pre_check(message):
+        ok, reason = self.pre_check(message)
+        if not ok:
            return
        
        # 解析 role
        sender_id = str(message.sender.user_id)
-        if sender_id == self.context.config_helper.get('admin_qq', '') or \
-                sender_id in self.context.config_helper.get('other_admins', []):
+        if sender_id == self.context.base_config.get('admin_qq', '') or \
+                sender_id in self.context.base_config.get('other_admins', []):
            role = 'admin'
        else:
            role = 'member'
            
+        # parse unified message origin
+        unified_msg_origin = None
+        assert isinstance(message.raw_message, Event)
+        if message.type == MessageType.GROUP_MESSAGE:
+            unified_msg_origin = f"aiocqhttp:{message.type.value}:{message.raw_message.group_id}"
+        elif message.type == MessageType.FRIEND_MESSAGE:
+            unified_msg_origin = f"aiocqhttp:{message.type.value}:{message.sender.user_id}"
+        
+        logger.debug(f"unified_msg_origin: {unified_msg_origin}")
+
        # construct astrbot message event
-        ame = AstrMessageEvent.from_astrbot_message(message, self.context, "aiocqhttp", message.session_id, role)
+        ame = AstrMessageEvent.from_astrbot_message(message, 
+                                                    self.context, 
+                                                    "aiocqhttp", 
+                                                    message.session_id, 
+                                                    role, 
+                                                    unified_msg_origin,
+                                                    reason == "command") # only_command
        
        # transfer control to message handler
        message_result = await self.message_handler.handle(ame)
        if not message_result: return
        
-        await self.reply_msg(message, message_result.result_message)
+        await self.reply_msg(message, message_result.result_message, message_result.use_t2i)
        if message_result.callback:
            message_result.callback()

@@ -140,7 +171,8 @@ class AIOCQHTTP(Platform):
    
    async def reply_msg(self,
                        message: AstrBotMessage,
-                        result_message: list):
+                        result_message: list,
+                        use_t2i: bool = None):
        """
        回复用户唤醒机器人的消息。（被动回复）
        """
@@ -153,7 +185,7 @@ class AIOCQHTTP(Platform):
            res = [Plain(text=res), ]
            
        # if image mode, put all Plain texts into a new picture.
-        if self.context.config_helper.get("qq_pic_mode", False) and isinstance(res, list):
+        if use_t2i or (use_t2i == None and self.context.base_config.get("qq_pic_mode", False)) and isinstance(res, list):
            rendered_images = await self.convert_to_t2i_chain(res)
            if rendered_images:
                try:
@@ -165,10 +197,10 @@ class AIOCQHTTP(Platform):
        
        await self._reply(message, res)
            
-    async def _reply(self, message: AstrBotMessage, message_chain: List[BaseMessageComponent]):
+    async def _reply(self, message: Union[AstrBotMessage, Dict], message_chain: List[BaseMessageComponent]):
+        await self.record_metrics()
        if isinstance(message_chain, str): 
            message_chain = [Plain(text=message_chain), ]
-            
        ret = []
        image_idx = []
        for idx, segment in enumerate(message_chain):
@@ -179,7 +211,15 @@ class AIOCQHTTP(Platform):
                image_idx.append(idx)
            ret.append(d)
        try:
-            await self.bot.send(message.raw_message, ret)
+            if isinstance(message, AstrBotMessage):
+                await self.bot.send(message.raw_message, ret)
+            if isinstance(message, dict):
+                if 'group_id' in message:
+                    await self.bot.send_group_msg(group_id=message['group_id'], message=ret)
+                elif 'user_id' in message:
+                    await self.bot.send_private_msg(user_id=message['user_id'], message=ret)
+                else:
+                    raise Exception("aiocqhttp: 无法识别的消息来源。仅支持 group_id 和 user_id。")
        except ActionFailed as e:
            logger.error(traceback.format_exc())
            logger.error(f"回复消息失败: {e}")
@@ -195,4 +235,25 @@ class AIOCQHTTP(Platform):
                        logger.info(f"上传成功。")
                        ret[idx]['data']['file'] = image_url
                        ret[idx]['data']['path'] = image_url
-                await self.bot.send(message.raw_message, ret)
+                await self.bot.send(message.raw_message, ret)
+                
+    async def send_msg(self, target: Dict[str, int], result_message: CommandResult):
+        '''
+        以主动的方式给QQ用户、QQ群发送一条消息。
+        
+        `target` 接收一个 dict 类型的值引用。
+        
+        - 要发给 QQ 下的某个用户，请添加 key `user_id`，值为 int 类型的 qq 号；
+        - 要发给某个群聊，请添加 key `group_id`，值为 int 类型的 qq 群号；
+        
+        '''
+        
+        await self._reply(target, result_message.message_chain)
+        
+    async def send_msg_new(self, message_type: MessageType, target: str, result_message: CommandResult):
+        if message_type == MessageType.GROUP_MESSAGE:
+            await self.send_msg({'group_id': int(target)}, result_message)
+        elif message_type == MessageType.FRIEND_MESSAGE:
+            await self.send_msg({'user_id': int(target)}, result_message)
+        else:
+            raise Exception("aiocqhttp: 无法识别的消息类型。")
@@ -14,6 +14,7 @@ from type.types import Context
 from . import Platform
 from type.astrbot_message import *
 from type.message_event import *
+from type.command import *
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
 from astrbot.message.handler import MessageHandler
@@ -29,6 +30,7 @@ class FakeSource:

 class QQGOCQ(Platform):
    def __init__(self, context: Context, message_handler: MessageHandler) -> None:
+        super().__init__("nakuru", context)
        self.loop = asyncio.new_event_loop()
        asyncio.set_event_loop(self.loop)
        
@@ -73,14 +75,17 @@ class QQGOCQ(Platform):
    def pre_check(self, message: AstrBotMessage) -> bool:
        # if message chain contains Plain components or At components which points to self_id, return True
        if message.type == MessageType.FRIEND_MESSAGE:
-            return True
+            return True, "friend"
        for comp in message.message:
            if isinstance(comp, At) and str(comp.qq) == message.self_id:
-                return True
+                return True, "at"
+        # check commands which ignore prefix
+        if self.context.command_manager.check_command_ignore_prefix(message.message_str):
+            return True, "command"
        # check nicks
        if self.check_nick(message.message_str):
-            return True
-        return False
+            return True, "nick"
+        return False, "none"

    def run(self):
        coro = self.client._run()
@@ -94,7 +99,8 @@ class QQGOCQ(Platform):
                          (GroupMessage, FriendMessage, GuildMessage))

        # 判断是否响应消息
-        if not self.pre_check(message):
+        ok, reason = self.pre_check(message)
+        if not ok:
            return

        # 解析 session_id
@@ -111,20 +117,41 @@ class QQGOCQ(Platform):

        # 解析 role
        sender_id = str(message.raw_message.user_id)
-        if sender_id == self.context.config_helper.get('admin_qq', '') or \
-                sender_id in self.context.config_helper.get('other_admins', []):
+        if sender_id == self.context.base_config.get('admin_qq', '') or \
+                sender_id in self.context.base_config.get('other_admins', []):
            role = 'admin'
        else:
            role = 'member'
            
+        # parse unified message origin
+        unified_msg_origin = None
+        if message.type == MessageType.GROUP_MESSAGE:
+            assert isinstance(message.raw_message, GroupMessage)
+            unified_msg_origin = f"nakuru:{message.type.value}:{message.raw_message.group_id}"
+        elif message.type == MessageType.FRIEND_MESSAGE:
+            assert isinstance(message.raw_message, FriendMessage)
+            unified_msg_origin = f"nakuru:{message.type.value}:{message.sender.user_id}"
+        elif message.type == MessageType.GUILD_MESSAGE:
+            assert isinstance(message.raw_message, GuildMessage)
+            unified_msg_origin = f"nakuru:{message.type.value}:{message.raw_message.channel_id}"
+        
+        logger.debug(f"unified_msg_origin: {unified_msg_origin}")
+
+            
        # construct astrbot message event
-        ame = AstrMessageEvent.from_astrbot_message(message, self.context, "gocq", session_id, role)
+        ame = AstrMessageEvent.from_astrbot_message(message, 
+                                                    self.context, 
+                                                    "nakuru", 
+                                                    session_id, 
+                                                    role,
+                                                    unified_msg_origin,
+                                                    reason == 'command') # only_command
        
        # transfer control to message handler
        message_result = await self.message_handler.handle(ame)
        if not message_result: return
        
-        await self.reply_msg(message, message_result.result_message)
+        await self.reply_msg(message, message_result.result_message, message_result.use_t2i)
        if message_result.callback:
            message_result.callback()

@@ -134,7 +161,8 @@ class QQGOCQ(Platform):

    async def reply_msg(self,
                        message: AstrBotMessage,
-                        result_message: List[BaseMessageComponent]):
+                        result_message: List[BaseMessageComponent],
+                        use_t2i: bool = None):
        """
        回复用户唤醒机器人的消息。（被动回复）
        """
@@ -151,7 +179,7 @@ class QQGOCQ(Platform):
            res = [Plain(text=res), ]

        # if image mode, put all Plain texts into a new picture.
-        if self.context.config_helper.get("qq_pic_mode", False) and isinstance(res, list):
+        if use_t2i or (use_t2i == None and self.context.base_config.get("qq_pic_mode", False)) and isinstance(res, list):
            rendered_images = await self.convert_to_t2i_chain(res)
            if rendered_images:
                try:
@@ -168,14 +196,26 @@ class QQGOCQ(Platform):
            message_chain = [Plain(text=message_chain), ]
        
        is_dict = isinstance(source, dict)
-        if source.type == "GuildMessage":
+        
+        typ = None
+        if is_dict:
+            if "group_id" in source:
+                typ = "GroupMessage"
+            elif "user_id" in source:
+                typ = "FriendMessage"
+            elif "guild_id" in source:
+                typ = "GuildMessage"
+        else:
+            typ = source.type
+        
+        if typ == "GuildMessage":
            guild_id = source['guild_id'] if is_dict else source.guild_id
            chan_id = source['channel_id'] if is_dict else source.channel_id
            await self.client.sendGuildChannelMessage(guild_id, chan_id, message_chain)
-        elif source.type == "FriendMessage":
+        elif typ == "FriendMessage":
            user_id = source['user_id'] if is_dict else source.user_id
            await self.client.sendFriendMessage(user_id, message_chain)
-        elif source.type == "GroupMessage":
+        elif typ == "GroupMessage":
            group_id = source['group_id'] if is_dict else source.group_id
            # 过长时forward发送
            plain_text_len = 0
@@ -185,7 +225,7 @@ class QQGOCQ(Platform):
                    plain_text_len += len(i.text)
                elif isinstance(i, Image):
                    image_num += 1
-            if plain_text_len > self.context.config_helper.get('qq_forward_threshold', 200):
+            if plain_text_len > self.context.base_config.get('qq_forward_threshold', 200):
                # 删除At
                for i in message_chain:
                    if isinstance(i, At):
@@ -199,7 +239,7 @@ class QQGOCQ(Platform):
                return
            await self.client.sendGroupMessage(group_id, message_chain)
        
-    async def send_msg(self, target: Dict[str, int], result_message: Union[List[BaseMessageComponent], str]):
+    async def send_msg(self, target: Dict[str, int], result_message: CommandResult):
        '''
        以主动的方式给用户、群或者频道发送一条消息。
        
@@ -211,7 +251,24 @@ class QQGOCQ(Platform):
        
        guild_id 不是频道号。
        '''
-        await self._reply(target, result_message)
+        await self._reply(target, result_message.message_chain)
+        
+    async def send_msg_new(self, message_type: MessageType, target: str, result_message: CommandResult):
+        '''
+        以主动的方式给用户、群或者频道发送一条消息。
+        
+        `message_type` 为 MessageType 枚举类型。
+        
+        - 要发给 QQ 下的某个用户，请使用 MessageType.FRIEND_MESSAGE；
+        - 要发给某个群聊，请使用 MessageType.GROUP_MESSAGE；
+        - 要发给某个频道，请使用 MessageType.GUILD_MESSAGE。
+        '''
+        if message_type == MessageType.FRIEND_MESSAGE:
+            await self.send_msg({"user_id": int(target)}, result_message)
+        elif message_type == MessageType.GROUP_MESSAGE:
+            await self.send_msg({"group_id": int(target)}, result_message)
+        elif message_type == MessageType.GUILD_MESSAGE:
+            await self.send_msg({"channel_id": int(target)}, result_message)

    def convert_message(self, message: Union[GroupMessage, FriendMessage, GuildMessage]) -> AstrBotMessage:
        abm = AstrBotMessage()
@@ -232,7 +289,7 @@ class QQGOCQ(Platform):
            str(message.sender.user_id),
            str(message.sender.nickname)
        )
-        abm.tag = "gocq"
+        abm.tag = "nakuru"
        abm.message = message.message
        return abm
    
@@ -13,6 +13,7 @@ from util.io import save_temp_img, download_image_by_url
 from . import Platform
 from type.astrbot_message import *
 from type.message_event import *
+from type.command import *
 from typing import Union, List, Dict
 from nakuru.entities.components import *
 from SparkleLogging.utils.core import LogManager
@@ -42,12 +43,17 @@ class botClient(Client):
        # 转换层
        abm = self.platform._parse_from_qqofficial(message, MessageType.FRIEND_MESSAGE)
        await self.platform.handle_msg(abm)
+        
+    # 收到 C2C 消息
+    async def on_c2c_message_create(self, message: botpy.message.C2CMessage):
+        abm = self.platform._parse_from_qqofficial(message, MessageType.FRIEND_MESSAGE)
+        await self.platform.handle_msg(abm)


 class QQOfficial(Platform):

-    def __init__(self, context: Context, message_handler: MessageHandler) -> None:
-        super().__init__()
+    def __init__(self, context: Context, message_handler: MessageHandler, test_mode = False) -> None:
+        super().__init__("qqofficial", context)
        self.loop = asyncio.new_event_loop()
        asyncio.set_event_loop(self.loop)
        
@@ -80,6 +86,8 @@ class QQOfficial(Platform):

        self.client.set_platform(self)
        
+        self.test_mode = test_mode
+
    async def _parse_to_qqofficial(self, message: List[BaseMessageComponent], is_group: bool = False):
        plain_text = ""
        image_path = None  # only one img supported
@@ -104,14 +112,20 @@ class QQOfficial(Platform):
        abm.timestamp = int(time.time())
        abm.raw_message = message
        abm.message_id = message.id
-        abm.tag = "qqchan"
+        abm.tag = "qqofficial"
        msg: List[BaseMessageComponent] = []

-        if message_type == MessageType.GROUP_MESSAGE:
-            abm.sender = MessageMember(
-                message.author.member_openid,
-                ""
-            )
+        if isinstance(message, botpy.message.GroupMessage) or isinstance(message, botpy.message.C2CMessage):
+            if isinstance(message, botpy.message.GroupMessage):
+                abm.sender = MessageMember(
+                    message.author.member_openid,
+                    ""
+                )
+            else:
+                abm.sender = MessageMember(
+                    message.author.user_openid,
+                    ""
+                )
            abm.message_str = message.content.strip()
            abm.self_id = "unknown_selfid"

@@ -126,8 +140,7 @@ class QQOfficial(Platform):
                        msg.append(img)
            abm.message = msg

-        elif message_type == MessageType.GUILD_MESSAGE or message_type == MessageType.FRIEND_MESSAGE:
-            # 目前对于 FRIEND_MESSAGE 只处理频道私聊
+        elif isinstance(message, botpy.message.Message) or isinstance(message, botpy.message.DirectMessage):
            try:
                abm.self_id = str(message.mentions[0].id)
            except:
@@ -175,7 +188,7 @@ class QQOfficial(Platform):

    async def handle_msg(self, message: AstrBotMessage):
        assert isinstance(message.raw_message, (botpy.message.Message,
-                          botpy.message.GroupMessage, botpy.message.DirectMessage))
+                          botpy.message.GroupMessage, botpy.message.DirectMessage, botpy.message.C2CMessage))
        is_group = message.type != MessageType.FRIEND_MESSAGE

        _t = "/私聊" if not is_group else ""
@@ -196,8 +209,8 @@ class QQOfficial(Platform):

        # 解析出 role
        sender_id = message.sender.user_id
-        if sender_id == self.context.config_helper.get('admin_qqchan', None) or \
-                sender_id in self.context.config_helper.get('other_admins', None):
+        if sender_id == self.context.base_config.get('admin_qqchan', None) or \
+                sender_id in self.context.base_config.get('other_admins', None):
            role = 'admin'
        else:
            role = 'member'
@@ -209,23 +222,26 @@ class QQOfficial(Platform):
        if not message_result:
            return

-        await self.reply_msg(message, message_result.result_message)
+        ret = await self.reply_msg(message, message_result.result_message, message_result.use_t2i)
        if message_result.callback:
            message_result.callback()

        # 如果是等待回复的消息
        if session_id in self.waiting and self.waiting[session_id] == '':
            self.waiting[session_id] = message
+            
+        return ret

    async def reply_msg(self,
                        message: AstrBotMessage,
-                        result_message: List[BaseMessageComponent]):
+                        result_message: List[BaseMessageComponent],
+                        use_t2i: bool = None):
        '''
        回复频道消息
        '''
        source = message.raw_message
        assert isinstance(source, (botpy.message.Message,
-                          botpy.message.GroupMessage, botpy.message.DirectMessage))
+                          botpy.message.GroupMessage, botpy.message.DirectMessage, botpy.message.C2CMessage))
        logger.info(
            f"{message.sender.nickname}({message.sender.user_id}) <- {self.parse_message_outline(result_message)}")

@@ -234,7 +250,7 @@ class QQOfficial(Platform):
        msg_ref = None
        rendered_images = []
        
-        if self.context.config_helper.get("qq_pic_mode", False) and isinstance(result_message, list):
+        if use_t2i or (use_t2i == None and self.context.base_config.get("qq_pic_mode", False)) and isinstance(res, list):
            rendered_images = await self.convert_to_t2i_chain(result_message)
        
        if isinstance(result_message, list):
@@ -253,12 +269,14 @@ class QQOfficial(Platform):
            'message_reference': msg_ref
        }
        
-        if message.type == MessageType.GROUP_MESSAGE:
+        if isinstance(message.raw_message, botpy.message.GroupMessage):
            data['group_openid'] = str(source.group_openid)
-        elif message.type == MessageType.GUILD_MESSAGE:
+        elif isinstance(message.raw_message, botpy.message.Message):
            data['channel_id'] = source.channel_id
-        elif message.type == MessageType.FRIEND_MESSAGE:
+        elif isinstance(message.raw_message, botpy.message.DirectMessage):
            data['guild_id'] = source.guild_id
+        elif isinstance(message.raw_message, botpy.message.C2CMessage):
+            data['openid'] = source.author.user_openid
        if image_path:
            data['file_image'] = image_path
        if rendered_images:
@@ -269,14 +287,13 @@ class QQOfficial(Platform):
            _data['message_reference'] = None
            
            try:
-                await self._reply(**_data)
-                return
+                return await self._reply(**_data)
            except BaseException as e:
                logger.warn(traceback.format_exc())
                logger.warn(f"以文本转图片的形式回复消息时发生错误: {e}，将尝试默认方式。")

        try:
-            await self._reply(**data)
+            return await self._reply(**data)
        except BaseException as e:
            logger.error(traceback.format_exc())
            # 分割过长的消息
@@ -286,28 +303,27 @@ class QQOfficial(Platform):
                split_res.append(plain_text[len(plain_text)//2:])
                for i in split_res:
                    data['content'] = i
-                    await self._reply(**data)
+                    return await self._reply(**data)
            else:
                try:
                    # 防止被qq频道过滤消息
                    plain_text = plain_text.replace(".", " . ")
-                    await self._reply(**data)
+                    return await self._reply(**data)
                except BaseException as e:
                    try:
                        data['content'] = str.join(" ", plain_text)
-                        await self._reply(**data)
+                        return await self._reply(**data)
                    except BaseException as e:
                        plain_text = re.sub(
                            r'(https|http)?:\/\/(\w|\.|\/|\?|\=|\&|\%)*\b', '[被隐藏的链接]', str(e), flags=re.MULTILINE)
                        plain_text = plain_text.replace(".", "·")
                        data['content'] = plain_text
-                        await self._reply(**data)
+                        return await self._reply(**data)

    async def _reply(self, **kwargs):
-        if 'group_openid' in kwargs:
+        if 'group_openid' in kwargs or 'openid' in kwargs:
            # QQ群组消息
-            # qq群组消息需要自行上传，暂时不处理
-            if 'file_image' in kwargs:
+            if 'file_image' in kwargs and kwargs['file_image']:
                file_image_path = kwargs['file_image'].replace("file:///", "")
                if file_image_path:
                    
@@ -317,49 +333,65 @@ class QQOfficial(Platform):
                        logger.debug(f"上传图片: {file_image_path}")
                        image_url = await self.context.image_uploader.upload_image(file_image_path)
                        logger.debug(f"上传成功: {image_url}")
-                    media = await self.client.api.post_group_file(kwargs['group_openid'], 1, image_url)
+                    if 'group_openid' in kwargs:
+                        media = await self.client.api.post_group_file(kwargs['group_openid'], 1, image_url)
+                    elif 'openid' in kwargs:
+                        media = await self.client.api.post_c2c_file(kwargs['openid'], 1, image_url)
                    del kwargs['file_image']
                    kwargs['media'] = media
                    logger.debug(f"发送群图片: {media}")
                    kwargs['msg_type'] = 7 # 富媒体
-            await self.client.api.post_group_message(**kwargs)
+            if self.test_mode: 
+                return kwargs
+            if 'group_openid' in kwargs:
+                await self.client.api.post_group_message(**kwargs)
+            elif 'openid' in kwargs:
+                await self.client.api.post_c2c_message(**kwargs)
        elif 'channel_id' in kwargs:
            # 频道消息
-            if 'file_image' in kwargs:
+            if 'file_image' in kwargs and kwargs['file_image']:
                kwargs['file_image'] = kwargs['file_image'].replace("file:///", "")
                # 频道消息发图只支持本地
                if kwargs['file_image'].startswith("http"):
                    kwargs['file_image'] = await download_image_by_url(kwargs['file_image'])
+            if self.test_mode:
+                return kwargs
            await self.client.api.post_message(**kwargs)
-        else:
+        elif 'guild_id' in kwargs:
            # 频道私聊消息
-            if 'file_image' in kwargs:
+            if 'file_image' in kwargs and kwargs['file_image']:
                kwargs['file_image'] = kwargs['file_image'].replace("file:///", "")
                if kwargs['file_image'].startswith("http"):
                    kwargs['file_image'] = await download_image_by_url(kwargs['file_image'])
+            if self.test_mode:
+                return kwargs
            await self.client.api.post_dms(**kwargs)
+        else:
+            raise ValueError("Unknown target type.")

-    async def send_msg(self, target: Dict[str, str], result_message: Union[List[BaseMessageComponent], str]):
+    async def send_msg(self, target: Dict[str, str], result_message: CommandResult):
        '''
-        以主动的方式给用户、群或者频道发送一条消息。
+        以主动的方式给频道用户、群、频道或者消息列表用户（QQ用户）发送一条消息。
        
        `target` 接收一个 dict 类型的值引用。
        
        - 如果目标是 QQ 群，请添加 key `group_openid`。
        - 如果目标是 频道消息，请添加 key `channel_id`。
        - 如果目标是 频道私聊，请添加 key `guild_id`。
+        - 如果目标是 QQ 用户，请添加 key `openid`。
        '''
-        if isinstance(result_message, list):
-            plain_text, image_path = await self._parse_to_qqofficial(result_message)
-        else:
-            plain_text = result_message
+        plain_text, image_path = await self._parse_to_qqofficial(result_message.message_chain)

        payload = {
            'content': plain_text,
-            'file_image': image_path,
            **target
        }
+        if image_path:
+            payload['file_image'] = image_path
        await self._reply(**payload)
+        
+    async def send_msg_new(self, message_type: MessageType, target: str, result_message: CommandResult):
+        raise NotImplementedError("qqofficial 不支持此方法。")

    def wait_for_message(self, channel_id: int) -> AstrBotMessage:
        '''
@@ -376,4 +408,4 @@ class QQOfficial(Platform):
            cnt += 1
            if cnt > 300:
                raise Exception("等待消息超时。")
-            time.sleep(1)()
+            time.sleep(1)
@@ -13,13 +13,15 @@ class CommandRegisterRequest():
    description: str
    priority: int
    handler: Callable
+    use_regex: bool = False
    plugin_name: str = None
+    ignore_prefix: bool = False

 class PluginCommandBridge():
    def __init__(self, cached_plugins: RegisteredPlugins):
        self.plugin_commands_waitlist: List[CommandRegisterRequest] = []
        self.cached_plugins = cached_plugins
        
-    def register_command(self, plugin_name, command_name, description, priority, handler):
-        self.plugin_commands_waitlist.append(CommandRegisterRequest(command_name, description, priority, handler, plugin_name))
+    def register_command(self, plugin_name, command_name, description, priority, handler, use_regex=False, ignore_prefix=False):
+        self.plugin_commands_waitlist.append(CommandRegisterRequest(command_name, description, priority, handler, use_regex, plugin_name, ignore_prefix))
        
@@ -5,6 +5,7 @@ import traceback
 import uuid
 import shutil
 import yaml
+import subprocess

 from util.updator.plugin_updator import PluginUpdator
 from util.io import remove_dir, download_file
@@ -84,8 +85,28 @@ class PluginManager():
    def update_plugin_dept(self, path):
        mirror = "https://mirrors.aliyun.com/pypi/simple/"
        py = sys.executable
-        os.system(f"{py} -m pip install -r {path} -i {mirror} --quiet")
-
+        # os.system(f"{py} -m pip install -r {path} -i {mirror} --break-system-package --trusted-host mirrors.aliyun.com")
+        
+        process = subprocess.Popen(f"{py} -m pip install -r {path} -i {mirror} --break-system-package --trusted-host mirrors.aliyun.com", 
+                                   stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, universal_newlines=True)
+        
+        while True:
+            output = process.stdout.readline()
+            if output == '' and process.poll() is not None:
+                break
+            if output:
+                output = output.strip()
+                if output.startswith("Requirement already satisfied"):
+                    continue
+                if output.startswith("Using cached"):
+                    continue
+                if output.startswith("Looking in indexes"):
+                    continue
+                logger.info(output)
+                
+        rc = process.poll()
+        
+        
    def install_plugin(self, repo_url: str):
        ppath = self.plugin_store_path

@@ -95,10 +116,13 @@ class PluginManager():
        plugin_path = self.updator.update(repo_url)
        with open(os.path.join(plugin_path, "REPO"), "w", encoding='utf-8') as f:
            f.write(repo_url)
+            
+        self.check_plugin_dept_update()

-        ok, err = self.plugin_reload()
-        if not ok:
-            raise Exception(err)
+        return plugin_path
+        # ok, err = self.plugin_reload()
+        # if not ok:
+        #     raise Exception(err)
        
    def download_from_repo_url(self, target_path: str, repo_url: str):
        repo_namespace = repo_url.split("/")[-2:]
@@ -123,7 +147,7 @@ class PluginManager():
                return p
    
    def uninstall_plugin(self, plugin_name: str):
-        plugin = self.get_registered_plugin(plugin_name, self.context.cached_plugins)
+        plugin = self.get_registered_plugin(plugin_name)
        if not plugin:
            raise Exception("插件不存在。")
        root_dir_name = plugin.root_dir_name
@@ -133,7 +157,7 @@ class PluginManager():
            raise Exception("移除插件成功，但是删除插件文件夹失败。您可以手动删除该文件夹，位于 addons/plugins/ 下。")

    def update_plugin(self, plugin_name: str):
-        plugin = self.get_registered_plugin(plugin_name, self.context.cached_plugins)
+        plugin = self.get_registered_plugin(plugin_name)
        if not plugin:
            raise Exception("插件不存在。")
        
@@ -155,8 +179,10 @@ class PluginManager():
                p = plugin['module']
                module_path = plugin['module_path']
                root_dir_name = plugin['pname']
+                
+                logger.info(f"正在加载插件 {root_dir_name} ...")

-                # self.check_plugin_dept_update(cached_plugins, root_dir_name)
+                self.check_plugin_dept_update(target_plugin=root_dir_name)

                module = __import__("addons.plugins." +
                                        root_dir_name + "." + p, fromlist=[p])
@@ -166,8 +192,10 @@ class PluginManager():
                try:
                    # 尝试传入 ctx
                    obj = getattr(module, cls[0])(context=self.context)
-                except:
+                except TypeError:
                    obj = getattr(module, cls[0])()
+                except BaseException as e:
+                    raise e

                metadata = None

@@ -223,10 +251,12 @@ class PluginManager():

        # remove the temp dir
        remove_dir(temp_dir)
+        
+        self.check_plugin_dept_update()

-        ok, err = self.plugin_reload()
-        if not ok:
-            raise Exception(err)
+        # ok, err = self.plugin_reload()
+        # if not ok:
+        #     raise Exception(err)

    def load_plugin_metadata(self, plugin_path: str, plugin_obj = None) -> PluginMetadata:
        metadata = None
@@ -1,5 +1,5 @@
 import os
-import sys
+import asyncio
 import json
 import time
 import tiktoken
@@ -14,8 +14,6 @@ from openai._exceptions import *

 from astrbot.persist.helper import dbConn
 from model.provider.provider import Provider
-from util import general_utils as gu
-from util.cmd_config import CmdConfig
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
 from typing import List, Dict
@@ -53,7 +51,7 @@ class ProviderOpenAIOfficial(Provider):

        os.makedirs("data/openai", exist_ok=True)

-        self.cc = CmdConfig
+        self.context = context
        self.key_data_path = "data/openai/keys.json"
        self.api_keys = []
        self.chosen_api_key = None
@@ -78,7 +76,7 @@ class ProviderOpenAIOfficial(Provider):
        )
        self.model_configs: Dict = cfg['chatGPTConfigs']
        super().set_curr_model(self.model_configs['model'])
-        self.image_generator_model_configs: Dict = self.cc.get('openai_image_generate', None)
+        self.image_generator_model_configs: Dict = context.base_config.get('openai_image_generate', None)
        self.session_memory: Dict[str, List]  = {} # 会话记忆
        self.session_memory_lock = threading.Lock()
        self.max_tokens = self.model_configs['max_tokens'] # 上下文窗口大小
@@ -359,7 +357,7 @@ class ProviderOpenAIOfficial(Provider):
                logger.warn(f"OpenAI 请求异常：{e}。")
                if "image_url is only supported by certain models." in str(e):
                    raise Exception(f"当前模型 { self.model_configs['model'] } 不支持图片输入，请更换模型。")
-                retry += 1
+                raise e
            except RateLimitError as e:
                if "You exceeded your current quota" in str(e):
                    self.keys_data[self.chosen_api_key] = False
@@ -369,7 +367,9 @@ class ProviderOpenAIOfficial(Provider):
                logger.error(f"OpenAI API Key {self.chosen_api_key} 达到请求速率限制或者官方服务器当前超载。详细原因：{e}")
                await self.switch_to_next_key()
                rate_limit_retry += 1
-                time.sleep(1)
+                await asyncio.sleep(1)
+            except NotFoundError as e:
+                raise e
            except Exception as e:
                retry += 1
                if retry >= 3:
@@ -381,11 +381,13 @@ class ProviderOpenAIOfficial(Provider):
                
                logger.warning(traceback.format_exc())
                logger.warning(f"OpenAI 请求失败：{e}。重试第 {retry} 次。")
-                time.sleep(1)
+                await asyncio.sleep(1)

        assert isinstance(completion, ChatCompletion)
        logger.debug(f"openai completion: {completion.usage}")
-
+        
+        if len(completion.choices) == 0:
+            raise Exception("OpenAI API 返回的 completion 为空。")
        choice = completion.choices[0]

        usage_tokens = completion.usage.total_tokens
@@ -450,7 +452,7 @@ class ProviderOpenAIOfficial(Provider):
                    logger.error(traceback.format_exc())
                    raise Exception(f"OpenAI 图片生成请求失败：{e}。重试次数已达到上限。")
                logger.warning(f"OpenAI 图片生成请求失败：{e}。重试第 {retry} 次。")
-                time.sleep(1)
+                await asyncio.sleep(1)

    async def forget(self, session_id=None, keep_system_prompt: bool=False) -> bool:
        if session_id is None: return False
@@ -492,7 +494,7 @@ class ProviderOpenAIOfficial(Provider):

    def set_model(self, model: str):
        self.model_configs['model'] = model
-        self.cc.put_by_dot_str("openai.chatGPTConfigs.model", model)
+        self.context.config_helper.put_by_dot_str("openai.chatGPTConfigs.model", model)
        super().set_curr_model(model)
    
    def get_configs(self):
@@ -2,7 +2,6 @@ from typing import Union, List, Callable
 from dataclasses import dataclass
 from nakuru.entities.components import Plain, Image

-
@dataclass
 class CommandItem():
    '''
@@ -19,12 +18,17 @@ class CommandResult():
    用于在Command中返回多个值
    '''

-    def __init__(self, hit: bool = True, success: bool = True, message_chain: list = [], command_name: str = "unknown_command") -> None:
+    def __init__(self, 
+                 hit: bool = True, 
+                 success: bool = True, 
+                 message_chain: list = [], 
+                 command_name: str = "unknown_command",
+                 use_t2i: bool = None) -> None:
        self.hit = hit
        self.success = success
        self.message_chain = message_chain
        self.command_name = command_name
-        self.is_use_t2i = None # default
+        self.is_use_t2i = use_t2i
        
    def message(self, message: str):
        '''
@@ -63,14 +67,12 @@ class CommandResult():
        self.message_chain = [Image.fromFileSystem(path), ]
        return self
    
-    # def use_t2i(self, use_t2i: bool):
-    #     '''
-    #     设置是否使用文本转图片服务。如果不设置，则跟随用户的设置。
-        
-    #     CommandResult().use_t2i(False)
-    #     '''
-    #     self.is_use_t2i = use_t2i
-    #     return self
+    def use_t2i(self, use_t2i: bool):
+        '''
+        设置是否使用文本转图片服务。如果不设置，则跟随用户的设置。
+        '''
+        self.is_use_t2i = use_t2i
+        return self

    def _result_tuple(self):
        return (self.success, self.message_chain, self.command_name)
@@ -1 +1,75 @@
-VERSION = '3.3.2'
+VERSION = '3.3.9'
+
+DEFAULT_CONFIG = {
+    "qqbot": {
+        "enable": False,
+        "appid": "",
+        "token": "",
+    },
+    "gocqbot": {
+        "enable": False,
+    },
+    "uniqueSessionMode": False,
+    "dump_history_interval": 10,
+    "limit": {
+        "time": 60,
+        "count": 30,
+    },
+    "notice": "",
+    "direct_message_mode": True,
+    "reply_prefix": "",
+    "baidu_aip": {
+        "enable": False,
+        "app_id": "",
+        "api_key": "",
+        "secret_key": ""
+    },
+    "openai": {
+        "key": [],
+        "api_base": "",
+        "chatGPTConfigs": {
+            "model": "gpt-4o",
+            "max_tokens": 6000,
+            "temperature": 0.9,
+            "top_p": 1,
+            "frequency_penalty": 0,
+            "presence_penalty": 0,
+        },
+        "total_tokens_limit": 10000,
+    },
+    "qq_forward_threshold": 200,
+    "qq_welcome": "",
+    "qq_pic_mode": True,
+    "gocq_host": "127.0.0.1",
+    "gocq_http_port": 5700,
+    "gocq_websocket_port": 6700,
+    "gocq_react_group": True,
+    "gocq_react_guild": True,
+    "gocq_react_friend": True,
+    "gocq_react_group_increase": True,
+    "other_admins": [],
+    "CHATGPT_BASE_URL": "",
+    "qqbot_secret": "",
+    "qqofficial_enable_group_message": False,
+    "admin_qq": "",
+    "nick_qq": ["/", "!"],
+    "admin_qqchan": "",
+    "llm_env_prompt": "",
+    "llm_wake_prefix": "",
+    "default_personality_str": "",
+    "openai_image_generate": {
+        "model": "dall-e-3",
+        "size": "1024x1024",
+        "style": "vivid",
+        "quality": "standard",
+    },
+    "http_proxy": "",
+    "https_proxy": "",
+    "dashboard_username": "",
+    "dashboard_password": "",
+    "aiocqhttp": {
+        "enable": False,
+        "ws_reverse_host": "",
+        "ws_reverse_port": 0,
+    }
+}
@@ -2,7 +2,14 @@ from typing import List, Union, Optional
 from dataclasses import dataclass
 from type.register import RegisteredPlatform
 from type.types import Context
-from type.astrbot_message import AstrBotMessage
+from type.astrbot_message import AstrBotMessage, MessageType
+
+@dataclass
+class MessageResult():
+    result_message: Union[str, list]
+    is_command_call: Optional[bool] = False
+    use_t2i: Optional[bool] = None # None 为跟随用户设置
+    callback: Optional[callable] = None

 class AstrMessageEvent():

@@ -12,7 +19,9 @@ class AstrMessageEvent():
                 platform: RegisteredPlatform,
                 role: str,
                 context: Context,
-                 session_id: str = None):
+                 session_id: str = None,
+                 unified_msg_origin: str = None,
+                 only_command: bool = False):
        '''
        AstrBot 消息事件。
        
@@ -22,6 +31,8 @@ class AstrMessageEvent():
        `role`: 角色，`admin` or `member`
        `context`: 全局对象
        `session_id`: 会话id
+        `unified_msg_origin`: 统一消息来源
+        `only_command`: 是否只处理指令，而不使用 LLM 回复
        '''
        self.context = context
        self.message_str = message_str
@@ -29,24 +40,24 @@ class AstrMessageEvent():
        self.platform = platform
        self.role = role
        self.session_id = session_id
+        self.unified_msg_origin = unified_msg_origin
+        self.only_command = only_command
        
    def from_astrbot_message(message: AstrBotMessage, 
                             context: Context,
                             platform_name: str, 
                             session_id: str,
-                             role: str = "member"):
+                             role: str = "member",
+                             unified_msg_origin: str = None,
+                             only_command: bool = False):
        
        ame = AstrMessageEvent(message.message_str, 
                               message, 
                               context.find_platform(platform_name), 
                               role, 
                               context, 
-                               session_id)
+                               session_id,
+                               unified_msg_origin,
+                               only_command=only_command)
        return ame

-@dataclass
-class MessageResult():
-    result_message: Union[str, list]
-    is_command_call: Optional[bool] = False
-    use_t2i: Optional[bool] = None # None 为跟随用户设置
-    callback: Optional[callable] = None
@@ -8,6 +8,8 @@ from util.t2i.renderer import TextToImageRenderer
 from util.updator.astrbot_updator import AstrBotUpdator
 from util.image_uploader import ImageUploader
 from util.updator.plugin_updator import PluginUpdator
+from type.command import CommandResult
+from type.astrbot_message import MessageType
 from model.plugin.command import PluginCommandBridge
 from model.provider.provider import Provider

@@ -28,37 +30,55 @@ class Context:
        
        self.unique_session = False # 独立会话
        self.version: str = None  # 机器人版本
-        self.nick = None  # gocq 的唤醒词
-        self.stat = {}
+        self.nick: tuple = None  # gocq 的唤醒词
        self.t2i_mode = False
        self.web_search = False  # 是否开启了网页搜索
-        self.reply_prefix = ""
+        
+        self.metrics_uploader = None
        self.updator: AstrBotUpdator = None
        self.plugin_updator: PluginUpdator = None
-        self.metrics_uploader = None
-        
        self.plugin_command_bridge = PluginCommandBridge(self.cached_plugins)
        self.image_renderer = TextToImageRenderer()
        self.image_uploader = ImageUploader()
        self.message_handler = None # see astrbot/message/handler.py
        self.ext_tasks: List[Task] = []
+        
+        self.command_manager = None
+        self.running = True
+
+        # useless
+        self.reply_prefix = ""

    def register_commands(self, 
                          plugin_name: str, 
                          command_name: str, 
                          description: str, 
                          priority: int, 
-                          handler: callable):
+                          handler: callable,
+                          use_regex: bool = False,
+                          ignore_prefix: bool = False):
        '''
        注册插件指令。
        
-        `plugin_name`: 插件名，注意需要和你的 metadata 中的一致。
-        `command_name`: 指令名，如 "help"。不需要带前缀。
-        `description`: 指令描述。
-        `priority`: 优先级越高，越先被处理。合理的优先级应该在 1-10 之间。
-        `handler`: 指令处理函数。函数参数：message: AstrMessageEvent, context: Context
+        @param plugin_name: 插件名，注意需要和你的 metadata 中的一致。
+        @param command_name: 指令名，如 "help"。不需要带前缀。
+        @param description: 指令描述。
+        @param priority: 优先级越高，越先被处理。合理的优先级应该在 1-10 之间。
+        @param handler: 指令处理函数。函数参数：message: AstrMessageEvent, context: Context
+        @param use_regex: 是否使用正则表达式匹配指令名。
+        @param ignore_prefix: 是否忽略前缀。默认为 False。设置为 True 后，将不会检查用户设置的前缀。
+        
+        .. Example::
+        
+        ignore_prefix = False 时，用户输入 "/help" 时，会被识别为 "help" 指令。如果 ignore_prefix = True，则用户输入 "help" 也会被识别为 "help" 指令。
        '''
-        self.plugin_command_bridge.register_command(plugin_name, command_name, description, priority, handler)
+        self.plugin_command_bridge.register_command(plugin_name, 
+                                                    command_name, 
+                                                    description, 
+                                                    priority, 
+                                                    handler, 
+                                                    use_regex,
+                                                    ignore_prefix)
        
    def register_task(self, coro: Awaitable, task_name: str):
        '''
@@ -84,3 +104,18 @@ class Context:
                return platform
            
        raise ValueError("couldn't find the platform you specified")
+
+    async def send_message(self, unified_msg_origin: str, message: CommandResult):
+        '''
+        发送消息。
+        
+        `unified_msg_origin`: 统一消息来源
+        `message`: 消息内容
+        '''
+        l = unified_msg_origin.split(":")
+        if len(l) != 3:
+            raise ValueError("Invalid unified_msg_origin")
+        platform_name, message_type, id = l
+        platform = self.find_platform(platform_name)
+        await platform.platform_instance.send_msg_new(MessageType(message_type), id, message)
+        
@@ -1,9 +1,7 @@
-
+from model.provider.provider import Provider
 import json
-import util.general_utils as gu
-
 import time
-
+import textwrap

 class FuncCallJsonFormatError(Exception):
    def __init__(self, msg):
@@ -22,14 +20,11 @@ class FuncNotFoundError(Exception):


 class FuncCall():
-    def __init__(self, provider) -> None:
+    def __init__(self, provider: Provider) -> None:
        self.func_list = []
        self.provider = provider

-    def add_func(self, name: str = None, func_args: list = None, desc: str = None, func_obj=None) -> None:
-        if name == None or func_args == None or desc == None or func_obj == None:
-            raise FuncCallJsonFormatError(
-                "name, func_args, desc must be provided.")
+    def add_func(self, name: str, func_args: list, desc: str, func_obj: callable) -> None:
        params = {
            "type": "object",  # hardcore here
            "properties": {}
@@ -47,7 +42,7 @@ class FuncCall():
        }
        self.func_list.append(self._func)

-    def func_dump(self, intent: int = 2) -> str:
+    def func_dump(self) -> str:
        _l = []
        for f in self.func_list:
            _l.append({
@@ -55,7 +50,7 @@ class FuncCall():
                "parameters": f["parameters"],
                "description": f["description"],
            })
-        return json.dumps(_l, indent=intent, ensur_ascii=False)
+        return json.dumps(_l, ensure_ascii=False)

    def get_func(self) -> list:
        _l = []
@@ -70,64 +65,36 @@ class FuncCall():
            })
        return _l

-    def func_call(self, question, func_definition, is_task=False, tasks=None, taskindex=-1, is_summary=True, session_id=None):
+    async def func_call(self, question: str, func_definition: str, session_id: str=None):

-        funccall_prompt = """
-我正实现function call功能，该功能旨在让你变成给定的问题到给定的函数的解析器（意味着你不是创造函数）。
-下面会给你提供可能用到的函数相关信息和一个问题，你需要将其转换成给定的函数调用。
- 你的返回信息只含json，请严格仿照以下内容（不含注释），必须含有`res`,`func_call`字段:
-```
-{
-    "res": string // 如果没有找到对应的函数，那么你可以在这里正常输出内容。如果有，这里是空字符串。
-    "func_call": [ // 这是一个数组，里面包含了所有的函数调用，如果没有函数调用，那么这个数组是空数组。
-        {
-            "res": string // 如果没有找到对应的函数，那么你可以在这里正常输出内容。如果有，这里是空字符串。
-            "name": str, // 函数的名字
-            "args_type": {
-                "arg1": str, // 函数的参数的类型
-                "arg2": str,
-                ...
-            },
-            "args": {
-                "arg1": any, // 函数的参数
-                "arg2": any,
-                ...
-            }
-        },
-        ... // 可能在这个问题中会有多个函数调用
-    ],
-}
-```
- 如果用户的要求较复杂，允许返回多个函数调用，但需保证这些函数调用的顺序正确。
- 当问题没有提到给定的函数时，相当于提问方不打算使用function call功能，这时你可以在res中正常输出这个问题的回答（以AI的身份正常回答该问题，并将答案输出在res字段中，回答不要涉及到任何函数调用的内容，就只是正常讨论这个问题。）
+        prompt = textwrap.dedent(f"""
+            ROLE:
+            你是一个 Function calling AI Agent, 你的任务是将用户的提问转化为函数调用。

-提供的函数是：
+            TOOLS:
+            可用的函数列表:

-"""
+            {func_definition}

-        prompt = f"{funccall_prompt}\n```\n{func_definition}\n```\n"
-        prompt += f"""
-用户的提问是：
-```
-{question}
-```
-"""
+            LIMIT:
+            1. 你返回的内容应当能够被 Python 的 json 模块解析的 Json 格式字符串。
+            2. 你的 Json 返回的格式如下：`[{{"name": "<func_name>", "args": <arg_dict>}}, ...]`。参数根据上面提供的函数列表中的参数来填写。
+            3. 允许必要时返回多个函数调用，但需保证这些函数调用的顺序正确。
+            4. 如果用户的提问中不需要用到给定的函数，请直接返回 `{{"res": False}}`。

-        # if is_task:
-        #     # task_prompt = f"\n任务列表为{str(tasks)}\n你目前进行到了任务{str(taskindex)}, **你不需要重新进行已经进行过的任务, 不要生成已经进行过的**"
-        #     prompt += task_prompt
+            EXAMPLE:
+            1. `用户提问`：请问一下天气怎么样？ `函数调用`：[{{"name": "get_weather", "args": {{"city": "北京"}}}}]

-        # provider.forget()
+            用户的提问是：{question}
+        """)

        _c = 0
        while _c < 3:
            try:
-                res = self.provider.text_chat(prompt=prompt, session_id=session_id)
+                res = await self.provider.text_chat(prompt, session_id)
+                print(res)
                if res.find('```') != -1:
                    res = res[res.find('```json') + 7: res.rfind('```')]
-                gu.log("REVGPT func_call json result",
-                       bg=gu.BG_COLORS["green"], fg=gu.FG_COLORS["white"])
-                print(res)
                res = json.loads(res)
                break
            except Exception as e:
@@ -136,112 +103,25 @@ class FuncCall():
                    raise e
                if "The message you submitted was too long" in str(e):
                    raise e
+        
+        if 'res' in res and not res['res']:
+            return "", False

-        invoke_func_res = ""
-
-        if "func_call" in res and len(res["func_call"]) > 0:
-            task_list = res["func_call"]
-
-            invoke_func_res_list = []
-
-            for res in task_list:
-                # 说明有函数调用
-                func_name = res["name"]
-                # args_type = res["args_type"]
-                args = res["args"]
-                # 调用函数
-                # func = eval(func_name)
-                func_target = None
-                for func in self.func_list:
-                    if func["name"] == func_name:
-                        func_target = func["func_obj"]
-                        break
-                if func_target == None:
-                    raise FuncNotFoundError(
-                        f"Request function {func_name} not found.")
-                t_res = str(func_target(**args))
-                invoke_func_res += f"{func_name} 调用结果：\n```\n{t_res}\n```\n"
-                invoke_func_res_list.append(invoke_func_res)
-                gu.log(f"[FUNC| {func_name} invoked]",
-                       bg=gu.BG_COLORS["green"], fg=gu.FG_COLORS["white"])
-                # print(str(t_res))
-
-            if is_summary:
-
-                # 生成返回结果
-                after_prompt = """
-有以下内容："""+invoke_func_res+"""
-请以AI助手的身份结合返回的内容对用户提问做详细全面的回答。
-用户的提问是：
-```""" + question + """```
- 在res字段中，不要输出函数的返回值，也不要针对返回值的字段进行分析，也不要输出用户的提问，而是理解这一段返回的结果，并以AI助手的身份回答问题，只需要输出回答的内容，不需要在回答的前面加上身份词。
- 你的返回信息必须只能是json，且需严格遵循以下内容（不含注释）:
-```json
-{
-    "res": string, // 回答的内容
-    "func_call_again": bool // 如果函数返回的结果有错误或者问题，可将其设置为true，否则为false
-}
-```
- 如果func_call_again为true，res请你设为空值，否则请你填写回答的内容。"""
-
-                _c = 0
-                while _c < 5:
-                    try:
-                        res = self.provider.text_chat(prompt=after_prompt, session_id=session_id)
-                        # 截取```之间的内容
-                        gu.log(
-                            "DEBUG BEGIN", bg=gu.BG_COLORS["yellow"], fg=gu.FG_COLORS["white"])
-                        print(res)
-                        gu.log(
-                            "DEBUG END", bg=gu.BG_COLORS["yellow"], fg=gu.FG_COLORS["white"])
-                        if res.find('```') != -1:
-                            res = res[res.find('```json') +
-                                      7: res.rfind('```')]
-                        gu.log("REVGPT after_func_call json result",
-                               bg=gu.BG_COLORS["green"], fg=gu.FG_COLORS["white"])
-                        after_prompt_res = res
-                        after_prompt_res = json.loads(after_prompt_res)
-                        break
-                    except Exception as e:
-                        _c += 1
-                        if _c == 5:
-                            raise e
-                        if "The message you submitted was too long" in str(e):
-                            # 如果返回的内容太长了，那么就截取一部分
-                            time.sleep(3)
-                            invoke_func_res = invoke_func_res[:int(
-                                len(invoke_func_res) / 2)]
-                            after_prompt = """
-函数返回以下内容："""+invoke_func_res+"""
-请以AI助手的身份结合返回的内容对用户提问做详细全面的回答。
-用户的提问是：
-```""" + question + """```
- 在res字段中，不要输出函数的返回值，也不要针对返回值的字段进行分析，也不要输出用户的提问，而是理解这一段返回的结果，并以AI助手的身份回答问题，只需要输出回答的内容，不需要在回答的前面加上身份词。
- 你的返回信息必须只能是json，且需严格遵循以下内容（不含注释）:
-```json
-{
-    "res": string, // 回答的内容
-    "func_call_again": bool // 如果函数返回的结果有错误或者问题，可将其设置为true，否则为false
-}
-```
- 如果func_call_again为true，res请你设为空值，否则请你填写回答的内容。"""
-                        else:
-                            raise e
-
-                if "func_call_again" in after_prompt_res and after_prompt_res["func_call_again"]:
-                    # 如果需要重新调用函数
-                    # 重新调用函数
-                    gu.log("REVGPT func_call_again",
-                           bg=gu.BG_COLORS["purple"], fg=gu.FG_COLORS["white"])
-                    res = self.func_call(question, func_definition)
-                    return res, True
-
-                gu.log("REVGPT func callback:",
-                       bg=gu.BG_COLORS["green"], fg=gu.FG_COLORS["white"])
-                # print(after_prompt_res["res"])
-                return after_prompt_res["res"], True
-            else:
-                return str(invoke_func_res_list), True
-        else:
-            # print(res["res"])
-            return res["res"], False
+        tool_call_result = []
+        for tool in res:
+            # 说明有函数调用
+            func_name = tool["name"]
+            args = tool["args"]
+            # 调用函数
+            tool_callable = None
+            for func in self.func_list:
+                if func["name"] == func_name:
+                    tool_callable = func["func_obj"]
+                    break
+            if not tool_callable:
+                raise FuncNotFoundError(
+                    f"Request function {func_name} not found.")
+            ret = await tool_callable(**args)
+            if ret:
+                tool_call_result.append(str(ret))
+        return tool_call_result, True
@@ -1,13 +1,13 @@
 import traceback
 import random
 import json
-import asyncio
 import aiohttp
 import os

 from readability import Document
 from bs4 import BeautifulSoup
 from openai.types.chat.chat_completion_message_tool_call import Function
+from openai._exceptions import *
 from util.agent.func_call import FuncCall
 from util.websearch.config import HEADERS, USER_AGENTS
 from util.websearch.bing import Bing
@@ -100,9 +100,9 @@ async def fetch_website_content(url):
            return ret


-async def web_search(prompt, provider: Provider, session_id, official_fc=False):
+async def web_search(prompt: str, provider: Provider, session_id: str, official_fc: bool=False):
    '''
-    official_fc: 使用官方 function-calling
+    @param official_fc: 使用官方 function-calling
    '''
    new_func_call = FuncCall(provider)

@@ -127,9 +127,14 @@ async def web_search(prompt, provider: Provider, session_id, official_fc=False):
    function_invoked_ret = ""
    if official_fc:
        # we use official function-calling
-        result = await provider.text_chat(prompt=prompt, session_id=session_id, tools=new_func_call.get_func())
+        try:
+            result = await provider.text_chat(prompt=prompt, session_id=session_id, tools=new_func_call.get_func())
+        except BadRequestError as e:
+            # seems dont support function-calling
+            logger.error(f"error: {e}. Try to use local function-calling implementation")
+            return await web_search(prompt, provider, session_id, official_fc=False)
        if isinstance(result, Function):
-            logger.debug(f"web_searcher - function-calling: {result}")
+            logger.debug(f"function-calling: {result}")
            func_obj = None
            for i in new_func_call.func_list:
                if i["name"] == result.name:
@@ -152,30 +157,31 @@ async def web_search(prompt, provider: Provider, session_id, official_fc=False):
            args = {
                'question': prompt,
                'func_definition': new_func_call.func_dump(),
-                'is_task': False,
-                'is_summary': False,
            }
-            function_invoked_ret, has_func = await asyncio.to_thread(new_func_call.func_call, **args)
+            function_invoked_ret, has_func = await new_func_call.func_call(**args)
+            
+            if not has_func:
+                return await provider.text_chat(prompt, session_id)
+            
        except BaseException as e:
-            res = await provider.text_chat(prompt) + "\n(网页搜索失败, 此为默认回复)"
-            return res
-        has_func = True
+            logger.error(traceback.format_exc())
+            return await provider.text_chat(prompt, session_id) + "(网页搜索失败, 此为默认回复)"

    if has_func:
-        await provider.forget(session_id=session_id, )
+        await provider.forget(session_id=session_id)
        summary_prompt = f"""
 你是一个专业且高效的助手，你的任务是
 1. 根据下面的相关材料对用户的问题 `{prompt}` 进行总结;
-2. 简单地发表你对这个问题的简略看法。
+2. 简单地发表你对这个问题的看法。

 # 例子
 1. 从网上的信息来看，可以知道...我个人认为...你觉得呢？
 2. 根据网上的最新信息，可以得知...我觉得...你怎么看？

 # 限制
-1. 限制在 200 字以内；
+1. 限制在 200-300 字；
 2. 请**直接输出总结**，不要输出多余的内容和提示语。
-        
+
 # 相关材料
 {function_invoked_ret}"""
        ret = await provider.text_chat(prompt=summary_prompt, session_id=session_id)
@@ -1,19 +1,31 @@
 import os
 import json
-from typing import Union
+from type.config import DEFAULT_CONFIG

 cpath = "data/cmd_config.json"

 def check_exist():
    if not os.path.exists(cpath):
        with open(cpath, "w", encoding="utf-8-sig") as f:
-            json.dump({}, f, indent=4, ensure_ascii=False)
+            json.dump({}, f, ensure_ascii=False)
            f.flush()

 class CmdConfig():
+    def __init__(self) -> None:
+        self.cached_config: dict = {}
+        self.init_configs()
+    
+    def init_configs(self):
+        '''
+        初始化必需的配置项
+        '''
+        self.init_config_items(DEFAULT_CONFIG)

    @staticmethod
    def get(key, default=None):
+        '''
+        从文件系统中直接获取配置
+        '''
        check_exist()
        with open(cpath, "r", encoding="utf-8-sig") as f:
            d = json.load(f)
@@ -22,28 +34,33 @@ class CmdConfig():
            else:
                return default

-    @staticmethod
-    def get_all():
+    def get_all(self):
+        '''
+        从文件系统中获取所有配置
+        '''
        check_exist()
        with open(cpath, "r", encoding="utf-8-sig") as f:
-            return json.load(f)
+            conf_str = f.read() 
+        if conf_str.startswith(u'/ufeff'): # remove BOM
+            conf_str = conf_str.encode('utf8')[3:].decode('utf8')
+        conf = json.loads(conf_str)
+        return conf

-    @staticmethod
-    def put(key, value):
-        check_exist()
+    def put(self, key, value):
        with open(cpath, "r", encoding="utf-8-sig") as f:
            d = json.load(f)
            d[key] = value
            with open(cpath, "w", encoding="utf-8-sig") as f:
-                json.dump(d, f, indent=4, ensure_ascii=False)
+                json.dump(d, f, indent=2, ensure_ascii=False)
                f.flush()

+        self.cached_config[key] = value
+
    @staticmethod
    def put_by_dot_str(key: str, value):
        '''
        根据点分割的字符串，将值写入配置文件
        '''
-        check_exist()
        with open(cpath, "r", encoding="utf-8-sig") as f:
            d = json.load(f)
            _d = d
@@ -54,30 +71,22 @@ class CmdConfig():
                else:
                    _d = _d[_ks[i]]
            with open(cpath, "w", encoding="utf-8-sig") as f:
-                json.dump(d, f, indent=4, ensure_ascii=False)
+                json.dump(d, f, indent=2, ensure_ascii=False)
                f.flush()

-    @staticmethod
-    def init_attributes(key: Union[str, list], init_val=""):
-        check_exist()
-        conf_str = ''
-        with open(cpath, "r", encoding="utf-8-sig") as f:
-            conf_str = f.read()
-        if conf_str.startswith(u'/ufeff'):
-            conf_str = conf_str.encode('utf8')[3:].decode('utf8')
-        d = json.loads(conf_str)
+    def init_config_items(self, d: dict):
+        conf = self.get_all()
+        
+        if not self.cached_config:
+            self.cached_config = conf
+
        _tag = False

-        if isinstance(key, str):
-            if key not in d:
-                d[key] = init_val
+        for key, val in d.items():
+            if key not in conf:
+                conf[key] = val
                _tag = True
-        elif isinstance(key, list):
-            for k in key:
-                if k not in d:
-                    d[k] = init_val
-                    _tag = True
        if _tag:
            with open(cpath, "w", encoding="utf-8-sig") as f:
-                json.dump(d, f, indent=4, ensure_ascii=False)
+                json.dump(conf, f, indent=2, ensure_ascii=False)
                f.flush()
@@ -1,89 +1,5 @@
 import json, os
 from util.cmd_config import CmdConfig
-from type.config import VERSION
-from type.types import Context
-
-def init_configs():
-    '''
-    初始化必需的配置项
-    '''
-    cc = CmdConfig()
-    
-    cc.init_attributes("qqbot", {
-        "enable": False,
-        "appid": "",
-        "token": "",
-    })
-    cc.init_attributes("gocqbot", {
-        "enable": False,
-    })
-    cc.init_attributes("uniqueSessionMode", False)
-    cc.init_attributes("dump_history_interval", 10)
-    cc.init_attributes("limit", {
-        "time": 60,
-        "count": 30,
-    })
-    cc.init_attributes("notice", "")
-    cc.init_attributes("direct_message_mode", True)
-    cc.init_attributes("reply_prefix", "")
-    cc.init_attributes("baidu_aip", {
-        "enable": False,
-        "app_id": "",
-        "api_key": "",
-        "secret_key": ""
-    })
-    cc.init_attributes("openai", {
-        "key": [],
-        "api_base": "",
-        "chatGPTConfigs": {
-            "model": "gpt-4o",
-            "max_tokens": 6000,
-            "temperature": 0.9,
-            "top_p": 1,
-            "frequency_penalty": 0,
-            "presence_penalty": 0,
-        },
-        "total_tokens_limit": 10000,
-    })
-    
-    
-    cc.init_attributes("qq_forward_threshold", 200)
-    cc.init_attributes("qq_welcome", "")
-    cc.init_attributes("qq_pic_mode", True)
-    cc.init_attributes("gocq_host", "127.0.0.1")
-    cc.init_attributes("gocq_http_port", 5700)
-    cc.init_attributes("gocq_websocket_port", 6700)
-    cc.init_attributes("gocq_react_group", True)
-    cc.init_attributes("gocq_react_guild", True)
-    cc.init_attributes("gocq_react_friend", True)
-    cc.init_attributes("gocq_react_group_increase", True)
-    cc.init_attributes("other_admins", [])
-    cc.init_attributes("CHATGPT_BASE_URL", "")
-    cc.init_attributes("qqbot_secret", "")
-    cc.init_attributes("qqofficial_enable_group_message", False)
-    cc.init_attributes("admin_qq", "")
-    cc.init_attributes("nick_qq", ["!", "！", "ai"])
-    cc.init_attributes("admin_qqchan", "")
-    cc.init_attributes("llm_env_prompt", "")
-    cc.init_attributes("llm_wake_prefix", "")
-    cc.init_attributes("default_personality_str", "")
-    cc.init_attributes("openai_image_generate", {
-        "model": "dall-e-3",
-        "size": "1024x1024",
-        "style": "vivid",
-        "quality": "standard",
-    })
-    cc.init_attributes("http_proxy", "")
-    cc.init_attributes("https_proxy", "")
-    cc.init_attributes("dashboard_username", "")
-    cc.init_attributes("dashboard_password", "")
-    
-    # aiocqhttp 适配器
-    cc.init_attributes("aiocqhttp", {
-        "enable": False,
-        "ws_reverse_host": "",
-        "ws_reverse_port": 0,
-    })

 def try_migrate_config():
    '''
@@ -97,51 +13,4 @@ def try_migrate_config():
        try:
            os.remove("cmd_config.json")
        except Exception as e:
-            pass
-        
-def inject_to_context(context: Context):
-    '''
-    将配置注入到 Context 中。
-    this method returns all the configs
-    '''
-    cc = CmdConfig()
-    
-    context.version = VERSION
-    context.base_config = cc.get_all()
-    
-    cfg = context.base_config
-    
-    if 'reply_prefix' in cfg:
-        # 适配旧版配置
-        if isinstance(cfg['reply_prefix'], dict):
-            context.reply_prefix = ""
-            cfg['reply_prefix'] = ""
-            cc.put("reply_prefix", "")
-        else:
-            context.reply_prefix = cfg['reply_prefix']
-
-    default_personality_str = cc.get("default_personality_str", "")
-    if default_personality_str == "":
-        context.default_personality = None
-    else:
-        context.default_personality = {
-            "name": "default",
-            "prompt": default_personality_str,
-        }
-
-    if 'uniqueSessionMode' in cfg and cfg['uniqueSessionMode']:
-        context.unique_session = True
-    else:
-        context.unique_session = False
-        
-    nick_qq = cc.get("nick_qq", None)
-    if nick_qq == None:
-        nick_qq = ("/", )
-    if isinstance(nick_qq, str):
-        nick_qq = (nick_qq, )
-    if isinstance(nick_qq, list):
-        nick_qq = tuple(nick_qq)
-    context.nick = nick_qq
-    context.t2i_mode = cc.get("qq_pic_mode", True)
-    
-    return cfg
+            pass
@@ -1,30 +0,0 @@
-import time
-import asyncio
-import requests
-import json
-import sys
-import psutil
-
-from type.types import Context
-from SparkleLogging.utils.core import LogManager
-from logging import Logger
-
-logger: Logger = LogManager.GetLogger(log_name='astrbot')
-
-def run_monitor(global_object: Context):
-    '''
-    监测机器性能
-    - Bot 内存使用量
-    - CPU 占用率
-    '''
-    start_time = time.time()
-    while True:
-        stat = global_object.dashboard_data.stats
-        # 程序占用的内存大小
-        mem = psutil.Process().memory_info().rss / 1024 / 1024  # MB
-        stat['sys_perf'] = {
-            'memory': mem,
-            'cpu': psutil.cpu_percent()
-        }
-        stat['sys_start_time'] = start_time
-        time.sleep(30)
@@ -36,7 +36,14 @@ class MetricUploader():
                
            for plugin in context.cached_plugins:
                self.plugin_stats[plugin.metadata.plugin_name] = {
-                    "metadata": plugin.metadata
+                    "metadata": {
+                        "plugin_name": plugin.metadata.plugin_name,
+                        "plugin_type": plugin.metadata.plugin_type.value,
+                        "author": plugin.metadata.author,
+                        "desc": plugin.metadata.desc,
+                        "version": plugin.metadata.version,
+                        "repo": plugin.metadata.repo,
+                    }
                }
            
            try:
@@ -58,6 +65,9 @@ class MetricUploader():
            except BaseException as e:
                pass
            await asyncio.sleep(30*60)
+    
+    def increment_platform_stat(self, platform_name: str):
+        self.platform_stats[platform_name] = self.platform_stats.get(platform_name, 0) + 1

    def clear(self):
        self.platform_stats.clear()
@@ -8,4 +8,5 @@ Platform类是消息平台的抽象类，定义了消息平台的基本接口。
 from model.platform import Platform

 from model.platform.qq_nakuru import QQGOCQ
-from model.platform.qq_official import QQOfficial
+from model.platform.qq_official import QQOfficial
+from model.platform.qq_aiocqhttp import AIOCQHTTP
@@ -9,7 +9,7 @@ logger: Logger = LogManager.GetLogger(log_name='astrbot')

 class AstrBotUpdator(RepoZipUpdator):
    def __init__(self):
-        self.MAIN_PATH = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
+        self.MAIN_PATH = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../"))
        self.ASTRBOT_RELEASE_API = "https://api.github.com/repos/Soulter/AstrBot/releases"

    def terminate_child_processes(self):
@@ -30,11 +30,18 @@ class AstrBotUpdator(RepoZipUpdator):
        except psutil.NoSuchProcess:
            pass
    
-    def _reboot(self, delay: int = None):
-        if delay: time.sleep(delay)
+    def _reboot(self, delay: int = None, context = None):
+        # if delay: time.sleep(delay)
        py = sys.executable
+        context.running = False
+        time.sleep(3)
        self.terminate_child_processes()
-        os.execl(py, py, *sys.argv)
+        py = py.replace(" ", "\\ ")
+        try:
+            os.execl(py, py, *sys.argv)
+        except Exception as e:
+            logger.error(f"重启失败（{py}, {e}），请尝试手动重启。")
+            raise e
        
    def check_update(self, url: str, current_version: str) -> ReleaseInfo:
        return super().check_update(self.ASTRBOT_RELEASE_API, VERSION)
Author	SHA1	Message	Date
Soulter	33ec92258d	Update config.py	2024-08-13 15:05:16 +08:00
Soulter	a578edf137	fix: metrics perf: aiocqhttp image url	2024-08-12 02:50:31 -04:00
Soulter	f8949ebead	perf: reboot after installing plugin	2024-08-11 23:24:37 -04:00
Soulter	141c91301f	perf: Improve sleep time handling in QQOfficial and ProviderOpenAIOfficial	2024-08-11 23:24:37 -04:00
Soulter	8d95e67b5a	Update README.md	2024-08-11 17:13:49 +08:00
Soulter	0633e7f25f	perf: improve the effects of local function-calling	2024-08-11 03:55:31 -04:00
Soulter	266da0a9d8	fix: 修复重启时 aiocqhttp 没有正常退出导致端口占用的问题	2024-08-11 02:30:49 -04:00
Soulter	121c40f273	perf: raise error when badrequest	2024-08-11 01:49:33 -04:00
Soulter	a876efb95f	fix: 更新后覆盖文件路径错误	2024-08-10 04:35:07 -04:00
Soulter	95a8cc9498	fix: 修复部分字段未更新导致的错误	2024-08-10 04:13:24 -04:00
Soulter	f02731055e	fix: 修复插件启用忽略前缀之后可能的逻辑冲突	2024-08-10 03:25:50 -04:00
Soulter	1df83addfc	update: add gcc	2024-08-10 14:59:00 +08:00
Soulter	9db43ac5e6	feat: 注册指令支持忽略指令前缀；快捷主动回复	2024-08-10 02:35:54 -04:00
Soulter	0f470cf96f	Update README.md	2024-08-09 12:26:00 +08:00
Soulter	da3fcb7b86	Merge pull request #186 from itgpt-com/master 优化 docker build	2024-08-08 22:15:48 +08:00
Soulter	73dd4703b9	Update .dockerignore	2024-08-08 22:15:05 +08:00
itgpt	0c679a0151	添加 .dockerignore 过滤 docker cp 不必要文件。缩小镜像	2024-08-08 16:21:30 +08:00
itgpt	1d6ea2dbe6	添加端口输出	2024-08-08 16:16:55 +08:00
itgpt	933df57654	优化 docker build	2024-08-08 15:53:44 +08:00
Soulter	cbe761fc33	Update README.md	2024-08-07 00:49:00 +08:00
Soulter	14dbdb2d83	feat: 插件支持正则匹配	2024-08-05 12:12:00 -04:00
Soulter	abda226d63	Merge pull request #183 from irorange27/master fix: fix logo syntax warning	2024-08-05 23:37:57 +08:00
niina	a2dc6f0a49	fix: fix logo syntax warning	2024-08-05 22:53:45 +08:00
Soulter	7a94c26333	fix: 修复 wake 唤醒词无法触发 command 的问题	2024-08-05 05:02:57 -04:00
Soulter	9b1ffb384b	perf: 优化aiocqhttp适配器的异常处理	2024-08-05 04:46:12 -04:00
Soulter	9566bfe122	workaround for issue #181	2024-08-03 17:03:38 +08:00
Soulter	89ff103bda	chore: Add mimetypes workaround for issue #188	2024-08-03 17:02:45 +08:00
Soulter	6c788db53a	Merge remote-tracking branch 'refs/remotes/origin/master'	2024-08-03 16:17:25 +08:00
Soulter	344b5fa419	fix: f-string eror	2024-08-03 16:17:04 +08:00
Soulter	c6d161b837	Update README.md	2024-08-03 15:04:20 +08:00
Soulter	2065ba0c60	Update README.md	2024-08-03 01:05:27 +08:00
Soulter	a481fd1a3e	fix: Strip leading and trailing whitespace from llm_wake_prefix	2024-08-02 23:17:35 +08:00
Soulter	c50bcdbdb9	fix: Register command only if plugin is found	2024-08-02 22:48:04 +08:00
Soulter	36a2a7632c	fix: 优化初始化、消息处理时的配置读取过程，减少性能损耗	2024-07-31 23:38:31 +08:00
Soulter	e77b7014e6	fix: 修复更新、卸载插件时的报错	2024-07-30 09:15:45 +08:00
Soulter	d57fd0f827	fix: metadata is not seralizable	2024-07-29 09:47:42 +08:00
Soulter	6a83d2a62a	update version	2024-07-28 12:11:07 +08:00
Soulter	2d29726c18	fix: 修复带空格路径导致的重启失败	2024-07-28 11:55:57 +08:00
Soulter	b241b0f954	update version	2024-07-27 12:31:15 -04:00
Soulter	171dd1dc02	feat: qq 官方机器人接口支持C2C	2024-07-27 12:30:09 -04:00
Soulter	af62d969d7	perf: 更改 send_msg 接口	2024-07-27 11:26:02 -04:00
Soulter	c4fd9a66c6	update version to 3.3.3	2024-07-27 11:08:51 -04:00
Soulter	d191997a39	feat: aiocqhttp 适配器适配主动发送消息接口	2024-07-27 11:07:26 -04:00