v3.4.19

feat: 优化插件市场的访问

README.md

@@ -70,7 +70,7 @@ AstrBot 是一个松耦合、异步、支持多消息平台部署、具有易用
 | QQ(OneBot)      | ✔    | 私聊、群聊 | 文字、图片、语音 |
 | 微信(个人号)    | ✔    | 微信个人号私聊、群聊 | 文字、图片、语音 |
 | [Telegram](https://github.com/Soulter/astrbot_plugin_telegram)   | ✔    | 私聊、群聊 | 文字、图片 |
-| 微信(企业微信)    | 🚧    | 计划内 | - |
+| [微信(企业微信)](https://github.com/Soulter/astrbot_plugin_wecom)    | ✔    | 私聊 | 文字、图片、语音 |
 | 微信对话开放平台 | 🚧    | 计划内 | - |
 | 飞书   | 🚧    | 计划内 | - |
 | Discord   | 🚧    | 计划内 | - |

astrbot/core/config/default.py

@@ -2,7 +2,7 @@
 如需修改配置，请在 `data/cmd_config.json` 中修改或者在管理面板中可视化修改。
 """
 
-VERSION = "3.4.17"
+VERSION = "3.4.19"
 DB_PATH = "data/data_v3.db"
 
 # 默认配置
@@ -83,14 +83,7 @@ DEFAULT_CONFIG = {
     "pip_install_arg": "",
     "plugin_repo_mirror": "",
     "knowledge_db": {},
-    "persona": [
-        {
-            "name": "default",
-            "prompt": "",
-            "begin_dialogs": [],
-            "mood_imitation_dialogs": [],
-        }
-    ],
+    "persona": [],
 }
 
 
@@ -328,7 +321,7 @@ CONFIG_METADATA_2 = {
                 "type": "list",
                 "config_template": {
                     "openai": {
-                        "id": "default",
+                        "id": "openai",
                         "type": "openai_chat_completion",
                         "enable": True,
                         "key": [],
@@ -337,6 +330,17 @@ CONFIG_METADATA_2 = {
                             "model": "gpt-4o-mini",
                         },
                     },
+                    "azure_openai": {
+                        "id": "azure",
+                        "type": "openai_chat_completion",
+                        "enable": True,
+                        "api_version": "2024-05-01-preview",
+                        "key": [],
+                        "api_base": "",
+                        "model_config": {
+                            "model": "gpt-4o-mini",
+                        },
+                    },
                     "ollama": {
                         "id": "ollama_default",
                         "type": "openai_chat_completion",
@@ -387,6 +391,16 @@ CONFIG_METADATA_2 = {
                             "model": "glm-4-flash",
                         },
                     },
+                    "硅基流动": {
+                        "id": "siliconflow",
+                        "type": "openai_chat_completion",
+                        "enable": True,
+                        "key": [],
+                        "api_base": "https://api.siliconflow.cn/v1",
+                        "model_config": {
+                            "model": "deepseek-ai/DeepSeek-V3",
+                        },
+                    },
                     "llmtuner": {
                         "id": "llmtuner_default",
                         "type": "llm_tuner",
@@ -616,14 +630,14 @@ CONFIG_METADATA_2 = {
                         "description": "预设对话",
                         "type": "list",
                         "items": {"type": "string"},
-                        "hint": "可选。在每个对话前会插入这些预设对话。对话需要成对(用户和助手)，输入完一个角色之后按回车",
+                        "hint": "可选。在每个对话前会插入这些预设对话。对话需要成对(用户和助手)，输入完一个角色的内容之后按【回车】。需要偶数个对话",
                         "obvious_hint": True,
                     },
                     "mood_imitation_dialogs": {
                         "description": "对话风格模仿",
                         "type": "list",
                         "items": {"type": "string"},
-                        "hint": "旨在让模型尽可能模仿学习到所填写的对话的语气风格。格式和 `预设对话` 一样。对话需要成对(用户和助手)，输入完一个角色之后按回车",
+                        "hint": "旨在让模型尽可能模仿学习到所填写的对话的语气风格。格式和 `预设对话` 一致。对话需要成对(用户和助手)，输入完一个角色的内容之后按【回车】。需要偶数个对话",
                         "obvious_hint": True,
                     },
                 },
@@ -696,7 +710,7 @@ CONFIG_METADATA_2 = {
                                 "description": "启用主动回复",
                                 "type": "bool",
                                 "obvious_hint": True,
-                                "hint": "启用后，会根据触发概率主动回复群聊内的对话。",
+                                "hint": "启用后，会根据触发概率主动回复群聊内的对话。QQ官方API(qq_official)不可用",
                             },
                             "method": {
                                 "description": "回复方法",

astrbot/core/core_lifecycle.py

@@ -25,9 +25,8 @@ class AstrBotCoreLifecycle:
         self.astrbot_config = astrbot_config
         self.db = db
         
-        if self.astrbot_config['http_proxy']:
-            os.environ['https_proxy'] = self.astrbot_config['http_proxy']
-            os.environ['http_proxy'] = self.astrbot_config['http_proxy']
+        os.environ['https_proxy'] = self.astrbot_config['http_proxy']
+        os.environ['http_proxy'] = self.astrbot_config['http_proxy']
     
     async def initialize(self):
         logger.info("AstrBot v"+ VERSION)

astrbot/core/pipeline/__init__.py

@@ -2,6 +2,7 @@ from astrbot.core.message.message_event_result import MessageEventResult, EventR
 
 from .waking_check.stage import WakingCheckStage
 from .whitelist_check.stage import WhitelistCheckStage
+from .rate_limit_check.stage import RateLimitStage
 from .content_safety_check.stage import ContentSafetyCheckStage
 from .preprocess_stage.stage import PreProcessStage
 from .process_stage.stage import ProcessStage
@@ -11,7 +12,7 @@ from .respond.stage import RespondStage
 STAGES_ORDER = [
     "WakingCheckStage", # 检查是否需要唤醒
     "WhitelistCheckStage", # 检查是否在群聊/私聊白名单
-    "RateLimitCheckStage", # 检查会话是否超过频率限制
+    "RateLimitStage", # 检查会话是否超过频率限制
     "ContentSafetyCheckStage", # 检查内容安全
     "PreProcessStage", # 预处理
     "ProcessStage", # 交由 Stars 处理（a.k.a 插件），或者 LLM 调用
@@ -22,6 +23,7 @@ STAGES_ORDER = [
 __all__ = [
     "WakingCheckStage",
     "WhitelistCheckStage",
+    "RateLimitStage",
     "ContentSafetyCheckStage",
     "PreProcessStage",
     "ProcessStage",

astrbot/core/pipeline/process_stage/method/llm_request.py

@@ -83,6 +83,8 @@ class LLMRequestSubStage(Stage):
                 # text completion
                 event.set_result(MessageEventResult().message(llm_response.completion_text)
                                  .set_result_content_type(ResultContentType.LLM_RESULT))
+            elif llm_response.role == 'err':
+                event.set_result(MessageEventResult().message(f"AstrBot 请求失败。\n错误信息: {llm_response.completion_text}"))
             elif llm_response.role == 'tool':
                 # function calling
                 function_calling_result = {}

astrbot/core/pipeline/rate_limit_check/stage.py

@@ -61,11 +61,12 @@ class RateLimitStage(Stage):
                 stall_duration = (next_window_time - now).total_seconds()
                 
                 match self.rl_strategy:
-                    case RateLimitStrategy.STALL:
+                    case RateLimitStrategy.STALL.value:
                         logger.info(f"会话 {session_id} 被限流。根据限流策略，此会话处理将被暂停 {stall_duration:.2f} 秒。")
                         await asyncio.sleep(stall_duration)
-                    case RateLimitStrategy.DISCARD:
-                        event.set_result(MessageEventResult().message(f"会话 {session_id} 被限流。根据限流策略，此请求已被丢弃，直到您的限额于 {stall_duration:.2f} 秒后重置。"))
+                    case RateLimitStrategy.DISCARD.value:
+                        # event.set_result(MessageEventResult().message(f"会话 {session_id} 被限流。根据限流策略，此请求已被丢弃，直到您的限额于 {stall_duration:.2f} 秒后重置。"))
+                        logger.info(f"会话 {session_id} 被限流。根据限流策略，此请求已被丢弃，直到限额于 {stall_duration:.2f} 秒后重置。")
                         return event.stop_event()
                 
                 self._remove_expired_timestamps(timestamps, now + timedelta(seconds=stall_duration))

astrbot/core/pipeline/result_decorate/stage.py

@@ -103,8 +103,12 @@ class ResultDecorateStage:
                     if url:
                         result.chain = [Image.fromURL(url)]
             
+            # at 回复
             if self.reply_with_mention and event.get_message_type() != MessageType.FRIEND_MESSAGE:
                 result.chain.insert(0, At(qq=event.get_sender_id(), name=event.get_sender_name()))
+                if len(result.chain) > 1 and isinstance(result.chain[1], Plain):
+                    result.chain[1].text = "\n" + result.chain[1].text
             
+            # 引用回复
             if self.reply_with_quote:
                 result.chain.insert(0, Reply(id=event.message_obj.message_id))

astrbot/core/platform/sources/gewechat/client.py

@@ -95,6 +95,8 @@ class SimpleGewechatClient():
             if f'<atuserlist><![CDATA[,{abm.self_id}]]>' in msg_source \
                 or f'<atuserlist><![CDATA[{abm.self_id}]]>' in msg_source:
                 at_me = True
+            if '在群聊中@了你' in d.get('PushContent', ''):
+                at_me = True
         else:
             abm.type = MessageType.FRIEND_MESSAGE
             user_id = from_user_name
@@ -192,7 +194,7 @@ class SimpleGewechatClient():
     async def start_polling(self):
         threading.Thread(target=asyncio.run, args=(self._set_callback_url(),)).start()
         await self.server.run_task(
-            host=self.host, 
+            host='0.0.0.0', 
             port=self.port, 
             shutdown_trigger=self.shutdown_trigger_placeholder
         )

astrbot/core/provider/func_tool_manager.py

@@ -121,7 +121,8 @@ class FuncCall:
 
             tools.append(func_declaration)
 
-        declarations["function_declarations"] = tools
+        if tools:
+            declarations["function_declarations"] = tools
         return declarations
         
 

astrbot/core/provider/sources/gemini_source.py

@@ -181,6 +181,9 @@ class ProviderGoogleGenAI(Provider):
         )
         logger.debug(f"result: {result}")
         
+        if "candidates" not in result:
+            raise Exception("Gemini 返回异常结果: " + str(result))
+        
         candidates = result["candidates"][0]['content']['parts']
         llm_response = LLMResponse("assistant")
         for candidate in candidates:
@@ -190,7 +193,8 @@ class ProviderGoogleGenAI(Provider):
                 llm_response.role = "tool"
                 llm_response.tools_call_args.append(candidate['functionCall']['args'])
                 llm_response.tools_call_name.append(candidate['functionCall']['name'])
-            
+        
+        llm_response.completion_text = llm_response.completion_text.strip()
         return llm_response
 
 
@@ -221,11 +225,9 @@ class ProviderGoogleGenAI(Provider):
             "messages": context_query,
             **self.provider_config.get("model_config", {})
         }
-
+        llm_response = None
         try:
             llm_response = await self._query(payloads, func_tool)
-            await self.save_history(contexts, new_record, session_id, llm_response)
-            return llm_response
         except Exception as e:
             if "maximum context length" in str(e):
                 retry_cnt = 10
@@ -240,8 +242,22 @@ class ProviderGoogleGenAI(Provider):
                             retry_cnt -= 1
                         else:
                             raise e
+                if retry_cnt == 0:
+                    llm_response = LLMResponse("err", "err: 请尝试  /reset 重置会话")
+            elif "Function calling is not enabled" in str(e):
+                logger.info(f"{self.get_model()} 不支持函数调用工具调用，已经自动去除")
+                if 'tools' in payloads:
+                    del payloads['tools']
+                llm_response = await self._query(payloads, None)
             else:
+                logger.error(f"发生了错误(gemini_source)。Provider 配置如下: {self.provider_config}")
+                
                 raise e
+
+        if kwargs.get("persist", True) and llm_response:
+            await self.save_history(contexts, new_record, session_id, llm_response)
+            
+        return llm_response
     
     async def save_history(self, contexts: List, new_record: dict, session_id: str, llm_response: LLMResponse):
         if llm_response.role == "assistant" and session_id:

astrbot/core/provider/sources/openai_source.py

@@ -1,8 +1,8 @@
 import base64
 import json
-import re
+import os
 
-from openai import AsyncOpenAI, NOT_GIVEN
+from openai import AsyncOpenAI, AsyncAzureOpenAI, NOT_GIVEN
 from openai.types.chat.chat_completion import ChatCompletion
 from openai._exceptions import NotFoundError
 from astrbot.core.utils.io import download_image_by_url
@@ -29,12 +29,24 @@ class ProviderOpenAIOfficial(Provider):
         self.chosen_api_key = None
         self.api_keys: List = provider_config.get("key", [])
         self.chosen_api_key = self.api_keys[0] if len(self.api_keys) > 0 else None
-
-        self.client = AsyncOpenAI(
-            api_key=self.chosen_api_key,
-            base_url=provider_config.get("api_base", None),
-            timeout=provider_config.get("timeout", NOT_GIVEN),
-        )
+        
+        # 适配 azure openai #332
+        if "api_version" in provider_config:
+            # 使用 azure api
+            self.client = AsyncAzureOpenAI(
+                api_key=self.chosen_api_key,
+                api_version=provider_config.get("api_version", None),
+                base_url=provider_config.get("api_base", None),
+                timeout=provider_config.get("timeout", NOT_GIVEN),
+            )
+        else:
+            # 使用 openai api
+            self.client = AsyncOpenAI(
+                api_key=self.chosen_api_key,
+                base_url=provider_config.get("api_base", None),
+                timeout=provider_config.get("timeout", NOT_GIVEN),
+            )
+            
         self.set_model(provider_config['model_config']['model'])
     
     async def get_human_readable_context(self, session_id, page, page_size):
@@ -94,26 +106,11 @@ class ProviderOpenAIOfficial(Provider):
             if tool_list:
                 payloads['tools'] = tool_list
         
-        completion = None
-        try:
-            completion = await self.client.chat.completions.create(
-                **payloads,
-                stream=False
-            )
-        except BaseException as e:
-            # 处理不支持 Function Calling 的模型
-            if 'does not support Function Calling' in str(e) \
-                or 'does not support tools' in str(e)  \
-                or 'Function call is not supported' in str(e): # siliconcloud
-                    del payloads['tools']
-                    logger.debug(f"模型 {self.model_name} 不支持 tools，已自动移除")
-                    completion = await self.client.chat.completions.create(
-                        **payloads,
-                        stream=False
-                    )
-            else:
-                raise e
-        
+        completion = await self.client.chat.completions.create(
+            **payloads,
+            stream=False
+        )
+
         assert isinstance(completion, ChatCompletion)
         logger.debug(f"completion: {completion}")
 
@@ -168,32 +165,86 @@ class ProviderOpenAIOfficial(Provider):
             "messages": context_query,
             **self.provider_config.get("model_config", {})
         }
-
+        llm_response = None
         try:
             llm_response = await self._query(payloads, func_tool)
-            if kwargs.get("persist", True):
-                await self.save_history(contexts, new_record, session_id, llm_response)
-            return llm_response
         except Exception as e:
             if "maximum context length" in str(e):
+                # 重试 10 次
                 retry_cnt = 10
                 while retry_cnt > 0:
                     logger.warning("上下文长度超过限制。尝试弹出最早的记录然后重试。")
                     try:
                         await self.pop_record(session_id)
                         llm_response = await self._query(payloads, func_tool)
-                        if kwargs.get("persist", True):
-                            await self.save_history(contexts, new_record, session_id, llm_response)
-                        return llm_response
+                        break
                     except Exception as e:
                         if "maximum context length" in str(e):
                             retry_cnt -= 1
                         else:
                             raise e
+                if retry_cnt == 0:
+                    llm_response = LLMResponse("err", "err: 请尝试 /reset 清除会话记录。")
+            elif "The model is not a VLM" in str(e): # siliconcloud
+                # 尝试删除所有 image
+                new_contexts = await self._remove_image_from_context(context_query)
+                payloads['messages'] = new_contexts
+                llm_response = await self._query(payloads, func_tool)
+
+            # openai, ollama, gemini openai, siliconcloud 的错误提示与 code 不统一，只能通过字符串匹配
+            elif 'does not support Function Calling' in str(e) \
+                or 'does not support tools' in str(e)  \
+                or 'Function call is not supported' in str(e) \
+                or 'Function calling is not enabled' in str(e) \
+                or 'Tool calling is not supported' in str(e): # siliconcloud 
+                    logger.info(f"{self.get_model()} 不支持函数调用工具调用，已经自动去除")
+                    if 'tools' in payloads:
+                        del payloads['tools']
+                    llm_response = await self._query(payloads, None)
             else:
                 logger.error(f"发生了错误。Provider 配置如下: {self.provider_config}")
+                
+                if 'tool' in str(e).lower() and 'support' in str(e).lower():
+                    logger.error(f"疑似该模型不支持函数调用工具调用。请输入 /tool off_all")
+                
+                if 'Connection error.' in str(e):
+                    proxy = os.environ.get("http_proxy", None)
+                    if proxy:
+                        logger.error(f"可能为代理原因，请检查代理是否正常。当前代理: {proxy}")
+                
                 raise e
         
+        if kwargs.get("persist", True) and llm_response:
+            await self.save_history(contexts, new_record, session_id, llm_response)
+        
+        return llm_response
+    
+    async def _remove_image_from_context(self, contexts: List):
+        '''
+        从上下文中删除所有带有 image 的记录
+        '''
+        new_contexts = []
+        
+        flag = False
+        for context in contexts:
+            if flag:
+                flag = False # 删除 image 后，下一条（LLM 响应）也要删除
+                continue
+            if isinstance(context['content'], list):
+                flag = True
+                # continue
+                new_content = []
+                for item in context['content']:
+                    if isinstance(item, dict) and 'image_url' in item:
+                        continue
+                    new_content.append(item)
+                if not new_content:
+                    # 用户只发了图片
+                    new_content = [{"type": "text", "text": "[图片]"}]
+                context['content'] = new_content
+            new_contexts.append(context)
+        return new_contexts
+
     
     async def save_history(self, contexts: List, new_record: dict, session_id: str, llm_response: LLMResponse):
         if llm_response.role == "assistant" and session_id:

astrbot/core/star/filter/permission.py

@@ -20,6 +20,6 @@ class PermissionTypeFilter(HandlerFilter):
         if self.permission_type == PermissionType.ADMIN:
             if not event.is_admin():
                 event.stop_event()
-                raise ValueError(f"您 (ID: {event.get_sender_id()}) 没有权限执行此操作。")
+                raise ValueError(f"您 (ID: {event.get_sender_id()}) 没有权限操作管理员指令。")
 
         return True

astrbot/core/star/register/star_handler.py

@@ -17,7 +17,7 @@ def get_handler_full_name(awaitable: Awaitable) -> str:
     '''获取 Handler 的全名'''
     return f"{awaitable.__module__}_{awaitable.__name__}"
 
-def get_handler_or_create(handler: Awaitable, event_type: EventType, dont_add = False) -> StarHandlerMetadata:
+def get_handler_or_create(handler: Awaitable, event_type: EventType, dont_add = False, **kwargs) -> StarHandlerMetadata:
     '''获取 Handler 或者创建一个新的 Handler'''
     handler_full_name = get_handler_full_name(handler)
     md = star_handlers_registry.get_handler_by_full_name(handler_full_name)
@@ -30,14 +30,17 @@ def get_handler_or_create(handler: Awaitable, event_type: EventType, dont_add =
             handler_name=handler.__name__,
             handler_module_path=handler.__module__,
             handler=handler,
-            event_filters=[]
+            event_filters=[],
         )
+        if handler.__doc__:
+            md.desc = handler.__doc__.strip()
         if not dont_add:
             star_handlers_registry.append(md)
         return md
 
 def register_command(command_name: str = None, *args):
-    '''注册一个 Command'''
+    '''注册一个 Command.
+    '''
     
     new_command = None
     add_to_event_filters = False
@@ -61,8 +64,9 @@ def register_command(command_name: str = None, *args):
 
     return decorator
 
-def register_command_group(command_group_name: str = None, *args):
-    '''注册一个 CommandGroup'''
+def register_command_group(command_group_name: str = None, desc: str = "", *args):
+    '''注册一个 CommandGroup
+    '''
     
     new_group = None
     add_to_event_filters = False

astrbot/core/star/star_manager.py

@@ -19,6 +19,8 @@ from .star import star_registry, star_map
 from .star_handler import star_handlers_registry
 from astrbot.core.provider.register import llm_tools
 
+from .filter.permission import PermissionTypeFilter, PermissionType
+
 class PluginManager:
     def __init__(
         self, 
@@ -159,6 +161,8 @@ class PluginManager:
         inactivated_plugins: list = sp.get("inactivated_plugins", [])
         inactivated_llm_tools: list = sp.get("inactivated_llm_tools", [])
         
+        alter_cmd = sp.get("alter_cmd", {})
+        
         # 导入插件模块，并尝试实例化插件类
         for plugin_module in plugin_modules:
             try:
@@ -213,12 +217,12 @@ class PluginManager:
                     metadata.root_dir_name = root_dir_name
                     metadata.reserved = reserved
                     
+                    # 绑定 handler
                     related_handlers = star_handlers_registry.get_handlers_by_module_name(metadata.module_path)
                     for handler in related_handlers:
                         logger.debug(f"bind handler {handler.handler_name} to {metadata.name}")
-                        # handler.handler.__self__ = star_metadata.star_cls # 绑定 handler 的 self
                         handler.handler = functools.partial(handler.handler, metadata.star_cls)
-                    # llm_tool
+                    # 绑定 llm_tool handler
                     for func_tool in llm_tools.func_list:
                         if func_tool.handler.__module__ == metadata.module_path:
                             func_tool.handler_module_path = metadata.module_path
@@ -253,9 +257,29 @@ class PluginManager:
                     star_registry.append(metadata)
                     logger.debug(f"插件 {root_dir_name} 载入成功。")
                 
+                # 禁用/启用插件
                 if metadata.module_path in inactivated_plugins:
                     metadata.activated = False
                     
+                # 检查并且植入自定义的权限过滤器（alter_cmd）
+                for handler in star_handlers_registry.get_handlers_by_module_name(metadata.module_path):
+                    if metadata.name in alter_cmd and handler.handler_name in alter_cmd[metadata.name]:
+                        # 注入权限过滤器
+                        cmd_type = alter_cmd[metadata.name][handler.handler_name].get("permission", "member")
+                        found_permission_filter = False
+                        for filter_ in handler.event_filters:
+                            if isinstance(filter_, PermissionTypeFilter):
+                                if cmd_type == "admin":
+                                    filter_.permission_type = PermissionType.ADMIN
+                                else:
+                                    filter_.permission_type = PermissionType.MEMBER
+                                found_permission_filter = True
+                                break
+                        if not found_permission_filter:
+                            handler.event_filters.append(PermissionTypeFilter(PermissionType.ADMIN if cmd_type == "admin" else PermissionType.MEMBER))
+
+                        logger.debug(f"插入权限过滤器 {cmd_type} 到 {metadata.name} 的 {handler.handler_name} 方法。")
+                    
                 # 执行 initialize() 方法
                 if hasattr(metadata.star_cls, "initialize"):
                     await metadata.star_cls.initialize()

astrbot/dashboard/routes/plugin.py

@@ -25,15 +25,29 @@ class PluginRoute(Route):
         self.register_routes()
     
     async def get_online_plugins(self):
-        url = "https://soulter.github.io/AstrBot_Plugins_Collection/plugins.json"
-        try:
-            async with aiohttp.ClientSession(trust_env=True) as session:
-                async with session.get(url) as response:
-                    result = await response.json()
-            return Response().ok(result).__dict__
-        except Exception as e:
-            logger.error(f"获取插件列表失败：{e}")
-            return Response().error(str(e)).__dict__
+        custom = request.args.get("custom_registry")
+        
+        if custom:
+            urls = [custom]
+        else:
+            urls = [
+                "https://soulter.github.io/AstrBot_Plugins_Collection/plugins.json",
+                "https://api.soulter.top/astrbot/plugins"
+            ]
+            
+        for url in urls:
+            try:
+                async with aiohttp.ClientSession(trust_env=True) as session:
+                    async with session.get(url) as response:
+                        if response.status == 200:
+                            result = await response.json()
+                            return Response().ok(result).__dict__
+                        else:
+                            logger.error(f"请求 {url} 失败，状态码：{response.status}")
+            except Exception as e:
+                logger.error(f"请求 {url} 失败，错误：{e}")
+        
+        return Response().error("获取插件列表失败").__dict__
     
     async def get_plugins(self):
         _plugin_resp = []
@@ -56,6 +70,7 @@ class PluginRoute(Route):
         try:
             logger.info(f"正在安装插件 {repo_url}")
             await self.plugin_manager.install_plugin(repo_url)
+            self.core_lifecycle.restart()
             logger.info(f"安装插件 {repo_url} 成功。")
             return Response().ok(None, "安装成功。").__dict__
         except Exception as e:
@@ -70,6 +85,7 @@ class PluginRoute(Route):
             file_path = f"data/temp/{file.filename}"
             await file.save(file_path)
             await self.plugin_manager.install_plugin_from_file(file_path)
+            self.core_lifecycle.restart()
             logger.info(f"安装插件 {file.filename} 成功")
             return Response().ok(None, "安装成功。").__dict__
         except Exception as e:
@@ -94,6 +110,7 @@ class PluginRoute(Route):
         try:
             logger.info(f"正在更新插件 {plugin_name}")
             await self.plugin_manager.update_plugin(plugin_name)
+            self.core_lifecycle.restart()
             logger.info(f"更新插件 {plugin_name} 成功。")
             return Response().ok(None, "更新成功。").__dict__
         except Exception as e:

changelogs/v3.4.18.md

@@ -0,0 +1,12 @@
+# What's Changed
+
+- fix: 修复主动概率回复关闭后仍然回复的问题 #317
+- fix: 尝试修复 gewechat 群聊收不到 at 的回复 #294
+- perf: 移除了默认人格
+- fix: 修复HTTP代理删除后不生效 #319
+- fix: 调用Gemini API输出多余空行问题 #318
+- feat: 添加硅基流动模版
+- fix: 硅基流动 not a vlm 和 tool calling not supported 报错 #305 #291
+- perf: 回复时艾特发送者之后添加空格或换行 #312
+- fix: docker容器内时区不对导致 reminder 时间错误
+- perf: siliconcloud 不支持 tool 的模型

changelogs/v3.4.19.md

@@ -0,0 +1,13 @@
+# What's Changed
+
+1. 支持接入企业微信（测试）
+2. 修复速率限制不可用的问题
+3. gewechat 回调接口默认暴露在所有 IP
+4. 适配 Azure OpenAI
+5. 修复请求 gemini 出现 KeyError 'candidates' 的错误
+6. 将 /reset /persona 挪入管理员指令 #308
+7. 支持通过 /alter_cmd 设置所有指令是否只能管理员操作
+8. /plugin 指令支持查看插件注册的指令和指令组
+9. 插件注册指令支持传入指令的描述以方便 /plugin 查看。需要写在函数的第一行的 docstring 中。
+10. 修复 schema 中 object hint 不显示 #290
+11. feat: 优化插件市场的访问速度

dashboard/src/components/shared/AstrBotConfig.vue

@@ -4,7 +4,7 @@
     </h3>
     <v-card-text>
         <div v-for="(index, key) in iterable" :key="key" style="margin-bottom: 0.5px;" v-if="metadata[metadataKey]?.type === 'object' || metadata[metadataKey]?.config_template">
-            <v-alert v-if="metadata[metadataKey].items[key]?.obvious_hint && metadata[metadataKey].items[key]?.hint && metadata[metadataKey].items[key]?.type !== 'object'" style="margin-bottom: 16px"
+            <v-alert v-if="metadata[metadataKey].items[key]?.obvious_hint && metadata[metadataKey].items[key]?.hint" style="margin-bottom: 16px"
                 :text="metadata[metadataKey].items[key]?.hint" :title="'💡 关于' + metadata[metadataKey].items[key]?.description"
                 type="info" variant="tonal">
             </v-alert>
@@ -52,7 +52,7 @@
                 </div>
 
                 <div
-                    v-if="!metadata[metadataKey].items[key]?.obvious_hint && metadata[metadataKey].items[key]?.hint && metadata[metadataKey].items[key]?.type !== 'object' && !metadata[metadataKey].items[key]?.invisible">
+                    v-if="!metadata[metadataKey].items[key]?.obvious_hint && metadata[metadataKey].items[key]?.hint && !metadata[metadataKey].items[key]?.invisible">
                     <v-btn icon size="x-small" style="margin-bottom: 22px;">
                         <v-icon size="x-small">mdi-help</v-icon>
                         <v-tooltip activator="parent" location="start">{{ metadata[metadataKey].items[key]?.hint
@@ -63,7 +63,7 @@
         
         </div>
         <div v-else>
-            <v-alert v-if="metadata[metadataKey]?.obvious_hint && metadata[metadataKey]?.hint && metadata[metadataKey]?.type !== 'object'" style="margin-bottom: 16px"
+            <v-alert v-if="metadata[metadataKey]?.obvious_hint && metadata[metadataKey]?.hint" style="margin-bottom: 16px"
                 :text="metadata[metadataKey]?.hint" :title="'💡 关于' + metadata[metadataKey]?.description"
                 type="info" variant="tonal">
             </v-alert>
@@ -106,7 +106,7 @@
                 </div>
 
                 <div
-                    v-if="!metadata[metadataKey]?.obvious_hint && metadata[metadataKey]?.hint && metadata[metadataKey]?.type !== 'object' && !metadata[metadataKey]?.invisible">
+                    v-if="!metadata[metadataKey]?.obvious_hint && metadata[metadataKey]?.hint && !metadata[metadataKey]?.invisible">
                     <v-btn icon size="x-small" style="margin-bottom: 22px;">
                         <v-icon size="x-small">mdi-help</v-icon>
                         <v-tooltip activator="parent" location="start">{{ metadata[metadataKey]?.hint

dashboard/src/views/ExtensionPage.vue

@@ -37,7 +37,11 @@ import axios from 'axios';
     </v-col>
     <v-col cols="12" md="12">
       <div style="background-color: white; width: 100%; padding: 16px; border-radius: 10px;">
-        <h3>🧩 插件市场</h3>
+        <div style="display: flex; align-items: center;">
+          <h3>🧩 插件市场</h3>
+          <small style="margin-left: 16px;">如无法显示，请打开 <a href="https://soulter.github.io/AstrBot_Plugins_Collection/plugins.json">链接</a> 复制想安装插件对应的 `repo` 链接然后点击右下角 + 号安装，或打开链接下载压缩包安装。</small>
+        </div>
+        
       </div>
     </v-col>
     <v-col cols="12" md="6" lg="4" v-for="plugin in pluginMarketData">

packages/astrbot/long_term_memory.py

@@ -27,6 +27,7 @@ class LongTermMemory:
         self.image_caption_prompt = self.config["image_caption_prompt"]
         
         self.active_reply = self.config["active_reply"]
+        self.enable_active_reply = self.active_reply.get("enable", False)
         self.ar_method = self.active_reply["method"]
         self.ar_possibility = self.active_reply["possibility_reply"]
         self.ar_prompt = self.active_reply.get("prompt", "")
@@ -51,7 +52,7 @@ class LongTermMemory:
         return response.completion_text
     
     async def need_active_reply(self, event: AstrMessageEvent) -> bool:
-        if not self.active_reply:
+        if not self.enable_active_reply:
             return False
         if event.get_message_type() != MessageType.GROUP_MESSAGE:
             return False

packages/astrbot/main.py

@@ -6,10 +6,13 @@ import astrbot.api.event.filter as filter
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
 from astrbot.api import sp
 from astrbot.api.provider import Personality, ProviderRequest, LLMResponse
-from astrbot.api.platform import MessageType
 from astrbot.core.utils.io import download_dashboard, get_dashboard_version
+from astrbot.core.star.star_handler import star_handlers_registry, StarHandlerMetadata
+from astrbot.core.star.star import star_map
+from astrbot.core.star.filter.command import CommandFilter
+from astrbot.core.star.filter.command_group import CommandGroupFilter
+from astrbot.core.star.filter.permission import PermissionTypeFilter
 from astrbot.core.config.default import VERSION
-from collections import defaultdict
 from .long_term_memory import LongTermMemory
 from astrbot.core import logger
 
@@ -41,6 +44,7 @@ class Main(star.Star):
         
     @filter.command("help")
     async def help(self, event: AstrMessageEvent):
+        '''查看帮助'''
         notice = ""
         try:
             notice = await self._query_astrbot_notice()
@@ -50,31 +54,32 @@ class Main(star.Star):
         dashboard_version = await get_dashboard_version()
 
         msg = f"""AstrBot v{VERSION}(WebUI: {dashboard_version})
-已注册的 AstrBot 内置指令:
+AstrBot 指令:
 [System]
-/plugin: 查看注册的插件、插件帮助
-/t2i: 开启/关闭文本转图片模式
-/sid: 获取当前会话的 ID
+/plugin: 查看插件、插件帮助
+/t2i: 开关文本转图片
+/sid: 获取会话 ID
 /op <admin_id>: 授权管理员
 /deop <admin_id>: 取消管理员
-/wl <sid>: 添加会话白名单
-/dwl <sid>: 删除会话白名单
+/wl <sid>: 添加白名单
+/dwl <sid>: 删除白名单
 /dashboard_update: 更新管理面板
+/alter_cmd: 设置指令权限
 
 [大模型]
-/provider: 查看、切换大模型提供商
-/model: 查看、切换提供商模型列表
-/key: 查看、切换 API Key
+/provider: 大模型提供商
+/model: 模型列表
+/key: API Key
 /reset: 重置 LLM 会话
-/history: 获取会话历史记录
-/persona: 情境人格设置
-/tool ls: 查看、激活、停用当前注册的函数工具
+/history: 对话记录
+/persona: 人格情景
+/tool ls: 函数工具
 
 [其他]
-/set <变量名> <值>: 为当前会话定义一个变量。适用于 Dify 工作流输入。
-/unset <变量名>: 删除当前会话的变量。
+/set <变量名> <值>: 为会话定义一个变量。适用于 Dify 工作流输入。
+/unset <变量名>: 删除会话的变量。
 
-提示：如果要查看插件指令，请输入 /plugin 查看具体信息。
+提示：如要查看插件指令，请输入 /plugin 查看具体信息。
 {notice}"""
 
         event.set_result(MessageEventResult().message(msg).use_t2i(False))
@@ -91,7 +96,7 @@ class Main(star.Star):
             active = " (启用)" if tool.active else "(停用)"
             msg += f"- {tool.name}: {tool.description} {active}\n"
             
-        msg += "\n使用 /tool on/off <工具名> 激活或者停用工具。"
+        msg += "\n使用 /tool on/off <工具名> 激活或者停用函数工具。/tool off_all 停用所有函数工具。"
         event.set_result(MessageEventResult().message(msg).use_t2i(False))
         
     @tool.command("on")
@@ -107,6 +112,13 @@ class Main(star.Star):
             event.set_result(MessageEventResult().message(f"停用工具 {tool_name} 成功。"))
         else:
             event.set_result(MessageEventResult().message(f"停用工具 {tool_name} 失败，未找到此工具。"))
+            
+    @tool.command("off_all")
+    async def tool_all_off(self, event: AstrMessageEvent):
+        tm = self.context.get_llm_tool_manager()
+        for tool in tm.func_list:
+            self.context.deactivate_llm_tool(tool.name)
+        event.set_result(MessageEventResult().message(f"停用所有工具成功。"))
 
     @filter.command("plugin")
     async def plugin(self, event: AstrMessageEvent, oper1: str = None, oper2: str = None):
@@ -117,7 +129,7 @@ class Main(star.Star):
             if plugin_list_info.strip() == "":
                 plugin_list_info = "没有加载任何插件。"
             
-            plugin_list_info += "\n使用 /plugin <插件名> 查看插件帮助。\n使用 /plugin on/off <插件名> 启用或者禁用插件。"
+            plugin_list_info += "\n使用 /plugin <插件名> 查看插件帮助和加载的指令。\n使用 /plugin on/off <插件名> 启用或者禁用插件。"
             event.set_result(MessageEventResult().message(f"{plugin_list_info}").use_t2i(False))
         else:
             if oper1 == "off":
@@ -140,10 +152,34 @@ class Main(star.Star):
                 plugin = self.context.get_registered_star(oper1)
                 if plugin is None:
                     event.set_result(MessageEventResult().message("未找到此插件。"))
-                else:
-                    help_msg = plugin.star_cls.__doc__ if plugin.star_cls.__doc__ else "该插件未提供帮助信息"
-                    ret = f"插件 {oper1} 帮助信息：\n" + help_msg
-                    event.set_result(MessageEventResult().message(ret).use_t2i(False))
+                    return
+                help_msg = plugin.star_cls.__doc__ if plugin.star_cls.__doc__ else "帮助信息: 未提供"
+                help_msg += f"\n\n作者: {plugin.author}\n版本: {plugin.version}"
+                command_handlers = []
+                command_names = []
+                for handler in star_handlers_registry:
+                    assert isinstance(handler, StarHandlerMetadata)
+                    if handler.handler_module_path != plugin.module_path:
+                        continue
+                    for filter_ in handler.event_filters:
+                        if isinstance(filter_, CommandFilter):
+                            command_handlers.append(handler)
+                            command_names.append(filter_.command_name)
+                            break
+                        elif isinstance(filter_, CommandGroupFilter):
+                            command_handlers.append(handler)
+                            command_names.append(filter_.group_name)
+                            
+                if len(command_handlers) > 0:
+                    help_msg += "\n\n指令列表：\n"
+                    for i in range(len(command_handlers)):
+                        help_msg += f"{command_names[i]}: {command_handlers[i].desc}\n"
+                        
+                    help_msg += "\nTip: 指令的触发需要添加唤醒前缀，默认为 /。"
+                
+                ret = f"插件 {oper1} 帮助信息：\n" + help_msg
+                ret += "更多帮助信息请查看插件仓库 README。"
+                event.set_result(MessageEventResult().message(ret).use_t2i(False))
 
     @filter.command("t2i")
     async def t2i(self, event: AstrMessageEvent):
@@ -229,6 +265,7 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
 
             event.set_result(MessageEventResult().message(f"成功切换到 {id_}。"))
 
+    @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("reset")
     async def reset(self, message: AstrMessageEvent):
         
@@ -347,6 +384,7 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
                         MessageEventResult().message("切换 Key 未知错误: "+str(e)))
                 message.set_result(MessageEventResult().message("切换 Key 成功。"))
 
+    @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("persona")
     async def persona(self, message: AstrMessageEvent):
                 
@@ -531,6 +569,66 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
                 await self.ltm.after_req_llm(event)
             except BaseException as e:
                 logger.error(f"ltm: {e}")
+                
+    @filter.permission_type(filter.PermissionType.ADMIN)
+    @filter.command("alter_cmd")
+    async def alter_cmd(self, event: AstrMessageEvent):
+        # token = event.message_str.split(" ")
+        token = self.parse_commands(event.message_str)
+        if token.len < 2:
+            yield event.plain_result("可设置所有其他指令是否需要管理员权限。\n格式: /alter_cmd <cmd_name> <admin/member>\n 例如: /alter_cmd provider admin 将 provider 设置为管理员指令")
+            return
+        
+        cmd_name = token.get(1)
+        cmd_type = token.get(2)
+        
+        if cmd_type not in ["admin", "member"]:
+            yield event.plain_result("指令类型错误，可选类型有 admin, member")
+            return
+        
+        # 查找指令
+        found_command = None
+        for handler in star_handlers_registry:
+            assert isinstance(handler, StarHandlerMetadata)
+            for filter_ in handler.event_filters:
+                if isinstance(filter_, CommandFilter):
+                    if filter_.command_name == cmd_name:
+                        found_command = handler
+                        break
+                elif isinstance(filter_, CommandGroupFilter):
+                    if cmd_name == filter_.group_name:
+                        found_command = handler
+                        break
+        
+        if not found_command:
+            yield event.plain_result("未找到该指令")
+            return
+        
+        found_plugin = star_map[found_command.handler_module_path]
+        
+        alter_cmd_cfg = sp.get("alter_cmd", {})
+        plugin_ = alter_cmd_cfg.get(found_plugin.name, {})
+        cfg = plugin_.get(found_command.handler_name, {})
+        cfg["permission"] = cmd_type
+        plugin_[found_command.handler_name] = cfg
+        alter_cmd_cfg[found_plugin.name] = plugin_
+        
+        sp.put("alter_cmd", alter_cmd_cfg)
+        
+        # 注入权限过滤器
+        found_permission_filter = False
+        for filter_ in found_command.event_filters:
+            if isinstance(filter_, PermissionTypeFilter):
+                if cmd_type == "admin":
+                    filter_.permission_type = filter.PermissionType.ADMIN
+                else:
+                    filter_.permission_type = filter.PermissionType.MEMBER
+                found_permission_filter = True
+                break
+        if not found_permission_filter:
+            found_command.event_filters.insert(0, PermissionTypeFilter(filter.PermissionType.ADMIN if cmd_type == "admin" else filter.PermissionType.MEMBER))
+
+        yield event.plain_result(f"已将 {cmd_name} 设置为 {cmd_type} 指令")
 
     # @filter.command_group("kdb")
     # def kdb(self):