Update README.md

README.md

@@ -133,7 +133,7 @@
 
 - `LLMS`: https://github.com/Soulter/llms | Claude, HuggingChat 大语言模型接入。
  
-- `GoodPlugins`: https://github.com/Soulter/goodplugins | 随机动漫图片、搜番、喜报生成器等等
+- `GoodPlugins`: https://github.com/Soulter/goodplugins | 随机动漫图片、搜番、喜报生成器等。
 
 - `sysstat`: https://github.com/Soulter/sysstatqcbot | 查看系统状态
 
@@ -141,6 +141,8 @@
   
 - `liferestart`: https://github.com/Soulter/liferestart | 人生重开模拟器
 
+- `astrbot_plugin_aiocqhttp`: https://github.com/Soulter/astrbot_plugin_aiocqhttp | aiocqhttp 适配器，支持接入支持反向 WS 的 OneBot 协议实现，如 Lagrange.OneBot，Shamrock 等。
+
 
 <img width="900" alt="image" src="https://github.com/Soulter/AstrBot/assets/37870767/824d1ff3-7b85-481c-b795-8e62dedb9fd7">
 

addons/dashboard/server.py

@@ -16,7 +16,7 @@ from persist.session import dbConn
 from type.register import RegisteredPlugin
 from typing import List
 from util.cmd_config import CmdConfig
-from util.updator import check_update, update_project, request_release_info
+from util.updator import check_update, update_project, request_release_info, _reboot
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
 logger: Logger = LogManager.GetLogger(log_name='astrbot-core')
@@ -344,8 +344,7 @@ class AstrBotDashBoard():
 
     def shutdown_bot(self, delay_s: int):
         time.sleep(delay_s)
-        py = sys.executable
-        os.execl(py, py, *sys.argv)
+        _reboot()
 
     def _get_configs(self, namespace: str):
         if namespace == "":

astrbot/core.py

@@ -83,6 +83,7 @@ def init():
     _global_object = GlobalObject()
     _global_object.version = VERSION
     _global_object.base_config = cfg
+    _global_object.logger = logger
     logger.info("AstrBot v" + VERSION)
 
     if 'reply_prefix' in cfg:
@@ -171,7 +172,7 @@ def init():
     logger.info("正在载入插件...")
     # 加载插件
     _command = Command(None, _global_object)
-    ok, err = putil.plugin_reload(_global_object.cached_plugins)
+    ok, err = putil.plugin_reload(_global_object)
     if ok:
         logger.info(
             f"成功载入 {len(_global_object.cached_plugins)} 个插件")
@@ -441,12 +442,6 @@ async def oper_msg(message: AstrBotMessage,
             return
         command = command_result[2]
 
-        if command == "update latest r":
-            def update_restart():
-                py = sys.executable
-                os.execl(py, py, *sys.argv)
-            return MessageResult(command_result[1] + "\n\n即将自动重启。", callback=update_restart)
-
         if not command_result[0]:
             return MessageResult(f"指令调用错误: \n{str(command_result[1])}")
 

main.py

@@ -8,10 +8,8 @@ from logging import Formatter, Logger
 from util.cmd_config import CmdConfig, try_migrate_config
 
 warnings.filterwarnings("ignore")
-abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
 
 logger: Logger = None
-
 logo_tmpl = """
      ___           _______.___________..______      .______     ______   .___________.
     /   \         /       |           ||   _  \     |   _  \   /  __  \  |           |
@@ -35,9 +33,11 @@ def update_dept():
     '''
     # 获取 Python 可执行文件路径
     py = sys.executable
+    requirements_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "requirements.txt")
+    print(requirements_path)
     # 更新依赖库
     mirror = "https://mirrors.aliyun.com/pypi/simple/"
-    os.system(f"{py} -m pip install -r requirements.txt -i {mirror}")
+    os.system(f"{py} -m pip install -r {requirements_path} -i {mirror}")
     
 def main():
     try:

model/command/openai_official.py

@@ -94,14 +94,17 @@ class CommandOpenAIOfficial(Command):
         if len(l) == 1:
             return True, "请输入 /model 模型名/编号", "model"
         model = str(l[1])
-        models = await self.get_models()
-        models = list(models)
-        if model.isdigit() and int(model) <= len(models) and int(model) >= 1:
-            model = models[int(model)-1]
+        if model.isdigit():
+            models = await self.get_models()
+            models = list(models)
+            if int(model) <= len(models) and int(model) >= 1:
+                model = models[int(model)-1]
+            self.provider.set_model(model.id)
+            return True, f"模型已设置为 {model.id}", "model"
+        else:
+            self.provider.set_model(model)
+            return True, f"模型已设置为 {model} (自定义)", "model"
 
-        self.provider.set_model(model.id)
-        return True, f"模型已设置为 {model.id}", "model"
-    
         
     async def help(self):
         commands = super().general_commands()

type/config.py

@@ -1 +1 @@
-VERSION = '3.1.13'
+VERSION = '3.2.3'

type/plugin.py

@@ -2,7 +2,7 @@ from enum import Enum
 from dataclasses import dataclass
 
 class PluginType(Enum):
-    PLATFORM = 'platfrom'  # 平台类插件。
+    PLATFORM = 'platform'  # 平台类插件。
     LLM = 'llm'  # 大语言模型类插件
     COMMON = 'common'  # 其他插件
 

type/types.py

@@ -1,5 +1,7 @@
+
 from type.register import *
 from typing import List
+from logging import Logger
 
 class GlobalObject:
     '''
@@ -17,6 +19,8 @@ class GlobalObject:
     unique_session: bool  # 是否开启了独立会话
     default_personality: dict
     dashboard_data = None
+    
+    logger: Logger = None
 
     def __init__(self):
         self.nick = None  # gocq 的昵称

util/plugin_dev/api/v1/message.py

@@ -1,5 +1,5 @@
 from astrbot.core import oper_msg
-from type.message import AstrMessageEvent, AstrBotMessage
+from type.message import *
 from type.command import CommandResult
 from model.platform._message_result import MessageResult
 

util/plugin_util.py

@@ -16,6 +16,7 @@ from type.plugin import *
 from type.register import *
 from SparkleLogging.utils.core import LogManager
 from logging import Logger
+from type.types import GlobalObject
 
 logger: Logger = LogManager.GetLogger(log_name='astrbot-core')
 
@@ -91,7 +92,19 @@ def check_plugin_dept_update(cached_plugins: RegisteredPlugins, target_plugin: s
             update_plugin_dept(os.path.join(plugin_path, "requirements.txt"))
 
 
-def plugin_reload(cached_plugins: RegisteredPlugins):
+def has_init_param(cls, param_name):
+    try:
+        # 获取 __init__ 方法的签名
+        init_signature = inspect.signature(cls.__init__)
+        
+        # 检查参数名是否在签名中
+        return param_name in init_signature.parameters
+    except (AttributeError, ValueError):
+        # 如果类没有 __init__ 方法或者无法获取签名
+        return False
+
+def plugin_reload(ctx: GlobalObject):
+    cached_plugins = ctx.cached_plugins
     plugins = get_plugin_modules()
     if plugins is None:
         return False, "未找到任何插件模块"
@@ -113,7 +126,12 @@ def plugin_reload(cached_plugins: RegisteredPlugins):
                                     root_dir_name + "." + p, fromlist=[p])
 
             cls = get_classes(p, module)
-            obj = getattr(module, cls[0])()
+            
+            try:
+                # 尝试传入 ctx
+                obj = getattr(module, cls[0])(ctx=ctx)
+            except:
+                obj = getattr(module, cls[0])()
 
             metadata = None
             try:
@@ -125,8 +143,7 @@ def plugin_reload(cached_plugins: RegisteredPlugins):
                     else:
                         metadata = PluginMetadata(
                             plugin_name=info['name'],
-                            plugin_type=PluginType.COMMON if 'plugin_type' not in info else PluginType(
-                                info['plugin_type']),
+                            plugin_type=PluginType.COMMON if 'plugin_type' not in info else PluginType(info['plugin_type']),
                             author=info['author'],
                             desc=info['desc'],
                             version=info['version'],

util/updator.py

@@ -6,10 +6,35 @@ except BaseException as e:
     has_git = False
 import sys, os
 import requests
+import psutil
 from type.config import VERSION
+from SparkleLogging.utils.core import LogManager
+from logging import Logger
+
+logger: Logger = LogManager.GetLogger(log_name='astrbot-core')
+
+
+def terminate_child_processes():
+    try:
+        parent = psutil.Process(os.getpid())
+        children = parent.children(recursive=True)
+        logger.info(f"正在终止 {len(children)} 个子进程。")
+        for child in children:
+            logger.info(f"正在终止子进程 {child.pid}")
+            child.terminate()
+            try:
+                child.wait(timeout=3)
+            except psutil.NoSuchProcess:
+                continue
+            except psutil.TimeoutExpired:
+                logger.info(f"子进程 {child.pid} 没有被正常终止, 正在强行杀死。")
+                child.kill()
+    except psutil.NoSuchProcess:
+        pass
 
 def _reboot():
     py = sys.executable
+    terminate_child_processes()
     os.execl(py, py, *sys.argv)
     
 def find_repo() -> Repo: