v3.4.29

Co-authored-by: Bocity <haolovej@vip.qq.com>

astrbot/api/event/filter/__init__.py

@@ -5,6 +5,7 @@ from astrbot.core.star.register import (
     register_regex as regex,
     register_platform_adapter_type as platform_adapter_type,
     register_permission_type as permission_type,
+    register_custom_filter as custom_filter,
     register_on_llm_request as on_llm_request,
     register_on_llm_response as on_llm_response,
     register_llm_tool as llm_tool,
@@ -15,6 +16,7 @@ from astrbot.core.star.register import (
 from astrbot.core.star.filter.event_message_type import EventMessageTypeFilter, EventMessageType
 from astrbot.core.star.filter.platform_adapter_type import PlatformAdapterTypeFilter, PlatformAdapterType
 from astrbot.core.star.filter.permission import PermissionTypeFilter, PermissionType
+from astrbot.core.star.filter.custom_filter import CustomFilter
 
 __all__ = [
     'command',
@@ -28,6 +30,8 @@ __all__ = [
     'PlatformAdapterTypeFilter',
     'PlatformAdapterType',
     'PermissionTypeFilter',
+    'CustomFilter',
+    'custom_filter',
     'PermissionType',
     'on_llm_request',
     'llm_tool',

astrbot/core/config/default.py

@@ -2,7 +2,7 @@
 如需修改配置，请在 `data/cmd_config.json` 中修改或者在管理面板中可视化修改。
 """
 
-VERSION = "3.4.27"
+VERSION = "3.4.29"
 DB_PATH = "data/data_v3.db"
 
 # 默认配置
@@ -32,7 +32,8 @@ DEFAULT_CONFIG = {
             "interval": "1.5,3.5",
             "log_base": 2.6,
             "words_count_threshold": 150,
-            "regex": ".*?[。？！~…]+|.+$"
+            "regex": ".*?[。？！~…]+|.+$",
+            "content_cleanup_rule": "",
         },
         "no_permission_reply": True,
     },
@@ -271,6 +272,12 @@ CONFIG_METADATA_2 = {
                                 "obvious_hint": True,
                                 "hint": "用于分隔一段消息。默认情况下会根据句号、问号等标点符号分隔。re.findall(r'<regex>', text)",
                             },
+                            "content_cleanup_rule": {
+                                "description": "过滤分段后的内容",
+                                "type": "string",
+                                "obvious_hint": True,
+                                "hint": "移除分段后的内容中的指定的内容。支持正则表达式。如填写 `[。？！]` 将移除所有的句号、问号、感叹号。re.sub(r'<regex>', '', text)",
+                            },
                         },
                     },
                     "reply_prefix": {
@@ -496,6 +503,7 @@ CONFIG_METADATA_2 = {
                         "dify_api_key": "",
                         "dify_api_base": "https://api.dify.ai/v1",
                         "dify_workflow_output_key": "",
+                        "dify_query_input_key": "astrbot_text_query",
                         "timeout": 60,
                     },
                     "whisper(API)": {
@@ -647,6 +655,12 @@ CONFIG_METADATA_2 = {
                         "type": "string",
                         "hint": "Dify Workflow 输出变量名。当应用类型为 workflow 时才使用。默认为 astrbot_wf_output。",
                     },
+                    "dify_query_input_key": {
+                        "description": "Prompt 输入变量名",
+                        "type": "string",   
+                        "hint": "发送的消息文本内容对应的输入变量名。默认为 astrbot_text_query。",
+                        "obvious": True,
+                    }
                 },
             },
             "provider_settings": {

astrbot/core/core_lifecycle.py

@@ -27,7 +27,8 @@ class AstrBotCoreLifecycle:
         
         os.environ['https_proxy'] = self.astrbot_config['http_proxy']
         os.environ['http_proxy'] = self.astrbot_config['http_proxy']
-    
+        os.environ['no_proxy'] = 'localhost,127.0.0.1'
+        
     async def initialize(self):
         logger.info("AstrBot v"+ VERSION)
         if os.environ.get("TESTING", ""):

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

@@ -64,12 +64,14 @@ class LLMRequestSubStage(Stage):
         if not req.prompt and not req.image_urls:
             return
             
-        # 执行请求 LLM 前事件。
+        # 执行请求 LLM 前事件钩子。
         # 装饰 system_prompt 等功能
         handlers = star_handlers_registry.get_handlers_by_event_type(EventType.OnLLMRequestEvent)
         for handler in handlers:
             try:
-                await handler.handler(event, req)
+                wrapper = self._call_handler(self.ctx, event, handler.handler, req)
+                async for ret in wrapper:
+                    yield ret
             except BaseException:
                 logger.error(traceback.format_exc())
                 
@@ -86,7 +88,9 @@ class LLMRequestSubStage(Stage):
             handlers = star_handlers_registry.get_handlers_by_event_type(EventType.OnLLMResponseEvent)
             for handler in handlers:
                 try:
-                    await handler.handler(event, llm_response)
+                    wrapper = self._call_handler(self.ctx, event, handler.handler, llm_response)
+                    async for ret in wrapper:
+                        yield ret
                 except BaseException:
                     logger.error(traceback.format_exc())
             

astrbot/core/pipeline/process_stage/stage.py

@@ -35,7 +35,6 @@ class ProcessStage(Stage):
                 # 生成器返回值处理
                 if isinstance(resp, ProviderRequest):
                     # Handler 的 LLM 请求
-                    logger.debug(f"llm request -> {resp.prompt}")
                     event.set_extra("provider_request", resp)
                     _t = False
                     async for _ in self.llm_request_sub_stage.process(event):
@@ -46,12 +45,14 @@ class ProcessStage(Stage):
                 else:
                     yield
         
-        # 调用提供商相关请求
+        # 调用 LLM 相关请求
         if not self.ctx.astrbot_config['provider_settings'].get('enable', True):
             return
         
         if not event._has_send_oper and event.is_at_or_wake_command:
+            # 是否有过发送操作 and 是否是被 @ 或者通过唤醒前缀
             if (event.get_result() and not event.get_result().is_stopped()) or not event.get_result():
+                # 事件没有终止传播
                 provider = self.ctx.plugin_manager.context.get_using_provider()
                 
                 if not provider:

astrbot/core/pipeline/respond/stage.py

@@ -1,20 +1,24 @@
 import random
 import asyncio
 import math
+import traceback
 from typing import Union, AsyncGenerator
 from ..stage import register_stage, Stage
 from ..context import PipelineContext
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core import logger
-from astrbot.core.message.message_event_result import BaseMessageComponent, Plain
+from astrbot.core.message.message_event_result import BaseMessageComponent
 from astrbot.core.star.star_handler import star_handlers_registry, EventType
-
+from astrbot.core.message.components import Plain, Reply, At
 @register_stage
 class RespondStage(Stage):
     async def initialize(self, ctx: PipelineContext):
         self.ctx = ctx
         
+        self.reply_with_mention = ctx.astrbot_config['platform_settings']['reply_with_mention']
+        self.reply_with_quote = ctx.astrbot_config['platform_settings']['reply_with_quote']
+        
         # 分段回复
         self.enable_seg: bool = ctx.astrbot_config['platform_settings']['segmented_reply']['enable']
         self.only_llm_result = ctx.astrbot_config['platform_settings']['segmented_reply']['only_llm_result']
@@ -60,11 +64,24 @@ class RespondStage(Stage):
             await event._pre_send()
             
             if self.enable_seg and ((self.only_llm_result and result.is_llm_result()) or not self.only_llm_result):
+                decorated_comps = []
+                if self.reply_with_mention:
+                    for comp in result.chain:
+                        if isinstance(comp, At):
+                            decorated_comps.append(comp)
+                            result.chain.remove(comp)
+                            break
+                if self.reply_with_quote:
+                    for comp in result.chain:
+                        if isinstance(comp, Reply):
+                            decorated_comps.append(comp)
+                            result.chain.remove(comp)
+                            break
                 # 分段回复
                 for comp in result.chain:
                     i = await self._calc_comp_interval(comp)
                     await asyncio.sleep(i)
-                    await event.send(MessageChain([comp]))
+                    await event.send(MessageChain([*decorated_comps, comp]))
             else:
                 await event.send(result)
             await event._post_send()
@@ -72,7 +89,11 @@ class RespondStage(Stage):
         
         handlers = star_handlers_registry.get_handlers_by_event_type(EventType.OnAfterMessageSentEvent)
         for handler in handlers:
-            # TODO: 如何让这里的 handler 也能使用 LLM 能力。也许需要将 LLMRequestSubStage 提取出来。
-            await handler.handler(event)
+            try:
+                wrapper = self._call_handler(self.ctx, event, handler.handler)
+                async for ret in wrapper:
+                    yield ret
+            except BaseException:
+                logger.error(traceback.format_exc())
             
         event.clear_result()

astrbot/core/pipeline/result_decorate/stage.py

@@ -7,7 +7,7 @@ from ..context import PipelineContext
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.platform.message_type import MessageType
 from astrbot.core import logger
-from astrbot.core.message.components import Plain, Image, At, Reply, Record
+from astrbot.core.message.components import Plain, Image, At, Reply, Record, File, Node
 from astrbot.core import html_renderer
 from astrbot.core.star.star_handler import star_handlers_registry, EventType
 
@@ -25,12 +25,16 @@ class ResultDecorateStage(Stage):
                 self.t2i_word_threshold = 50
         except BaseException:
             self.t2i_word_threshold = 150
+            
+        self.forward_threshold = ctx.astrbot_config['platform_settings']['forward_threshold']
         
         # 分段回复
         self.words_count_threshold = int(ctx.astrbot_config['platform_settings']['segmented_reply']['words_count_threshold'])
         self.enable_segmented_reply = ctx.astrbot_config['platform_settings']['segmented_reply']['enable']
         self.only_llm_result = ctx.astrbot_config['platform_settings']['segmented_reply']['only_llm_result']
         self.regex = ctx.astrbot_config['platform_settings']['segmented_reply']['regex']
+        self.content_cleanup_rule = ctx.astrbot_config['platform_settings']['segmented_reply']['content_cleanup_rule']
+
         
         # exception
         self.content_safe_check_reply = ctx.astrbot_config['content_safety']['also_use_in_response']
@@ -55,9 +59,16 @@ class ResultDecorateStage(Stage):
             async for _ in self.content_safe_check_stage.process(event, check_text=text):
                 yield
         
+        # 发送消息前事件钩子
         handlers = star_handlers_registry.get_handlers_by_event_type(EventType.OnDecoratingResultEvent)
         for handler in handlers:
-            await handler.handler(event)
+            try:
+                wrapper = self._call_handler(self.ctx, event, handler.handler)
+                async for ret in wrapper:
+                    yield ret
+            except BaseException:
+                logger.error(traceback.format_exc())
+            
         
         # 需要再获取一次。插件可能直接对 chain 进行了替换。
         result = event.get_result()
@@ -82,12 +93,16 @@ class ResultDecorateStage(Stage):
                                 # 不分段回复
                                 new_chain.append(comp)
                                 continue
-                            split_response = re.findall(self.regex, comp.text)
+                            split_response = []
+                            for line in comp.text.split("\n"):
+                                split_response.extend(re.findall(self.regex, line))
                             if not split_response:
                                 new_chain.append(comp)
                                 continue
                             for seg in split_response:
-                                if seg:
+                                if self.content_cleanup_rule:
+                                    seg = re.sub(self.content_cleanup_rule, "", seg)
+                                if seg.strip():
                                     new_chain.append(Plain(seg))
                         else:
                             # 非 Plain 类型的消息段不分段
@@ -137,12 +152,32 @@ class ResultDecorateStage(Stage):
                     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
+            # 触发转发消息
+            has_forwarded = False
+            if event.get_platform_name() == 'aiocqhttp':
+                word_cnt = 0
+                for comp in result.chain:
+                    if isinstance(comp, Plain):
+                        word_cnt += len(comp.text)
+                if word_cnt > self.forward_threshold:
+                    node = Node(
+                        uin=event.get_self_id(),
+                        name="AstrBot",
+                        content=[
+                            *result.chain
+                        ]
+                    )
+                    result.chain = [node]
+                    has_forwarded = True
             
-            # 引用回复
-            if self.reply_with_quote:
-                result.chain.insert(0, Reply(id=event.message_obj.message_id))
+            if not has_forwarded:
+                # 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:
+                    if not any(isinstance(item, File) for item in result.chain):
+                        result.chain.insert(0, Reply(id=event.message_obj.message_id))

astrbot/core/pipeline/scheduler.py

@@ -12,14 +12,14 @@ class PipelineScheduler():
         
     async def initialize(self):
         for stage in registered_stages:
-            logger.debug(f"初始化阶段 {stage.__class__ .__name__}")
+            # logger.debug(f"初始化阶段 {stage.__class__ .__name__}")
             
             await stage.initialize(self.ctx)
             
     async def _process_stages(self, event: AstrMessageEvent, from_stage=0):
         for i in range(from_stage, len(registered_stages)):
             stage = registered_stages[i]
-            logger.debug(f"执行阶段 {stage.__class__ .__name__}")
+            # logger.debug(f"执行阶段 {stage.__class__ .__name__}")
             coro = stage.process(event)
             if isinstance(coro, AsyncGenerator):
                 async for _ in coro:

astrbot/core/pipeline/stage.py

@@ -36,16 +36,17 @@ class Stage(abc.ABC):
         ctx: PipelineContext,
         event: AstrMessageEvent, 
         handler: Awaitable,
-        **params
+        *args,
+        **kwargs,
     ) -> AsyncGenerator[None, None]:
         '''调用 Handler。'''
         # 判断 handler 是否是类方法（通过装饰器注册的没有 __self__ 属性）
         ready_to_call = None
         try:
-            ready_to_call = handler(event, **params)
+            ready_to_call = handler(event, *args, **kwargs)
         except TypeError as e:
             # 向下兼容
-            ready_to_call = handler(event, ctx.plugin_manager.context, **params)
+            ready_to_call = handler(event, ctx.plugin_manager.context, *args, **kwargs)
         
         if isinstance(ready_to_call, AsyncGenerator):
             async for ret in ready_to_call:

astrbot/core/pipeline/waking_check/stage.py

@@ -5,6 +5,7 @@ from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.message.message_event_result import MessageEventResult, MessageChain
 from astrbot.core.message.components import At, Reply
 from astrbot.core.star.star_handler import star_handlers_registry, EventType
+from astrbot.core.star.star import star_map
 from astrbot.core.star.filter.command_group import CommandGroupFilter
 from astrbot.core.star.filter.permission import PermissionTypeFilter
 
@@ -76,34 +77,17 @@ class WakingCheckStage(Stage):
         # 检查插件的 handler filter
         activated_handlers = []
         handlers_parsed_params = {}  # 注册了指令的 handler
+        
         for handler in star_handlers_registry.get_handlers_by_event_type(EventType.AdapterMessageEvent):
-            # filter 需要满足 AND 的逻辑关系
-            passed = True
-            child_command_handler_md = None
-            
+            # filter 需满足 AND 逻辑关系
+            passed = True            
             permission_not_pass = False
-            
             if len(handler.event_filters) == 0:
-                # 不可能有这种情况, 也不允许有这种情况
-                continue
-            
-            if 'sub_command' in handler.extras_configs:
-                # 如果是子指令
                 continue
 
             for filter in handler.event_filters:
                 try:
-                    if isinstance(filter, CommandGroupFilter):
-                        """如果指令组过滤成功, 会返回叶子指令的 StarHandlerMetadata"""
-                        ok, child_command_handler_md = filter.filter(
-                            event, self.ctx.astrbot_config
-                        )
-                        if not ok:
-                            passed = False
-                        else:
-                            handler = child_command_handler_md  # handler 覆盖
-                            break
-                    elif isinstance(filter, PermissionTypeFilter):
+                    if isinstance(filter, PermissionTypeFilter):
                         if not filter.filter(event, self.ctx.astrbot_config):
                             permission_not_pass = True
                     else:
@@ -111,19 +95,15 @@ class WakingCheckStage(Stage):
                             passed = False
                             break
                 except Exception as e:
-                    # event.set_result(MessageEventResult().message(f"插件 {handler.handler_full_name} 报错：{e}"))
-                    # yield
                     await event.send(
                         MessageEventResult().message(
-                            f"插件 {handler.handler_full_name} 报错：{e}"
+                            f"插件 {star_map[handler.handler_module_path].name}: {e}"
                         )
                     )
                     event.stop_event()
                     passed = False
                     break
-
             if passed:
-                
                 if permission_not_pass:
                     if self.no_permission_reply:
                         await event.send(MessageChain().message(f"ID {event.get_sender_id()} 权限不足。通过 /sid 获取 ID 并请管理员添加。"))
@@ -138,6 +118,7 @@ class WakingCheckStage(Stage):
                     handlers_parsed_params[handler.handler_full_name] = event.get_extra(
                         "parsed_params"
                     )
+                    
             event.clear_extra()
 
         event.set_extra("activated_handlers", activated_handlers)

astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py

@@ -2,6 +2,7 @@ import os
 import time
 import asyncio
 import logging
+import uuid
 from typing import Awaitable, Any
 from aiocqhttp import CQHttp, Event
 from astrbot.api.platform import Platform, AstrBotMessage, MessageMember, MessageType, PlatformMetadata
@@ -46,18 +47,81 @@ class AiocqhttpAdapter(Platform):
         await super().send_by_session(session, message_chain)
         
     async def convert_message(self, event: Event) -> AstrBotMessage:
+        logger.debug(f"[aiocqhttp] RawMessage {event}")
+        
+        if event['post_type'] == 'message':
+            abm = await self._convert_handle_message_event(event)
+        elif event['post_type'] == 'notice':
+            abm = await self._convert_handle_notice_event(event)
+        elif event['post_type'] == 'request':
+            abm = await self._convert_handle_request_event(event)
+        
+        return abm
+    
+    async def _convert_handle_request_event(self, event: Event) -> AstrBotMessage:
+        '''OneBot V11 请求类事件'''
         abm = AstrBotMessage()
         abm.self_id = str(event.self_id)
-        abm.tag = "aiocqhttp"
+        abm.sender = MessageMember(
+            user_id=event.user_id,
+            nickname=event.user_id
+        )
+        abm.type = MessageType.OTHER_MESSAGE
+        if 'group_id' in event and event['group_id']:
+            abm.type = MessageType.GROUP_MESSAGE
+            abm.group_id = str(event.group_id)
+        else:
+            abm.type = MessageType.FRIEND_MESSAGE
+        if self.unique_session and abm.type == MessageType.GROUP_MESSAGE:
+            abm.session_id = abm.sender.user_id + "_" + str(event.group_id)
+        abm.message_str = ''
+        abm.message = []
+        abm.timestamp = int(time.time())
+        abm.message_id = uuid.uuid4().hex
+        abm.raw_message = event
+        return abm
+    
+    async def _convert_handle_notice_event(self, event: Event) -> AstrBotMessage:
+        '''OneBot V11 通知类事件'''
+        abm = AstrBotMessage()
+        abm.self_id = str(event.self_id)
+        abm.sender = MessageMember(
+            user_id=event.user_id,
+            nickname=event.user_id
+        )
+        abm.type = MessageType.OTHER_MESSAGE
+        if 'group_id' in event and event['group_id']:
+            abm.group_id = str(event.group_id)
+            abm.type = MessageType.GROUP_MESSAGE
+        else:
+            abm.type = MessageType.FRIEND_MESSAGE    
+        if self.unique_session and abm.type == MessageType.GROUP_MESSAGE:
+            abm.session_id = abm.sender.user_id + "_" + str(event.group_id) # 也保留群组 id
+        else:
+            abm.session_id = str(event.group_id) if abm.type == MessageType.GROUP_MESSAGE else abm.sender.user_id
+        abm.message_str = ""
+        abm.message = []
+        abm.raw_message = event
+        abm.timestamp = int(time.time())
+        abm.message_id = uuid.uuid4().hex
         
-        abm.sender = MessageMember(str(event.sender['user_id']), event.sender['nickname'])        
-
+        if 'sub_type' in event:
+            if event['sub_type'] == 'poke' and 'target_id' in event:
+                abm.message.append(Poke(qq=str(event['target_id']), type='poke')) # noqa: F405
+                
+        return abm
+    
+    
+    async def _convert_handle_message_event(self, event: Event) -> AstrBotMessage:
+        '''OneBot V11 消息类事件'''
+        abm = AstrBotMessage()
+        abm.self_id = str(event.self_id)
+        abm.sender = MessageMember(str(event.sender['user_id']), event.sender['nickname'])      
         if event['message_type'] == 'group':
             abm.type = MessageType.GROUP_MESSAGE
             abm.group_id = str(event.group_id)
         elif event['message_type'] == 'private':
             abm.type = MessageType.FRIEND_MESSAGE
-        
         if self.unique_session and abm.type == MessageType.GROUP_MESSAGE:
             abm.session_id = abm.sender.user_id + "_" + str(event.group_id) # 也保留群组 id
         else:
@@ -75,7 +139,8 @@ class AiocqhttpAdapter(Platform):
             except BaseException as e:
                 logger.error(f"回复消息失败: {e}")
             return
-        logger.debug(f"aiocqhttp: 收到消息: {event.message}")
+        
+        # 按消息段类型类型适配
         for m in event.message:
             t = m['type']
             a = None
@@ -118,6 +183,7 @@ class AiocqhttpAdapter(Platform):
         abm.timestamp = int(time.time())
         abm.message_str = message_str
         abm.raw_message = event
+        
         return abm
     
     def run(self) -> Awaitable[Any]:
@@ -127,6 +193,19 @@ class AiocqhttpAdapter(Platform):
             self.port = 6199
             
         self.bot = CQHttp(use_ws_reverse=True, import_name='aiocqhttp', api_timeout_sec=180)
+        
+        @self.bot.on_request()
+        async def request(event: Event):
+            abm = await self.convert_message(event)
+            if abm:
+                await self.handle_msg(abm)
+        
+        @self.bot.on_notice()
+        async def notice(event: Event):
+            abm = await self.convert_message(event)
+            if abm:
+                await self.handle_msg(abm)
+        
         @self.bot.on_message('group')
         async def group(event: Event):
             abm = await self.convert_message(event)

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

@@ -51,6 +51,8 @@ class SimpleGewechatClient():
         self.event_queue = event_queue
         
         self.multimedia_downloader = None
+        
+        self.userrealnames = {}
     
     async def get_token_id(self):
         async with aiohttp.ClientSession() as session:
@@ -118,10 +120,25 @@ class SimpleGewechatClient():
         if at_me:
             abm.message.insert(0, At(qq=abm.self_id))
         
-        user_real_name = d.get('PushContent', 'unknown : ').split(' : ')[0] \
-            .replace('在群聊中@了你', '') \
-            .replace('在群聊中发了一段语音', '') \
-            .replace('在群聊中发了一张图片', '') # 真实昵称
+        # 解析用户真实名字
+        user_real_name = "unknown"
+        if abm.group_id:
+            if abm.group_id not in self.userrealnames or user_id not in self.userrealnames[abm.group_id]:
+                # 获取群成员列表，并且缓存
+                if abm.group_id not in self.userrealnames:
+                    self.userrealnames[abm.group_id] = {}
+                member_list = await self.get_chatroom_member_list(abm.group_id)
+                logger.debug(f"获取到 {abm.group_id} 的群成员列表。")
+                if member_list and 'memberList' in member_list:
+                    for member in member_list['memberList']:
+                        self.userrealnames[abm.group_id][member['wxid']] = member['nickName']
+                if user_id in self.userrealnames[abm.group_id]:
+                    user_real_name = self.userrealnames[abm.group_id][user_id]
+            else:
+                user_real_name = self.userrealnames[abm.group_id][user_id]
+        else:
+            user_real_name = d.get('PushContent', 'unknown : ').split(' : ')[0]
+
         abm.sender = MessageMember(user_id, user_real_name)
         abm.raw_message = d
         abm.message_str = ""
@@ -313,6 +330,23 @@ class SimpleGewechatClient():
             self.appid = appid
             logger.info(f"已保存 APPID: {appid}")
     
+    '''API'''
+    
+    async def get_chatroom_member_list(self, chatroom_wxid: str):
+        payload = {
+            "appId": self.appid,
+            "chatroomId": chatroom_wxid
+        }
+        
+        async with aiohttp.ClientSession() as session:
+            async with session.post(
+                f"{self.base_url}/group/getChatroomMemberList",
+                headers=self.headers,
+                json=payload
+            ) as resp:
+                json_blob = await resp.json()
+                return json_blob['data']
+    
     async def post_text(self, to_wxid, content: str, ats: str = ""):
         payload = {
             "appId": self.appid,

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

@@ -134,6 +134,6 @@ class GewechatPlatformEvent(AstrMessageEvent):
             elif isinstance(comp, At):
                 pass
             else:
-                logger.error(f"gewechat 暂不支持发送消息类型: {comp.type}")   
+                logger.debug(f"gewechat 忽略: {comp.type}")   
         
         await super().send(message)

astrbot/core/platform/sources/qqofficial/qqofficial_message_event.py

@@ -5,7 +5,7 @@ import botpy.types.message
 from astrbot.core.utils.io import file_to_base64, download_image_by_url
 from astrbot.api.event import AstrMessageEvent, MessageChain
 from astrbot.api.platform import AstrBotMessage, PlatformMetadata
-from astrbot.api.message_components import Plain, Image, Reply
+from astrbot.api.message_components import Plain, Image
 from botpy import Client
 from botpy.http import Route
 from astrbot.api import logger
@@ -33,19 +33,6 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         if not plain_text and not image_base64 and not image_path:
             return
         
-        ref = None
-        for i in self.send_buffer.chain:
-            if isinstance(i, Reply):
-                try:
-                    ref = self.message_obj.raw_message.message_reference
-                    ref = botpy.types.message.Reference(
-                        message_id=ref.message_id,
-                        ignore_get_message_error=False
-                    )
-                except BaseException as _:
-                    pass
-                break
-        
         payload = {
             'content': plain_text,
             'msg_id': self.message_obj.message_id,
@@ -53,30 +40,22 @@ class QQOfficialMessageEvent(AstrMessageEvent):
         
         match type(source):
             case botpy.message.GroupMessage:
-                if ref:
-                    payload['message_reference'] = ref
                 if image_base64:
                     media = await self.upload_group_and_c2c_image(image_base64, 1, group_openid=source.group_openid)
                     payload['media'] = media
                     payload['msg_type'] = 7
                 await self.bot.api.post_group_message(group_openid=source.group_openid, **payload)
             case botpy.message.C2CMessage:
-                if ref:
-                    payload['message_reference'] = ref
                 if image_base64:
                     media = await self.upload_group_and_c2c_image(image_base64, 1, openid=source.author.user_openid)
                     payload['media'] = media
                     payload['msg_type'] = 7
                 await self.bot.api.post_c2c_message(openid=source.author.user_openid, **payload)
             case botpy.message.Message:
-                if ref:
-                    payload['message_reference'] = ref
                 if image_path:
                     payload['file_image'] = image_path
                 await self.bot.api.post_message(channel_id=source.channel_id, **payload)
             case botpy.message.DirectMessage:
-                if ref:
-                    payload['message_reference'] = ref
                 if image_path:
                     payload['file_image'] = image_path
                 await self.bot.api.post_dms(guild_id=source.guild_id, **payload)
@@ -119,5 +98,5 @@ class QQOfficialMessageEvent(AstrMessageEvent):
                     image_base64 = file_to_base64(i.file).replace("base64://", "")
                     image_file_path = i.file
             else:
-                logger.error(f"qq_official 暂不支持发送消息类型 {i.type}")
+                logger.debug(f"qq_official 忽略 {i.type}")
         return plain_text, image_base64, image_file_path

astrbot/core/platform/sources/webchat/webchat_event.py

@@ -39,6 +39,6 @@ class WebChatMessageEvent(AstrMessageEvent):
                             f.write(f2.read())
                 web_chat_back_queue.put_nowait((f"[IMAGE]{filename}", cid))
             else:
-                logger.error(f"webchat 暂不支持发送消息类型: {comp.type}")
+                logger.debug(f"webchat 忽略: {comp.type}")
         web_chat_back_queue.put_nowait(None)
         await super().send(message)

astrbot/core/provider/sources/dify_source.py

@@ -31,6 +31,9 @@ class ProviderDify(Provider):
             raise Exception("Dify API 类型不能为空。")
         self.model_name = "dify"
         self.workflow_output_key = provider_config.get("dify_workflow_output_key", "astrbot_wf_output")
+        self.dify_query_input_key = provider_config.get("dify_query_input_key", "astrbot_text_query")
+        if not self.dify_query_input_key:
+            self.dify_query_input_key = "astrbot_text_query"
         self.timeout = provider_config.get("timeout", 120)
         if isinstance(self.timeout, str):
             self.timeout = int(self.timeout)
@@ -95,7 +98,7 @@ class ProviderDify(Provider):
             case "workflow":
                 async for chunk in self.api_client.workflow_run(
                     inputs={
-                        "astrbot_text_query": prompt,
+                        self.dify_query_input_key: prompt,
                         "astrbot_session_id": session_id,
                         **session_var
                     },
@@ -121,7 +124,7 @@ class ProviderDify(Provider):
         return LLMResponse(role="assistant", completion_text=result)
 
     async def forget(self, session_id):
-        self.conversation_ids.pop(session_id, None)
+        self.conversation_ids[session_id] = ""
         return True
 
     async def get_current_key(self):

astrbot/core/provider/sources/gemini_source.py

@@ -1,5 +1,6 @@
 import base64
 import aiohttp
+import random
 from astrbot.core.utils.io import download_image_by_url
 from astrbot.core.db import BaseDatabase
 from astrbot.api.provider import Provider, Personality
@@ -138,8 +139,7 @@ class ProviderGoogleGenAI(Provider):
                     "role": "model",
                     "parts": [{"text": message["content"]}]
                 })
-                
-        
+
         logger.debug(f"google_genai_conversation: {google_genai_conversation}")
         
         result = await self.client.generate_content(
@@ -194,33 +194,49 @@ class ProviderGoogleGenAI(Provider):
             **model_config
         }
         llm_response = None
-        try:
-            llm_response = await self._query(payloads, func_tool)
-        except Exception as e:
-            if "maximum context length" in str(e):
-                retry_cnt = 20
-                while retry_cnt > 0:
-                    logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。当前记录条数: {len(context_query)}")
-                    try:
-                        await self.pop_record(context_query)
-                        llm_response = await self._query(payloads, func_tool)
-                        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 "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
+        
+        retry = 10
+        keys = self.api_keys.copy()
+        chosen_key = random.choice(keys)
+        
+        for i in range(retry):
+            try:
+                self.client.api_key = chosen_key 
+                llm_response = await self._query(payloads, func_tool)
+                break
+            except Exception as e:
+                if "maximum context length" in str(e):
+                    retry_cnt = 20
+                    while retry_cnt > 0:
+                        logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。当前记录条数: {len(context_query)}")
+                        try:
+                            await self.pop_record(context_query)
+                            llm_response = await self._query(payloads, func_tool)
+                            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 "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)
+                elif "429" in str(e) or "API key not valid" in str(e):
+                    keys.remove(chosen_key)
+                    if len(keys) > 0:
+                        chosen_key = random.choice(keys)
+                        logger.info(f"检测到 Key 异常({str(e)})，正在尝试更换 API Key 重试... 当前 Key: {chosen_key[:12]}...")
+                        continue
+                    else:
+                        logger.error(f"A检测到 Key 异常({str(e)})，且已没有可用的 Key。 当前 Key: {chosen_key[:12]}...")
+                        raise Exception("API 资源已耗尽，且没有可用的 Key 重试...")
+                else:
+                    logger.error(f"发生了错误(gemini_source)。Provider 配置如下: {self.provider_config}")
+                    raise e
 
         return llm_response
 

astrbot/core/star/filter/command.py

@@ -1,19 +1,23 @@
 
 import re
 import inspect
+from typing import List, Any, Type, Dict
 from . import HandlerFilter
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.config import AstrBotConfig
-from astrbot.core.utils.param_validation_mixin import ParameterValidationMixin
+from .custom_filter import CustomFilter
 from ..star_handler import StarHandlerMetadata
 
 # 标准指令受到 wake_prefix 的制约。
-class CommandFilter(HandlerFilter, ParameterValidationMixin):
+class CommandFilter(HandlerFilter):
     '''标准指令过滤器'''
-    def __init__(self, command_name: str, handler_md: StarHandlerMetadata = None):
+    def __init__(self, command_name: str, alias: set = None, handler_md: StarHandlerMetadata = None, parent_command_names: List[str] = [""]):
         self.command_name = command_name
+        self.alias = alias if alias else set()
+        self.parent_command_names = parent_command_names
         if handler_md:
             self.init_handler_md(handler_md)
+        self.custom_filter_list: List[CustomFilter] = []
             
     def print_types(self):
         result = ""
@@ -22,6 +26,7 @@ class CommandFilter(HandlerFilter, ParameterValidationMixin):
                 result += f"{k}({v.__name__}),"
             else:
                 result += f"{k}({type(v).__name__})={v},"
+        result = result.rstrip(",")
         return result
                 
     def init_handler_md(self, handle_md: StarHandlerMetadata):
@@ -42,30 +47,82 @@ class CommandFilter(HandlerFilter, ParameterValidationMixin):
     def get_handler_md(self) -> StarHandlerMetadata:
         return self.handler_md
 
+    def add_custom_filter(self, custom_filter: CustomFilter):
+        self.custom_filter_list.append(custom_filter)
+
+    def custom_filter_ok(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> bool:
+        for custom_filter in self.custom_filter_list:
+            if not custom_filter.filter(event, cfg):
+                return False
+        return True
+    
+    def validate_and_convert_params(self, params: List[Any], param_type: Dict[str, Type]) -> Dict[str, Any]:
+        '''将参数列表 params 根据 param_type 转换为参数字典。
+        '''
+        result = {}
+        for i, (param_name, param_type_or_default_val) in enumerate(param_type.items()):
+            if i >= len(params):
+                if isinstance(param_type_or_default_val, Type) or param_type_or_default_val is inspect.Parameter.empty:
+                    # 是类型
+                    raise ValueError(f"必要参数缺失。该指令完整参数: {self.print_types()}")
+                else:
+                    # 是默认值
+                    result[param_name] = param_type_or_default_val
+            else:
+                # 尝试强制转换
+                try:
+                    if param_type_or_default_val is None:
+                        if params[i].isdigit():
+                            result[param_name] = int(params[i])
+                        else:
+                            result[param_name] = params[i]
+                    elif isinstance(param_type_or_default_val, str):
+                        # 如果 param_type_or_default_val 是字符串，直接赋值
+                        result[param_name] = params[i]
+                    elif isinstance(param_type_or_default_val, int):
+                        result[param_name] = int(params[i])
+                    elif isinstance(param_type_or_default_val, float):
+                        result[param_name] = float(params[i])
+                    else:
+                        result[param_name] = param_type_or_default_val(params[i])
+                except ValueError:
+                    raise ValueError(f"参数 {param_name} 类型错误。完整参数: {self.print_types()}")
+        return result
+
     def filter(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> bool:
         if not event.is_at_or_wake_command:
             return False
-        
-        if event.get_extra("parsing_command"):
-            message_str = event.get_extra("parsing_command").strip()
-        else:
-            message_str = event.get_message_str().strip()
-            
-        # 分割为列表（每个参数之间可能会有多个空格）
-        ls = re.split(r"\s+", message_str)
-        if self.command_name != ls[0]:
+
+        if not self.custom_filter_ok(event, cfg):
             return False
-        # if len(self.handler_params) == 0 and len(ls) > 1:
-        #     # 一定程度避免 LLM 聊天时误判为指令
-        #     return False
-        # params_str = message_str[len(self.command_name):].strip()
-        ls = ls[1:]
+        
+        # 检查是否以指令开头
+        message_str = re.sub(r"\s+", " ", event.get_message_str().strip())
+        candidates = [self.command_name] + list(self.alias)
+        ok = False
+        for candidate in candidates:
+            for parent_command_name in self.parent_command_names:
+                if parent_command_name:
+                    _full = f"{parent_command_name} {candidate}"
+                else:
+                    _full = candidate
+                if message_str.startswith(f"{_full} ") or message_str == _full:
+                    message_str = message_str[len(_full):].strip()
+                    ok = True
+                    break
+        
+        print(message_str, self.command_name, self.alias, self.parent_command_names, ok)
+                
+        if not ok:
+            return False
+
+        # 分割为列表
+        ls = message_str.split(" ")
         # 去除空字符串
         ls = [param for param in ls if param]
         params = {}
         try:
             params = self.validate_and_convert_params(ls, self.handler_params)
-            
         except ValueError as e:
             raise e
         

astrbot/core/star/filter/command_group.py

@@ -6,72 +6,97 @@ from . import HandlerFilter
 from .command import CommandFilter
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.config import AstrBotConfig
+from .custom_filter import CustomFilter
 from ..star_handler import StarHandlerMetadata
 
 # 指令组受到 wake_prefix 的制约。
 class CommandGroupFilter(HandlerFilter):
-    def __init__(self, group_name: str):
+    def __init__(self, group_name: str, alias: set = None, parent_group: CommandGroupFilter = None):
         self.group_name = group_name
+        self.alias = alias if alias else set()
         self.sub_command_filters: List[Union[CommandFilter, CommandGroupFilter]] = []
+        self.custom_filter_list: List[CustomFilter] = []
+        self.parent_group = parent_group
     
     def add_sub_command_filter(self, sub_command_filter: Union[CommandFilter, CommandGroupFilter]):
         self.sub_command_filters.append(sub_command_filter)
-    
+
+    def add_custom_filter(self, custom_filter: CustomFilter):
+        self.custom_filter_list.append(custom_filter)
+
+    def get_complete_command_names(self) -> List[str]:
+        '''遍历父节点获取完整的指令名。
+        
+        新版本 v3.4.29 采用预编译指令，不再从指令组递归遍历子指令，因此这个方法是返回包括别名在内的整个指令名列表。'''
+        parent_cmd_names = self.parent_group.get_complete_command_names() if self.parent_group else []
+        
+        if not parent_cmd_names:
+            # 根节点
+            return [self.group_name] + list(self.alias)
+        
+        result = []
+        candidates = [self.group_name] + list(self.alias)
+        for parent_cmd_name in parent_cmd_names:
+            for candidate in candidates:
+                result.append(parent_cmd_name + " " + candidate)
+        return result
+        
+
     # 以树的形式打印出来
-    def print_cmd_tree(self, sub_command_filters: List[Union[CommandFilter, CommandGroupFilter]], prefix: str = "") -> str:
+    def print_cmd_tree(self,
+        sub_command_filters: List[Union[CommandFilter, CommandGroupFilter]],
+        prefix: str = "",
+        event: AstrMessageEvent = None,
+        cfg: AstrBotConfig = None,
+    ) -> str:
         result = ""
         for sub_filter in sub_command_filters:
             if isinstance(sub_filter, CommandFilter):
-                cmd_th = sub_filter.print_types()
-                result += f"{prefix}├── {sub_filter.command_name}"
-                if cmd_th:
-                    result += f" ({cmd_th})"
-                else:
-                    result += " (无参数指令)"
-                
-                result += "\n"
+                custom_filter_pass = True
+                if event and cfg:
+                    custom_filter_pass = sub_filter.custom_filter_ok(event, cfg)
+                if custom_filter_pass:
+                    cmd_th = sub_filter.print_types()
+                    result += f"{prefix}├── {sub_filter.command_name}"
+                    if cmd_th:
+                        result += f" ({cmd_th})"
+                    else:
+                        result += " (无参数指令)"
+                    
+                    if sub_filter.handler_md and sub_filter.handler_md.desc:
+                        result += f": {sub_filter.handler_md.desc}"
+
+                    result += "\n"
             elif isinstance(sub_filter, CommandGroupFilter):
-                result += f"{prefix}├── {sub_filter.group_name}"
-                result += "\n"
-                result += sub_filter.print_cmd_tree(sub_filter.sub_command_filters, prefix+"│   ")
+                custom_filter_pass = True
+                if event and cfg:
+                    custom_filter_pass = sub_filter.custom_filter_ok(event, cfg)
+                if custom_filter_pass:
+                    result += f"{prefix}├── {sub_filter.group_name}"
+                    result += "\n"
+                    result += sub_filter.print_cmd_tree(sub_filter.sub_command_filters, prefix+"│   ", event=event, cfg=cfg)
+
         return result
-        
-    def filter(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> Tuple[bool, StarHandlerMetadata]:
+
+    def custom_filter_ok(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> bool:
+        for custom_filter in self.custom_filter_list:
+            if not custom_filter.filter(event, cfg):
+                return False
+        return True
+
+    def filter(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> bool:
         if not event.is_at_or_wake_command:
-            return False, None
-        
-        if event.get_extra("parsing_command"):
-            message_str = event.get_extra("parsing_command").strip()
-        else:
-            message_str = event.get_message_str().strip()
-        
-        ls = re.split(r"\s+", message_str)
-        
-        if ls[0] != self.group_name:
-            return False, None
-        # 改写 message_str
-        ls = ls[1:]
-        # event.message_str = " ".join(ls)
-        # event.message_str = event.message_str.strip()
-        parsing_command = " ".join(ls)
-        parsing_command = parsing_command.strip()
-        event.set_extra("parsing_command", parsing_command)
-        
-        if parsing_command == "":
-            # 当前还是指令组
-            tree = self.group_name + "\n" + self.print_cmd_tree(self.sub_command_filters)
+            return False
+
+        # 判断当前指令组的自定义过滤器
+        if not self.custom_filter_ok(event, cfg):
+            return False
+
+        complete_command_names = self.get_complete_command_names()
+        if event.message_str.strip() in complete_command_names:
+            tree = self.group_name + "\n" + self.print_cmd_tree(self.sub_command_filters, event=event, cfg=cfg)
             raise ValueError(f"指令组 {self.group_name} 未填写完全。这个指令组下有如下指令：\n"+tree)
         
-        child_command_handler_md = None
-        for sub_filter in self.sub_command_filters:
-            if isinstance(sub_filter, CommandFilter):
-                if sub_filter.filter(event, cfg):
-                    child_command_handler_md = sub_filter.get_handler_md()
-                    return True, child_command_handler_md
-            elif isinstance(sub_filter, CommandGroupFilter):
-                ok, handler = sub_filter.filter(event, cfg)
-                if ok:
-                    child_command_handler_md = handler
-                    return True, child_command_handler_md
-        tree = self.group_name + "\n" + self.print_cmd_tree(self.sub_command_filters)
-        raise ValueError(f"指令组 {self.group_name} 下没有找到对应的指令。这个指令组下有如下指令：\n"+tree)
+        # complete_command_names = [name + " " for name in complete_command_names]
+        # return event.message_str.startswith(tuple(complete_command_names))
+        return False

astrbot/core/star/filter/custom_filter.py

@@ -0,0 +1,53 @@
+from abc import abstractmethod, ABCMeta
+
+from . import HandlerFilter
+from astrbot.core.platform.astr_message_event import AstrMessageEvent
+from astrbot.core.config import AstrBotConfig
+
+class CustomFilterMeta(ABCMeta):
+    def __and__(cls, other):
+        if not issubclass(other, CustomFilter):
+            raise TypeError("Operands must be subclasses of CustomFilter.")
+        return CustomFilterAnd(cls(), other())
+
+    def __or__(cls, other):
+        if not issubclass(other, CustomFilter):
+            raise TypeError("Operands must be subclasses of CustomFilter.")
+        return CustomFilterOr(cls(), other())
+
+class CustomFilter(HandlerFilter, metaclass=CustomFilterMeta):
+    def __init__(self,  raise_error: bool = True, **kwargs):
+        self.raise_error = raise_error
+
+    @abstractmethod
+    def filter(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> bool:
+        ''' 一个用于重写的自定义Filter '''
+        raise NotImplementedError
+
+    def __or__(self, other):
+        return CustomFilterOr(self, other)
+
+    def __and__(self, other):
+        return CustomFilterAnd(self, other)
+
+class CustomFilterOr(CustomFilter):
+    def __init__(self, filter1: CustomFilter, filter2: CustomFilter):
+        super().__init__()
+        if not isinstance(filter1, (CustomFilter, CustomFilterAnd, CustomFilterOr)):
+            raise ValueError("CustomFilter lass can only operate with other CustomFilter.")
+        self.filter1 = filter1
+        self.filter2 = filter2
+
+    def filter(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> bool:
+        return self.filter1.filter(event, cfg) or self.filter2.filter(event, cfg)
+
+class CustomFilterAnd(CustomFilter):
+    def __init__(self, filter1: CustomFilter, filter2: CustomFilter):
+        super().__init__()
+        if not isinstance(filter1, (CustomFilter, CustomFilterAnd, CustomFilterOr)):
+            raise ValueError("CustomFilter lass can only operate with other CustomFilter.")
+        self.filter1 = filter1
+        self.filter2 = filter2
+
+    def filter(self, event: AstrMessageEvent, cfg: AstrBotConfig) -> bool:
+        return self.filter1.filter(event, cfg) and self.filter2.filter(event, cfg)

astrbot/core/star/register/__init__.py

@@ -6,6 +6,7 @@ from .star_handler import (
     register_platform_adapter_type,
     register_regex,
     register_permission_type,
+    register_custom_filter,
     register_on_llm_request,
     register_on_llm_response,
     register_llm_tool,
@@ -21,6 +22,7 @@ __all__ = [
     'register_platform_adapter_type',
     'register_regex',
     'register_permission_type',
+    'register_custom_filter',
     'register_on_llm_request',
     'register_on_llm_response',
     'register_llm_tool',

astrbot/core/star/register/star_handler.py

@@ -7,6 +7,7 @@ from ..filter.command_group import CommandGroupFilter
 from ..filter.event_message_type import EventMessageTypeFilter, EventMessageType
 from ..filter.platform_adapter_type import PlatformAdapterTypeFilter, PlatformAdapterType
 from ..filter.permission import PermissionTypeFilter, PermissionType
+from ..filter.custom_filter import CustomFilterAnd, CustomFilterOr
 from ..filter.regex import RegexFilter
 from typing import Awaitable
 from astrbot.core.provider.func_tool_manager import SUPPORTED_TYPES
@@ -50,21 +51,20 @@ def get_handler_or_create(
             star_handlers_registry.append(md)
         return md
 
-def register_command(command_name: str = None, *args, **kwargs):
+def register_command(command_name: str = None, sub_command: str = None, alias: set = None, **kwargs):
     '''注册一个 Command.
     '''
-    
-    # print("command: ", command_name, args, kwargs)
-    
     new_command = None
     add_to_event_filters = False
     if isinstance(command_name, RegisteringCommandable):
         # 子指令
-        new_command = CommandFilter(args[0], None)
+        parent_command_names = command_name.parent_group.get_complete_command_names()
+        logger.debug(f"parent_command_names: {parent_command_names}")
+        new_command = CommandFilter(sub_command, alias, None, parent_command_names=parent_command_names)
         command_name.parent_group.add_sub_command_filter(new_command)
     else:
         # 裸指令
-        new_command = CommandFilter(command_name, None)
+        new_command = CommandFilter(command_name, alias, None)
         add_to_event_filters = True
     
     def decorator(awaitable):
@@ -72,46 +72,96 @@ def register_command(command_name: str = None, *args, **kwargs):
             kwargs['sub_command'] = True # 打一个标记，表示这是一个子指令，再 wakingstage 阶段这个 handler 将会直接被跳过（其父指令会接管）
         handler_md = get_handler_or_create(awaitable, EventType.AdapterMessageEvent, **kwargs)
         new_command.init_handler_md(handler_md)
-        if add_to_event_filters:
-            # 裸指令
-            handler_md.event_filters.append(new_command)
-             
+        handler_md.event_filters.append(new_command)
         return awaitable
 
     return decorator
 
-def register_command_group(command_group_name: str = None, *args, **kwargs):
+
+def register_custom_filter(custom_type_filter, *args, **kwargs):
+    '''注册一个自定义的 CustomFilter
+
+    Args:
+        custom_type_filter: 在裸指令时为CustomFilter对象
+                                        在指令组时为父指令的RegisteringCommandable对象，即self或者command_group的返回
+        raise_error: 如果没有权限，是否抛出错误到消息平台，并且停止事件传播。默认为 True
+    '''
+    add_to_event_filters = False
+    raise_error = True
+
+    # 判断是否是指令组，指令组则添加到指令组的CommandGroupFilter对象中在waking_check的时候一起判断
+    if isinstance(custom_type_filter, RegisteringCommandable):
+        # 子指令, 此时函数为RegisteringCommandable对象的方法，首位参数为RegisteringCommandable对象的self。
+        parent_register_commandable = custom_type_filter
+        custom_filter = args[0]
+        if len(args) > 1:
+            raise_error = args[1]
+    else:
+        # 裸指令
+        add_to_event_filters = True
+        custom_filter = custom_type_filter
+        if args:
+            raise_error = args[0]
+
+    if not isinstance(custom_filter, (CustomFilterAnd, CustomFilterOr)):
+        custom_filter = custom_filter(raise_error)
+
+    def decorator(awaitable):
+        # 裸指令，子指令与指令组的区分，指令组会因为标记跳过wake。
+        if not add_to_event_filters and isinstance(awaitable, RegisteringCommandable) or \
+            (add_to_event_filters and isinstance(awaitable, RegisteringCommandable)):
+            # 指令组 与 根指令组，添加到本层的grouphandle中一起判断
+            awaitable.parent_group.add_custom_filter(custom_filter)
+        else:
+            handler_md = get_handler_or_create(awaitable, EventType.AdapterMessageEvent, **kwargs)
+
+            if not add_to_event_filters and not isinstance(awaitable, RegisteringCommandable):
+                # 底层子指令
+                handle_full_name = get_handler_full_name(awaitable)
+                for sub_handle in parent_register_commandable.parent_group.sub_command_filters:
+                    # 所有符合fullname一致的子指令handle添加自定义过滤器。
+                    # 不确定是否会有多个子指令有一样的fullname，比如一个方法添加多个command装饰器？
+                    sub_handle_md = sub_handle.get_handler_md()
+                    if sub_handle_md and sub_handle_md.handler_full_name == handle_full_name:
+                        sub_handle.add_custom_filter(custom_filter)
+
+            else:
+                # 裸指令
+                handler_md = get_handler_or_create(awaitable, EventType.AdapterMessageEvent, **kwargs)
+                handler_md.event_filters.append(custom_filter)
+
+        return awaitable
+    return decorator
+
+def register_command_group(
+    command_group_name: str = None, sub_command: str = None, alias: set = None, **kwargs
+):
     '''注册一个 CommandGroup
     '''
-    
-    # print("commandgroup: ", command_group_name,args,  kwargs)
-    
     new_group = None
-    add_to_event_filters = False
     if isinstance(command_group_name, RegisteringCommandable):
         # 子指令组
-        new_group = CommandGroupFilter(args[0])
+        new_group = CommandGroupFilter(sub_command, alias, parent_group=command_group_name.parent_group)
         command_group_name.parent_group.add_sub_command_filter(new_group)
     else:
         # 根指令组
-        new_group = CommandGroupFilter(command_group_name)
-        add_to_event_filters = True
+        new_group = CommandGroupFilter(command_group_name, alias)
     
     def decorator(obj):
-        if add_to_event_filters:
-            # 根指令组
-            handler_md = get_handler_or_create(obj, EventType.AdapterMessageEvent, **kwargs)
-            handler_md.event_filters.append(new_group)
-        
+        # 根指令组
+        handler_md = get_handler_or_create(obj, EventType.AdapterMessageEvent, **kwargs)
+        handler_md.event_filters.append(new_group)
+            
         return RegisteringCommandable(new_group)
 
     return decorator
 
 class RegisteringCommandable():
     '''用于指令组级联注册'''
-    group = register_command_group
-    command = register_command
-    
+    group: CommandGroupFilter = register_command_group
+    command: CommandFilter = register_command
+    custom_filter = register_custom_filter
+
     def __init__(self, parent_group: CommandGroupFilter):
         self.parent_group = parent_group
 

astrbot/core/utils/param_validation_mixin.py

@@ -1,36 +0,0 @@
-import inspect
-from typing import List, Dict, Any, Type
-
-class ParameterValidationMixin:
-    def validate_and_convert_params(self, params: List[Any], param_type: Dict[str, Type]) -> Dict[str, Any]:
-        '''将参数列表 params 根据 param_type 转换为参数字典。
-        '''
-        result = {}
-        for i, (param_name, param_type_or_default_val) in enumerate(param_type.items()):
-            if i >= len(params):
-                if isinstance(param_type_or_default_val, Type) or param_type_or_default_val is inspect.Parameter.empty:
-                    # 是类型
-                    raise ValueError(f"参数 {param_name} 缺失")
-                else:
-                    # 是默认值
-                    result[param_name] = param_type_or_default_val
-            else:
-                # 尝试强制转换
-                try:
-                    if param_type_or_default_val is None:
-                        if params[i].isdigit():
-                            result[param_name] = int(params[i])
-                        else:
-                            result[param_name] = params[i]
-                    elif isinstance(param_type_or_default_val, str):
-                        # 如果 param_type_or_default_val 是字符串，直接赋值
-                        result[param_name] = params[i]
-                    elif isinstance(param_type_or_default_val, int):
-                        result[param_name] = int(params[i])
-                    elif isinstance(param_type_or_default_val, float):
-                        result[param_name] = float(params[i])
-                    else:
-                        result[param_name] = param_type_or_default_val(params[i])
-                except ValueError:
-                    raise ValueError(f"参数 {param_name} 类型错误")
-        return result

astrbot/core/utils/t2i/renderer.py

@@ -22,7 +22,7 @@ class HtmlRenderer:
 
         @return: 图片 URL 或者文件路径，取决于 return_url 参数。
 
-        @example: 参见 https://astrbot.soulter.top 插件开发部分。
+        @example: 参见 https://astrbot.app 插件开发部分。
         '''
         local = locals()
         local.pop('self')

astrbot/dashboard/routes/plugin.py

@@ -113,11 +113,17 @@ class PluginRoute(Route):
                 for filter in handler.event_filters: # 正常handler就只有 1~2 个 filter，因此这里时间复杂度不会太高
                     if isinstance(filter, CommandFilter):
                         info["type"] = "指令"
-                        info["cmd"] = filter.command_name
+                        info["cmd"] = f"{filter.parent_command_names[0]} {filter.command_name}"
+                        info["cmd"] = info["cmd"].strip()
+                        if self.core_lifecycle.astrbot_config['wake_prefix'] and len(self.core_lifecycle.astrbot_config['wake_prefix']) > 0:
+                            info["cmd"] = f"{self.core_lifecycle.astrbot_config['wake_prefix'][0]}{info['cmd']}"
                     elif isinstance(filter, CommandGroupFilter):
                         info["type"] = "指令组"
-                        info["cmd"] = filter.group_name
+                        info["cmd"] = filter.get_complete_command_names()[0]
+                        info["cmd"] = info["cmd"].strip()
                         info["sub_command"] = filter.print_cmd_tree(filter.sub_command_filters)
+                        if self.core_lifecycle.astrbot_config['wake_prefix'] and len(self.core_lifecycle.astrbot_config['wake_prefix']) > 0:
+                            info["cmd"] = f"{self.core_lifecycle.astrbot_config['wake_prefix'][0]}{info['cmd']}"
                     elif isinstance(filter, RegexFilter):
                         info["type"] = "正则匹配"
                         info["cmd"] = filter.regex_str

changelogs/v3.4.28.md

@@ -0,0 +1,12 @@
+# What's Changed
+
+1. ✨ 新增: 管理面板支持搜索插件
+2. ✨ 新增: 支持传递 OneBot 的 notice, request 事件类型，如戳一戳，进退群请求等
+3. ✨ 新增: 插件支持自定义过滤算子 by @AraragiEro
+4. ✨ 新增: 添加命令和命令组的别名支持 by @Cvandia
+4. ✨ 新增: 提供了一个方法以删除分段回复后的某些字符，如末尾的标点符号。 by @Soulter and @Nothingness-Void
+5. ⚡ 优化: 优化了分段回复和回复时at,引用都打开时的一些体验性问题
+7. 🐛 修复: 分段回复导致了不完全的非 LLM 输出 #503
+8. 🐛 修复: 添加 no_proxy 环境变量以支持本地请求, 修复在代理状态下时的 502 错误当通过 LMStudio, Ollama 本地部署 LLM 时 #504 #514
+9. 💡🐛 修复: 修复转发消息的字数阈值功能 #510
+10. 💡🐛 修复: 修复 Dify 下无法主动回复的问题 #494

changelogs/v3.4.29.md

@@ -0,0 +1,14 @@
+# What's Changed
+
+1. ✨ 新增: gemini source 初步支持对 API Key 进行负载均衡请求 #534
+2. ✨ 新增: 开启对话隔离的群聊以及私聊下，非 op 可以可以使用 /del 和 /reset #519
+3. ✨ 新增: 事件钩子支持 yield 方式发送消息
+4. ⚡ 优化: 查询模型列表时，可以显示当前使用的模型名称 #523
+5. ⚡ 优化: 更换为预编译指令的方式处理指令组指令
+6. 🐛 修复: resolve KeyError when current conversation is not in paginated list
+7. 🐛 修复: 修复指令组的情况下，Permission Filter 对子指令失效的问题
+8.  🐛 修复: 🐛 fix: 修复 reminder rm失败 #529
+9.  🐛 修复: 🐛 fix: reminder 时区问题 #529
+10. 🐛 修复: 修复 Dify 下无法主动回复的问题 #494
+11. 🐛 修复: 添加代码执行器 Docker 宿主机绝对路径配置及相关功能以修复 Docker 下无法使用代码执行器的问题 #525
+12. 🐛 修复: gewechat 微信群聊情况下可能导致 unknown 的问题 #537

dashboard/src/components/shared/ExtensionCard.vue

@@ -4,6 +4,7 @@ const props = defineProps({
   link: String,
   logo: String,
   has_update: Boolean,
+  activated: Boolean,
 });
 
 const open = (link: string | undefined) => {
@@ -16,8 +17,9 @@ const open = (link: string | undefined) => {
     <v-card-item style="padding: 10px 12px">
       <div class="d-sm-flex align-center justify-space-between">
         <img v-if="logo" :src="logo" alt="logo" style="width: 40px; height: 40px; margin-right: 8px;">
-        <v-card-title style="font-size: 16px;">{{ props.title }}</v-card-title>
+        <v-card-title style="font-size: 15px; max-width: 70%">{{ props.title }}</v-card-title>
         <v-spacer></v-spacer>
+        <v-icon color="success" v-if="!activated">mdi-cancel</v-icon>
         <v-icon color="success" v-if="has_update">mdi-arrow-up-bold</v-icon>
         <v-btn size="small" text="Read" variant="flat" border  @click="open(props.link)">帮助</v-btn>
       </div>

dashboard/src/layouts/full/vertical-sidebar/VerticalSidebar.vue

@@ -21,7 +21,7 @@ const sidebarMenu = shallowRef(sidebarItems);
     </div>
 
     <div style="position: absolute; bottom: 32px; width: 100%" class="text-center">
-      <v-list-item v-if="!customizer.mini_sidebar" href="https://astrbot.soulter.top/">
+      <v-list-item v-if="!customizer.mini_sidebar" href="https://astrbot.app/">
         <v-btn variant="plain" size="small">
           🤔 初次使用？点击查看文档！
         </v-btn>

dashboard/src/views/ConfigPage.vue

@@ -91,7 +91,7 @@ import config from '@/config';
 
       <div style="margin-left: 16px; padding-bottom: 16px">
         <small>不了解配置？请见 <a
-            href="https://astrbot.soulter.top/">官方文档</a>
+            href="https://astrbot.app/">官方文档</a>
           或 <a
             href="https://qm.qq.com/cgi-bin/qm/qr?k=EYGsuUTfe00_iOu9JTXS7_TEpMkXOvwv&jump_from=webapi&authKey=uUEMKCROfsseS+8IzqPjzV3y1tzy4AkykwTib2jNkOFdzezF9s9XknqnIaf3CDft">加群询问</a>。</small>
       </div>

dashboard/src/views/ExtensionPage.vue

@@ -10,8 +10,8 @@ import { max } from 'date-fns';
 
 <template>
   <v-row>
-    <v-alert style="margin: 16px" text="1. 如果因为网络问题安装失败，点击设置页选择 GitHub 加速地址。或前往仓库下载压缩包然后本地上传。" title="💡提示"
-      type="info" color="primary" variant="tonal">
+    <v-alert style="margin: 16px" text="1. 如果因为网络问题安装失败，点击设置页选择 GitHub 加速地址。或前往仓库下载压缩包然后本地上传。" title="💡提示" type="info"
+      color="primary" variant="tonal">
     </v-alert>
     <v-col cols="12" md="12">
       <div style="background-color: white; width: 100%; padding: 16px; border-radius: 10px;">
@@ -44,14 +44,14 @@ import { max } from 'date-fns';
           </v-dialog>
         </div>
       </div>
-    </v-col>  
+    </v-col>
     <v-col cols="12" md="6" lg="3" v-for="extension in extension_data.data">
       <ExtensionCard :key="extension.name" :title="extension.name" :link="extension.repo" :logo="extension?.logo"
-        :has_update="extension.has_update" style="margin-bottom: 4px;">
+        :has_update="extension.has_update" style="margin-bottom: 4px;" :activated="extension.activated">
         <div style="min-height: 140px; max-height: 140px; overflow: auto;">
           <div>
             <span style="font-weight: bold  ;">By @{{ extension.author }}</span>
-            <span> | 插件有 {{ extension.handlers.length }} 个行为</span>
+            <span> | {{ extension.handlers.length }} 个行为</span>
           </div>
           <span> 当前: <v-chip size="small" color="primary">{{ extension.version }}</v-chip>
             <span v-if="extension.online_version">
@@ -82,51 +82,88 @@ import { max } from 'date-fns';
         </div>
       </ExtensionCard>
     </v-col>
-    <v-col cols="12" md="12">
-      <div style="background-color: white; width: 100%; padding: 16px; border-radius: 10px;">
-        <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>
-          <v-btn icon @click="isListView = !isListView" size="small" style="margin-left: auto;" variant="plain">
-            <v-icon>{{ isListView ? 'mdi-view-grid' : 'mdi-view-list' }}</v-icon>
-          </v-btn>
-        </div>
-      </div>
-    </v-col>
 
     <v-col cols="12" md="12" v-if="announcement">
       <v-banner color="success" lines="one" :text="announcement" :stacked="false">
       </v-banner>
     </v-col>
 
-    <template v-if="isListView">
-      <v-col cols="12" md="12">
-        <v-data-table :headers="pluginMarketHeaders" :items="pluginMarketData" item-key="name">
-          <template v-slot:item.actions="{ item }">
-            <v-btn v-if="!item.installed" class="text-none mr-2" size="small" text="Read" variant="flat" border
-              @click="extension_url = item.repo; newExtension()">安装</v-btn>
-            <v-btn v-else class="text-none mr-2" size="small" text="Read" variant="flat" border disabled>已安装</v-btn>
-          </template>
-        </v-data-table>
-      </v-col>
-    </template>
-    <template v-else>
-      <v-col cols="12" md="6" lg="3" v-for="plugin in pluginMarketData">
-        <ExtensionCard :key="plugin.name" :title="plugin.name" :link="plugin.repo" style="margin-bottom: 4px;">
-          <div style="min-height: 130px; max-height: 130px; overflow: hidden;">
-            <p style="font-weight: bold;">By @{{ plugin.author }}</p>
-            {{ plugin.desc }}
-          </div>
-          <div class="d-flex align-center gap-2">
-            <v-btn v-if="!plugin.installed" class="text-none mr-2" size="small" text="Read" variant="flat" border
-              @click="extension_url = plugin.repo; newExtension()">安装</v-btn>
-            <v-btn v-else class="text-none mr-2" size="small" text="Read" variant="flat" border disabled>已安装</v-btn>
-          </div>
-        </ExtensionCard>
-      </v-col>
-    </template>
+    <v-col cols="12" md="12">
+      <v-card>
+        <v-card-title class="d-flex align-center pe-2">
+
+          🧩 插件市场
+
+          <v-btn icon size="small" style="margin-left: 8px" variant="plain">
+            <v-icon size="small">mdi-help</v-icon>
+            <v-tooltip activator="parent" location="start">
+              如无法显示，请打开 <a href="https://soulter.github.io/AstrBot_Plugins_Collection/plugins.json">链接</a> 复制想安装插件对应的
+              `repo`
+              链接然后点击右下角 + 号安装，或打开链接下载压缩包安装。
+            </v-tooltip>
+          </v-btn>
+
+          <v-btn icon @click="isListView = !isListView" size="small" style="margin-left: auto;" variant="plain">
+            <v-icon>{{ isListView ? 'mdi-view-grid' : 'mdi-view-list' }}</v-icon>
+          </v-btn>
+
+          <v-spacer></v-spacer>
+
+          <v-text-field v-model="marketSearch" density="compact" label="Search" prepend-inner-icon="mdi-magnify"
+            variant="solo-filled" flat hide-details single-line></v-text-field>
+        </v-card-title>
+
+        <v-divider></v-divider>
+
+        <template v-if="isListView">
+          <v-col cols="12" md="12">
+            <v-data-table :headers="pluginMarketHeaders" :items="pluginMarketData" item-key="name"
+              v-model:search="marketSearch" :filter-keys="['name']">
+              <template v-slot:item.name="{ item }">
+                <span v-if="item?.repo"><a :href="item?.repo" style="color: #000; text-decoration:none">{{ item.name }}</a></span>
+                <span v-else>{{ item.name}}</span>
+              </template>
+              <template v-slot:item.author="{ item }">
+                <span v-if="item?.social_link"><a :href="item?.social_link">{{ item.author}}</a></span>
+                <span v-else>{{ item.author}}</span>
+              </template>
+              <template v-slot:item.tags="{ item }">
+                <span v-if="item.tags.length === 0">无</span>
+                <v-chip v-for="tag in item.tags" :key="tag" color="primary" size="small">{{ tag }}</v-chip>
+              </template>
+              <template v-slot:item.actions="{ item }">
+                <v-btn v-if="!item.installed" class="text-none mr-2" size="small" text="Read" variant="flat" border
+                  @click="extension_url = item.repo; newExtension()">安装</v-btn>
+                <v-btn v-else class="text-none mr-2" size="small" text="Read" variant="flat" border disabled>已安装</v-btn>
+              </template>
+            </v-data-table>
+          </v-col>
+        </template>
+        <template v-else>
+          <v-row style="margin: 8px;">
+            <v-col cols="12" md="6" lg="3" v-for="plugin in pluginMarketData">
+              <ExtensionCard :key="plugin.name" :title="plugin.name" :link="plugin.repo" style="margin-bottom: 4px;">
+                <div style="min-height: 130px; max-height: 130px; overflow: hidden;">
+                  <p style="font-weight: bold;">By @{{ plugin.author }}</p>
+                  {{ plugin.desc }}
+                </div>
+
+                <div class="d-flex align-center gap-2">
+                  <v-btn v-if="!plugin.installed" class="text-none mr-2" size="small" text="Read" variant="flat"
+                    border @click="extension_url = plugin.repo; newExtension()">安装</v-btn>
+                  <v-btn v-else class="text-none mr-2" size="small" text="Read" variant="flat" border
+                    disabled>已安装</v-btn>
+                </div>
+              </ExtensionCard>
+            </v-col>
+          </v-row>
+
+        </template>
+
+      </v-card>
+
+    </v-col>
+
 
     <v-col style="margin-bottom: 16px;" cols="12" md="12">
       <small><a href="https://astrbot.app/dev/plugin.html">插件开发文档</a></small> |
@@ -314,7 +351,7 @@ export default {
         "config": {}
       },
       upload_file: null,
-      pluginMarketData: {},
+      pluginMarketData: [],
       loadingDialog: {
         show: false,
         title: "加载中...",
@@ -331,13 +368,15 @@ export default {
         { title: '具体类型', key: 'type' },
         { title: '触发方式', key: 'cmd' },
       ],
-      isListView: false,
+      isListView: true,
       pluginMarketHeaders: [
-        { title: '名称', value: 'name' },
-        { title: '描述', value: 'desc' },
-        { title: '作者', value: 'author' },
-        { title: '操作', value: 'actions', sortable: false }
+        { title: '名称', key: 'name', maxWidth: '150px' },
+        { title: '描述', key: 'desc', maxWidth: '250px' },
+        { title: '作者', key: 'author', maxWidth: '60px' },
+        { title: '标签', key: 'tags', maxWidth: '60px' },
+        { title: '操作', key: 'actions', sortable: false }
       ],
+      marketSearch: "",
       alreadyCheckUpdate: false
     }
   },
@@ -562,6 +601,8 @@ export default {
             "repo": res.data.data[key].repo,
             "installed": false,
             "version": res.data.data[key]?.version ? res.data.data[key].version : "未知",
+            "social_link": res.data.data[key]?.social_link,
+            "tags": res.data.data[key]?.tags ? res.data.data[key].tags : []
           })
         }
         this.pluginMarketData = data;

packages/astrbot/long_term_memory.py

@@ -125,10 +125,6 @@ class LongTermMemory:
         else:
             req.system_prompt += "You are now in a chatroom. The chat history is as follows: \n"
             req.system_prompt += chats_str
-            if self.image_caption:
-                req.system_prompt += (
-                    "The images sent by the members are displayed in text form above."
-                )
             
     async def after_req_llm(self, event: AstrMessageEvent):
         if event.unified_msg_origin not in self.session_chats:

packages/astrbot/main.py

@@ -6,8 +6,7 @@ import astrbot.api.star as star
 import astrbot.api.event.filter as filter
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
 from astrbot.api import sp
-from astrbot.api.platform import MessageType
-from astrbot.api.provider import Personality, ProviderRequest, LLMResponse
+from astrbot.api.provider import ProviderRequest
 from astrbot.core.provider.sources.dify_source import ProviderDify
 from astrbot.core.utils.io import download_dashboard, get_dashboard_version
 from astrbot.core.star.star_handler import star_handlers_registry, StarHandlerMetadata
@@ -40,7 +39,7 @@ class Main(star.Star):
     async def _query_astrbot_notice(self):
         try:
             async with aiohttp.ClientSession(trust_env=True) as session:
-                async with session.get("https://astrbot.soulter.top/notice.json", timeout=2) as resp:
+                async with session.get("https://astrbot.app/notice.json", timeout=2) as resp:
                     return (await resp.json())["notice"]
         except BaseException:
             return ""
@@ -97,6 +96,7 @@ AstrBot 指令:
     
     @tool.command("ls")
     async def tool_ls(self, event: AstrMessageEvent):
+        '''查看函数工具列表'''
         tm = self.context.get_llm_tool_manager()
         msg = "函数工具：\n"
         for tool in tm.func_list:
@@ -108,6 +108,7 @@ AstrBot 指令:
         
     @tool.command("on")
     async def tool_on(self, event: AstrMessageEvent, tool_name: str):
+        '''启用一个函数工具'''
         if self.context.activate_llm_tool(tool_name):
             event.set_result(MessageEventResult().message(f"激活工具 {tool_name} 成功。"))
         else:
@@ -115,6 +116,7 @@ AstrBot 指令:
             
     @tool.command("off")
     async def tool_off(self, event: AstrMessageEvent, tool_name: str):
+        '''停用一个函数工具'''
         if self.context.deactivate_llm_tool(tool_name):
             event.set_result(MessageEventResult().message(f"停用工具 {tool_name} 成功。"))
         else:
@@ -122,6 +124,7 @@ AstrBot 指令:
             
     @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)
@@ -129,6 +132,7 @@ AstrBot 指令:
 
     @filter.command("plugin")
     async def plugin(self, event: AstrMessageEvent, oper1: str = None, oper2: str = None):
+        '''插件管理'''
         if oper1 is None:
             plugin_list_info = "已加载的插件：\n"
             for plugin in self.context.get_all_stars():
@@ -190,6 +194,7 @@ AstrBot 指令:
 
     @filter.command("t2i")
     async def t2i(self, event: AstrMessageEvent):
+        '''开关文本转图片'''
         config = self.context.get_config()
         if config['t2i']:
             config['t2i'] = False
@@ -202,6 +207,7 @@ AstrBot 指令:
 
     @filter.command("tts")
     async def tts(self, event: AstrMessageEvent):
+        '''开关文本转语音'''
         config = self.context.get_config()
         if config['provider_tts_settings']['enable']:
             config['provider_tts_settings']['enable'] = False
@@ -214,6 +220,7 @@ AstrBot 指令:
     
     @filter.command("sid")
     async def sid(self, event: AstrMessageEvent):
+        '''获取会话 ID 和 管理员 ID'''
         sid = event.unified_msg_origin
         user_id = str(event.get_sender_id())
         ret = f"""SID: {sid} 此 ID 可用于设置会话白名单。/wl <SID> 添加白名单, /dwl <SID> 删除白名单。
@@ -223,6 +230,7 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("op")
     async def op(self, event: AstrMessageEvent, admin_id: str):
+        '''授权管理员。op <admin_id>'''
         self.context.get_config()['admins_id'].append(admin_id)
         self.context.get_config().save_config()
         event.set_result(MessageEventResult().message("授权成功。"))
@@ -230,6 +238,7 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("deop")
     async def deop(self, event: AstrMessageEvent, admin_id: str):
+        '''取消授权管理员。deop <admin_id>'''
         try:
             self.context.get_config()['admins_id'].remove(admin_id)
             self.context.get_config().save_config()
@@ -341,16 +350,20 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
             else:
                 event.set_result(MessageEventResult().message("无效的参数。"))
 
-    @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("reset")
     async def reset(self, message: AstrMessageEvent):
         '''重置 LLM 会话'''
+        is_unique_session = self.context.get_config()['platform_settings']['unique_session']
+        if message.get_group_id() and not is_unique_session and message.role != "admin":
+            # 群聊，没开独立会话，发送人不是管理员
+            message.set_result(MessageEventResult().message(f"会话处于群聊，并且未开启独立会话，并且您 (ID {message.get_sender_id()}) 不是管理员，因此没有权限重置当前对话。"))    
+            return
+        
         if not self.context.get_using_provider():
             message.set_result(MessageEventResult().message("未找到任何 LLM 提供商。请先配置。"))
             return
         
         provider = self.context.get_using_provider()
-        print(provider.meta())
         if provider and provider.meta().type == 'dify':
             assert isinstance(provider, ProviderDify)
             await provider.forget(message.unified_msg_origin)
@@ -394,6 +407,10 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
             for model in models:
                 ret += f"\n{i}. {model}"
                 i += 1
+            
+            curr_model = self.context.get_using_provider().get_model() or "无"
+            ret += f"\n当前模型: [{curr_model}]"
+                
             ret += "\nTips: 使用 /model <模型名/编号>，即可实时更换模型。如目标模型不存在于上表，请输入模型名。"
             message.set_result(MessageEventResult().message(ret).use_t2i(False))
         else:
@@ -419,7 +436,6 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
                 message.set_result(
                     MessageEventResult().message(f"切换模型到 {self.context.get_using_provider().get_model()}。"))
                 
-
     @filter.command("history")
     async def his(self, message: AstrMessageEvent, page: int = 1):
         '''查看对话记录'''
@@ -459,6 +475,7 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
         
         provider = self.context.get_using_provider()
         if provider and provider.meta().type == 'dify':
+            """原有的Dify处理逻辑保持不变"""
             ret = "Dify 对话列表:\n"
             assert isinstance(provider, ProviderDify)
             data = await provider.api_client.get_chat_convs(message.unified_msg_origin)
@@ -475,32 +492,45 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
             return
 
         size_per_page = 6
-        conversations = await self.context.conversation_manager.get_conversations(message.unified_msg_origin)
-        total_pages = len(conversations) // size_per_page
-        if len(conversations) % size_per_page != 0:
-            total_pages += 1
-        conversations = conversations[(page-1)*size_per_page:page*size_per_page]
+        """获取所有对话列表"""
+        conversations_all = await self.context.conversation_manager.get_conversations(message.unified_msg_origin)
+        """计算总页数"""
+        total_pages = (len(conversations_all) + size_per_page - 1) // size_per_page
+        """确保页码有效"""
+        page = max(1, min(page, total_pages))
+        """分页处理"""
+        start_idx = (page - 1) * size_per_page
+        end_idx = start_idx + size_per_page
+        conversations_paged = conversations_all[start_idx:end_idx]
         
         ret = "对话列表：\n---\n"
-        global_index = (page - 1) * size_per_page + 1
+        """全局序号从当前页的第一个开始"""
+        global_index = start_idx + 1  
         
+        """生成所有对话的标题字典"""
         _titles = {}
-        for conv in conversations:
-            
+        for conv in conversations_all:
             persona_id = conv.persona_id
-            if not persona_id and not persona_id == "[%None]":
+            if not persona_id or persona_id == "[%None]":
                 persona_id = self.context.provider_manager.selected_default_persona['name']
-            
             title = conv.title if conv.title else "新对话"
             _titles[conv.cid] = title
-            
+        
+        """遍历分页后的对话生成列表显示"""
+        for conv in conversations_paged:
+            persona_id = conv.persona_id
+            if not persona_id or persona_id == "[%None]":
+                persona_id = self.context.provider_manager.selected_default_persona['name']
+            title = _titles.get(conv.cid, "新对话")
             ret += f"{global_index}. {title}({conv.cid[:4]})\n  人格情景: {persona_id}\n  上次更新: {datetime.datetime.fromtimestamp(conv.updated_at).strftime('%m-%d %H:%M')}\n"
             global_index += 1
         
         ret += "---\n"
         curr_cid = await self.context.conversation_manager.get_curr_conversation_id(message.unified_msg_origin)
         if curr_cid:
-            ret += f"\n当前对话: {_titles[curr_cid]}({curr_cid[:4]})"
+            """从所有对话的标题字典中获取标题"""
+            title = _titles.get(curr_cid, "新对话")
+            ret += f"\n当前对话: {title}({curr_cid[:4]})"
         else:
             ret += "\n当前对话: 无"
         
@@ -509,11 +539,12 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
             ret += "\n会话隔离粒度: 个人"
         else:
             ret += "\n会话隔离粒度: 群聊"
-            
+        
         ret += f"\n第 {page} 页 | 共 {total_pages} 页"
         ret += "\n*输入 /ls 2 跳转到第 2 页"
         
         message.set_result(MessageEventResult().message(ret).use_t2i(False))
+        return
         
     @filter.command("new")
     async def new_conv(self, message: AstrMessageEvent):
@@ -583,10 +614,14 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
         await self.context.conversation_manager.update_conversation_title(message.unified_msg_origin, new_name)
         message.set_result(MessageEventResult().message("重命名对话成功。"))
     
-    @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("del")
     async def del_conv(self, message: AstrMessageEvent):
         '''删除当前对话'''
+        is_unique_session = self.context.get_config()['platform_settings']['unique_session']
+        if message.get_group_id() and not is_unique_session and message.role != "admin":
+            # 群聊，没开独立会话，发送人不是管理员
+            message.set_result(MessageEventResult().message(f"会话处于群聊，并且未开启独立会话，并且您 (ID {message.get_sender_id()}) 不是管理员，因此没有权限删除当前对话。"))    
+            return
         
         provider = self.context.get_using_provider()
         if provider and provider.meta().type == 'dify':
@@ -605,7 +640,6 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
         await self.context.conversation_manager.delete_conversation(message.unified_msg_origin, session_curr_cid)
         message.set_result(MessageEventResult().message("删除当前对话成功。不再处于对话状态，使用 /switch 序号 切换到其他对话或 /new 创建。"))
         
-
     @filter.permission_type(filter.PermissionType.ADMIN)
     @filter.command("key")
     async def key(self, message: AstrMessageEvent, index: int=None):
@@ -775,20 +809,30 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
                     logger.error("未找到任何 LLM 提供商。请先配置。无法主动回复")
                     return
                 try:
-                    session_curr_cid = await self.context.conversation_manager.get_curr_conversation_id(event.unified_msg_origin)
-                    
-                    if not session_curr_cid:
-                        logger.error("当前未处于对话状态，无法主动回复，请确保 平台设置->会话隔离(unique_session) 未开启，并使用 /switch 序号 切换或者 /new 创建一个会话。")
-                        return
-                    
-                    conv = await self.context.conversation_manager.get_conversation(
-                        event.unified_msg_origin, 
-                        session_curr_cid
-                    )
+                    conv = None
                     history = []
-                    if conv:
-                        history = json.loads(conv.history)
-                    
+                    if provider.meta().type != 'dify':
+                        # Dify 自己有维护对话，不需要 bot 端维护。
+                        session_curr_cid = await self.context.conversation_manager.get_curr_conversation_id(event.unified_msg_origin)
+                        
+                        if not session_curr_cid:
+                            logger.error("当前未处于对话状态，无法主动回复，请确保 平台设置->会话隔离(unique_session) 未开启，并使用 /switch 序号 切换或者 /new 创建一个会话。")
+                            return
+                        
+                        conv = await self.context.conversation_manager.get_conversation(
+                            event.unified_msg_origin, 
+                            session_curr_cid
+                        )
+                        history = []
+                        if conv:
+                            history = json.loads(conv.history)
+                    else:
+                        assert isinstance(provider, ProviderDify)
+                        cid = provider.conversation_ids.get(event.unified_msg_origin, None)
+                        if cid is None:
+                            logger.error("[Dify] 当前未处于对话状态，无法主动回复，请确保 平台设置->会话隔离(unique_session) 未开启，并使用 /switch 序号 切换或者 /new 创建一个会话。")
+                            return
+                        
                     prompt = self.ltm.ar_prompt
                     if not prompt:
                         prompt = event.message_str

packages/python_interpreter/main.py

@@ -85,7 +85,8 @@ DEFAULT_CONFIG = {
     "sandbox": {
         "image": "soulter/astrbot-code-interpreter-sandbox",
         "docker_mirror": "", # cjie.eu.org
-    }
+    },
+    "docker_host_astrbot_abs_path": ""
 }
 PATH = "data/config/python_interpreter.json"
 
@@ -95,8 +96,14 @@ class Main(star.Star):
     def __init__(self, context: star.Context) -> None:
         self.context = context
         self.curr_dir = os.path.dirname(os.path.abspath(__file__))
-        self.workplace_path = os.path.join(self.curr_dir, "workplace")
-        self.shared_path = os.path.join(self.curr_dir, "shared")
+        
+        self.shared_path = os.path.join("data", "py_interpreter_shared")
+        if not os.path.exists(self.shared_path):
+            # 复制 api.py 到 shared 目录
+            os.makedirs(self.shared_path, exist_ok=True)
+            shared_api_file = os.path.join(self.curr_dir, "shared", "api.py")
+            shutil.copy(shared_api_file, self.shared_path)
+        self.workplace_path = os.path.join("data", "py_interpreter_workplace")
         os.makedirs(self.workplace_path, exist_ok=True)
         
         self.user_file_msg_buffer = defaultdict(list)
@@ -195,7 +202,16 @@ class Main(star.Star):
     @filter.command_group("pi")
     def pi(self):
         pass
-
+    
+    @pi.command("absdir")
+    async def pi_absdir(self, event: AstrMessageEvent, path: str = ""):
+        '''设置 Docker 宿主机绝对路径'''
+        if not path:
+            yield event.plain_result(f"当前 Docker 宿主机绝对路径: {self.config.get('docker_host_astrbot_abs_path', '')}")
+        else:
+            self.config["docker_host_astrbot_abs_path"] = path
+            self._save_config()
+            yield event.plain_result(f"设置 Docker 宿主机绝对路径成功: {path}")
 
     @pi.command("mirror")
     async def pi_mirror(self, event: AstrMessageEvent, url: str = ""):
@@ -305,6 +321,20 @@ class Main(star.Star):
                 
             yield event.plain_result(f"使用沙箱执行代码中，请稍等...(尝试次数: {i+1}/{n})")
             
+            
+            self.docker_host_astrbot_abs_path = self.config.get("docker_host_astrbot_abs_path", "")
+            if self.docker_host_astrbot_abs_path:
+                host_shared = os.path.join(self.docker_host_astrbot_abs_path, self.shared_path)
+                host_output = os.path.join(self.docker_host_astrbot_abs_path, output_path)
+                host_workplace = os.path.join(self.docker_host_astrbot_abs_path, workplace_path)
+                
+            else:
+                host_shared = os.path.abspath(self.shared_path)
+                host_output = os.path.abspath(output_path)
+                host_workplace = os.path.abspath(workplace_path)
+            
+            logger.debug(f"host_shared: {host_shared}, host_output: {host_output}, host_workplace: {host_workplace}")
+            
             container = await docker.containers.run({
                 "Image": image_name,
                 "Cmd": ["python", "exec.py"],
@@ -312,9 +342,9 @@ class Main(star.Star):
                 "NanoCPUs": 1000000000,
                 "HostConfig": {
                     "Binds": [
-                        f"{self.shared_path}:/astrbot_sandbox/shared:ro",
-                        f"{output_path}:/astrbot_sandbox/output:rw",
-                        f"{workplace_path}:/astrbot_sandbox:rw",
+                        f"{host_shared}:/astrbot_sandbox/shared:ro",
+                        f"{host_output}:/astrbot_sandbox/output:rw",
+                        f"{host_workplace}:/astrbot_sandbox:rw",
                     ]
                 },
                 "Env": [

packages/reminder/main.py

@@ -13,7 +13,7 @@ class Main(star.Star):
     '''使用 LLM 待办提醒。只需对 LLM 说想要提醒的事情和时间即可。比如：`之后每天这个时候都提醒我做多邻国`'''
     def __init__(self, context: star.Context) -> None:
         self.context = context
-        self.scheduler = AsyncIOScheduler()
+        self.scheduler = AsyncIOScheduler(timezone='Asia/Shanghai')
         
         # set and load config
         if not os.path.exists("data/astrbot-reminder.json"):
@@ -175,10 +175,18 @@ class Main(star.Star):
         else:
             reminder = reminders.pop(index - 1)
             job_id = reminder.get("id")
+            
+            # self.reminder_data[event.unified_msg_origin] = reminder
+            users_reminders = self.reminder_data.get(event.unified_msg_origin, [])
+            for i, r in enumerate(users_reminders):
+                if r.get("id") == job_id:
+                    users_reminders.pop(i)
+            
             try:
                 self.scheduler.remove_job(job_id)
             except Exception as e:
                 logger.error(f"Remove job error: {e}")
+                yield event.plain_result(f"成功移除对应的待办事项。删除定时任务失败: {str(e)} 可能需要重启 AstrBot 以取消该提醒任务。")
             await self._save_data()
             yield event.plain_result("成功删除待办事项：\n" + reminder["text"])
     

packages/web_searcher/main.py

@@ -75,10 +75,10 @@ class Main(star.Star):
             
     @llm_tool("web_search")
     async def search_from_search_engine(self, event: AstrMessageEvent, query: str) -> str:
-        '''Search the web for answers to the user's query
+        '''搜索网络以回答用户的问题。当用户需要搜索网络以获取即时性的信息时调用此工具。
         
         Args:
-            query(string): A search query which will be used to fetch the most relevant snippets regarding the user's query
+            query(string): 和用户的问题最相关的搜索关键词，用于在 Google 上搜索。
         '''
         logger.info("web_searcher - search_from_search_engine: " + query)
         results = []