AstrBot 4.0.0b4__py3-none-any.whl → 4.1.0__py3-none-any.whl

astrbot/core/platform/sources/telegram/tg_adapter.py

@@ -183,7 +183,6 @@ class TelegramPlatformAdapter(Platform):
             return None
 
         if not re.match(r"^[a-z0-9_]+$", cmd_name) or len(cmd_name) > 32:
-            logger.debug(f"跳过无法注册的命令: {cmd_name}")
             return None
 
         # Build description.

astrbot/core/provider/entities.py

@@ -4,9 +4,11 @@ import json
 from astrbot.core.utils.io import download_image_by_url
 from astrbot import logger
 from dataclasses import dataclass, field
-from typing import List, Dict, Type
+from typing import List, Dict, Type, Any
 from astrbot.core.agent.tool import ToolSet
 from openai.types.chat.chat_completion import ChatCompletion
+from google.genai.types import GenerateContentResponse
+from anthropic.types import Message
 from openai.types.chat.chat_completion_message_tool_call import (
     ChatCompletionMessageToolCall,
 )
@@ -30,11 +32,11 @@ class ProviderMetaData:
     desc: str = ""
     """提供商适配器描述."""
     provider_type: ProviderType = ProviderType.CHAT_COMPLETION
-    cls_type: Type = None
+    cls_type: Type | None = None
 
-    default_config_tmpl: dict = None
+    default_config_tmpl: dict | None = None
     """平台的默认配置模板"""
-    provider_display_name: str = None
+    provider_display_name: str | None = None
     """显示在 WebUI 配置页中的提供商名称，如空则是 type"""
 
 
@@ -58,7 +60,7 @@ class ToolCallMessageSegment:
 class AssistantMessageSegment:
     """OpenAI 格式的上下文中 role 为 assistant 的消息段。参考: https://platform.openai.com/docs/guides/function-calling"""
 
-    content: str = None
+    content: str | None = None
     tool_calls: List[ChatCompletionMessageToolCall | Dict] = field(default_factory=list)
     role: str = "assistant"
 
@@ -205,17 +207,17 @@ class ProviderRequest:
 class LLMResponse:
     role: str
     """角色, assistant, tool, err"""
-    result_chain: MessageChain = None
+    result_chain: MessageChain | None = None
     """返回的消息链"""
-    tools_call_args: List[Dict[str, any]] = field(default_factory=list)
+    tools_call_args: List[Dict[str, Any]] = field(default_factory=list)
     """工具调用参数"""
     tools_call_name: List[str] = field(default_factory=list)
     """工具调用名称"""
     tools_call_ids: List[str] = field(default_factory=list)
     """工具调用 ID"""
 
-    raw_completion: ChatCompletion = None
-    _new_record: Dict[str, any] = None
+    raw_completion: ChatCompletion | GenerateContentResponse | Message | None = None
+    _new_record: Dict[str, Any] | None = None
 
     _completion_text: str = ""
 
@@ -226,12 +228,12 @@ class LLMResponse:
         self,
         role: str,
         completion_text: str = "",
-        result_chain: MessageChain = None,
-        tools_call_args: List[Dict[str, any]] = None,
-        tools_call_name: List[str] = None,
-        tools_call_ids: List[str] = None,
-        raw_completion: ChatCompletion = None,
-        _new_record: Dict[str, any] = None,
+        result_chain: MessageChain | None = None,
+        tools_call_args: List[Dict[str, Any]] | None = None,
+        tools_call_name: List[str] | None = None,
+        tools_call_ids: List[str] | None = None,
+        raw_completion: ChatCompletion | None = None,
+        _new_record: Dict[str, Any] | None = None,
         is_chunk: bool = False,
     ):
         """初始化 LLMResponse

astrbot/core/provider/sources/gemini_source.py

@@ -15,7 +15,7 @@ from astrbot import logger
 from astrbot.api.provider import Provider
 from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.provider.entities import LLMResponse
-from astrbot.core.provider.func_tool_manager import FuncCall
+from astrbot.core.provider.func_tool_manager import ToolSet
 from astrbot.core.utils.io import download_image_by_url
 
 from ..register import register_provider_adapter
@@ -61,7 +61,7 @@ class ProviderGoogleGenAI(Provider):
             default_persona,
         )
         self.api_keys: list = provider_config.get("key", [])
-        self.chosen_api_key: str = self.api_keys[0] if len(self.api_keys) > 0 else None
+        self.chosen_api_key: str = self.api_keys[0] if len(self.api_keys) > 0 else ""
         self.timeout: int = int(provider_config.get("timeout", 180))
 
         self.api_base: Optional[str] = provider_config.get("api_base", None)
@@ -96,6 +96,9 @@ class ProviderGoogleGenAI(Provider):
 
     async def _handle_api_error(self, e: APIError, keys: list[str]) -> bool:
         """处理API错误，返回是否需要重试"""
+        if e.message is None:
+            e.message = ""
+
         if e.code == 429 or "API key not valid" in e.message:
             keys.remove(self.chosen_api_key)
             if len(keys) > 0:
@@ -119,7 +122,7 @@ class ProviderGoogleGenAI(Provider):
     async def _prepare_query_config(
         self,
         payloads: dict,
-        tools: Optional[FuncCall] = None,
+        tools: Optional[ToolSet] = None,
         system_instruction: Optional[str] = None,
         modalities: Optional[list[str]] = None,
         temperature: float = 0.7,
@@ -321,11 +324,15 @@ class ProviderGoogleGenAI(Provider):
 
     @staticmethod
     def _process_content_parts(
-        result: types.GenerateContentResponse, llm_response: LLMResponse
+        candidate: types.Candidate, llm_response: LLMResponse
     ) -> MessageChain:
         """处理内容部分并构建消息链"""
-        finish_reason = result.candidates[0].finish_reason
-        result_parts: Optional[types.Part] = result.candidates[0].content.parts
+        if not candidate.content:
+            logger.warning(f"收到的 candidate.content 为空: {candidate}")
+            raise Exception("API 返回的 candidate.content 为空。")
+
+        finish_reason = candidate.finish_reason
+        result_parts: list[types.Part] | None = candidate.content.parts
 
         if finish_reason == types.FinishReason.SAFETY:
             raise Exception("模型生成内容未通过 Gemini 平台的安全检查")
@@ -343,22 +350,28 @@ class ProviderGoogleGenAI(Provider):
                 raise Exception("模型生成内容违反 Gemini 平台政策")
 
         if not result_parts:
-            logger.debug(result.candidates)
-            raise Exception("API 返回的内容为空。")
+            logger.warning(f"收到的 candidate.content.parts 为空: {candidate}")
+            raise Exception("API 返回的 candidate.content.parts 为空。")
 
         chain = []
         part: types.Part
 
         # 暂时这样Fallback
         if all(
-            part.inline_data and part.inline_data.mime_type.startswith("image/")
+            part.inline_data
+            and part.inline_data.mime_type
+            and part.inline_data.mime_type.startswith("image/")
             for part in result_parts
         ):
             chain.append(Comp.Plain("这是图片"))
         for part in result_parts:
             if part.text:
                 chain.append(Comp.Plain(part.text))
-            elif part.function_call:
+            elif (
+                part.function_call
+                and part.function_call.name is not None
+                and part.function_call.args is not None
+            ):
                 llm_response.role = "tool"
                 llm_response.tools_call_name.append(part.function_call.name)
                 llm_response.tools_call_args.append(part.function_call.args)
@@ -366,11 +379,16 @@ class ProviderGoogleGenAI(Provider):
                 llm_response.tools_call_ids.append(
                     part.function_call.id or part.function_call.name
                 )
-            elif part.inline_data and part.inline_data.mime_type.startswith("image/"):
+            elif (
+                part.inline_data
+                and part.inline_data.mime_type
+                and part.inline_data.mime_type.startswith("image/")
+                and part.inline_data.data
+            ):
                 chain.append(Comp.Image.fromBytes(part.inline_data.data))
         return MessageChain(chain=chain)
 
-    async def _query(self, payloads: dict, tools: FuncCall) -> LLMResponse:
+    async def _query(self, payloads: dict, tools: ToolSet | None) -> LLMResponse:
         """非流式请求 Gemini API"""
         system_instruction = next(
             (msg["content"] for msg in payloads["messages"] if msg["role"] == "system"),
@@ -396,6 +414,10 @@ class ProviderGoogleGenAI(Provider):
                     config=config,
                 )
 
+                if not result.candidates:
+                    logger.error(f"请求失败, 返回的 candidates 为空: {result}")
+                    raise Exception("请求失败, 返回的 candidates 为空。")
+
                 if result.candidates[0].finish_reason == types.FinishReason.RECITATION:
                     if temperature > 2:
                         raise Exception("温度参数已超过最大值2，仍然发生recitation")
@@ -408,6 +430,8 @@ class ProviderGoogleGenAI(Provider):
                 break
 
             except APIError as e:
+                if e.message is None:
+                    e.message = ""
                 if "Developer instruction is not enabled" in e.message:
                     logger.warning(
                         f"{self.get_model()} 不支持 system prompt，已自动去除(影响人格设置)"
@@ -432,11 +456,13 @@ class ProviderGoogleGenAI(Provider):
 
         llm_response = LLMResponse("assistant")
         llm_response.raw_completion = result
-        llm_response.result_chain = self._process_content_parts(result, llm_response)
+        llm_response.result_chain = self._process_content_parts(
+            result.candidates[0], llm_response
+        )
         return llm_response
 
     async def _query_stream(
-        self, payloads: dict, tools: FuncCall
+        self, payloads: dict, tools: ToolSet | None
     ) -> AsyncGenerator[LLMResponse, None]:
         """流式请求 Gemini API"""
         system_instruction = next(
@@ -459,6 +485,8 @@ class ProviderGoogleGenAI(Provider):
                 )
                 break
             except APIError as e:
+                if e.message is None:
+                    e.message = ""
                 if "Developer instruction is not enabled" in e.message:
                     logger.warning(
                         f"{self.get_model()} 不支持 system prompt，已自动去除(影响人格设置)"
@@ -478,13 +506,20 @@ class ProviderGoogleGenAI(Provider):
         async for chunk in result:
             llm_response = LLMResponse("assistant", is_chunk=True)
 
+            if not chunk.candidates:
+                logger.warning(f"收到的 chunk 中 candidates 为空: {chunk}")
+                continue
+            if not chunk.candidates[0].content:
+                logger.warning(f"收到的 chunk 中 content 为空: {chunk}")
+                continue
+
             if chunk.candidates[0].content.parts and any(
                 part.function_call for part in chunk.candidates[0].content.parts
             ):
                 llm_response = LLMResponse("assistant", is_chunk=False)
                 llm_response.raw_completion = chunk
                 llm_response.result_chain = self._process_content_parts(
-                    chunk, llm_response
+                    chunk.candidates[0], llm_response
                 )
                 yield llm_response
                 return
@@ -500,7 +535,7 @@ class ProviderGoogleGenAI(Provider):
                     final_response = LLMResponse("assistant", is_chunk=False)
                     final_response.raw_completion = chunk
                     final_response.result_chain = self._process_content_parts(
-                        chunk, final_response
+                        chunk.candidates[0], final_response
                     )
                 break
 
@@ -566,6 +601,8 @@ class ProviderGoogleGenAI(Provider):
                     continue
                 break
 
+        raise Exception("请求失败。")
+
     async def text_chat_stream(
         self,
         prompt,
@@ -621,7 +658,9 @@ class ProviderGoogleGenAI(Provider):
             return [
                 m.name.replace("models/", "")
                 for m in models
-                if "generateContent" in m.supported_actions
+                if m.supported_actions
+                and "generateContent" in m.supported_actions
+                and m.name
             ]
         except APIError as e:
             raise Exception(f"获取模型列表失败: {e.message}")
@@ -636,7 +675,7 @@ class ProviderGoogleGenAI(Provider):
         self.chosen_api_key = key
         self._init_client()
 
-    async def assemble_context(self, text: str, image_urls: list[str] = None):
+    async def assemble_context(self, text: str, image_urls: list[str] | None = None):
         """
         组装上下文。
         """

astrbot/core/provider/sources/openai_source.py

@@ -99,12 +99,13 @@ class ProviderOpenAIOfficial(Provider):
         for key in to_del:
             del payloads[key]
 
-        model = payloads.get("model", "")
-        # 针对 qwen3 模型的特殊处理：非流式调用必须设置 enable_thinking=false
-        if "qwen3" in model.lower():
-            extra_body["enable_thinking"] = False 
+        # 读取并合并 custom_extra_body 配置
+        custom_extra_body = self.provider_config.get("custom_extra_body", {})
+        if isinstance(custom_extra_body, dict):
+            extra_body.update(custom_extra_body)
+
         # 针对 deepseek 模型的特殊处理：deepseek-reasoner调用必须移除 tools ，否则将被切换至 deepseek-chat
-        elif model == "deepseek-reasoner" and "tools" in payloads:
+        if model == "deepseek-reasoner" and "tools" in payloads:
             del payloads["tools"]
 
         completion = await self.client.chat.completions.create(
@@ -137,6 +138,12 @@ class ProviderOpenAIOfficial(Provider):
 
         # 不在默认参数中的参数放在 extra_body 中
         extra_body = {}
+
+        # 读取并合并 custom_extra_body 配置
+        custom_extra_body = self.provider_config.get("custom_extra_body", {})
+        if isinstance(custom_extra_body, dict):
+            extra_body.update(custom_extra_body)
+
         to_del = []
         for key in payloads.keys():
             if key not in self.default_params:

astrbot/core/provider/sources/vllm_rerank_source.py

@@ -1,4 +1,5 @@
 import aiohttp
+from astrbot import logger
 from ..provider import RerankProvider
 from ..register import register_provider_adapter
 from ..entities import ProviderType, RerankResult
@@ -44,6 +45,11 @@ class VLLMRerankProvider(RerankProvider):
             response_data = await response.json()
             results = response_data.get("results", [])
 
+            if not results:
+                logger.warning(
+                    f"Rerank API 返回了空的列表数据。原始响应: {response_data}"
+                )
+
             return [
                 RerankResult(
                     index=result["index"],

astrbot/core/star/__init__.py

@@ -27,14 +27,16 @@ class Star(CommandParserMixin):
             star_map[cls.__module__].star_cls_type = cls
             star_map[cls.__module__].module_path = cls.__module__
 
-    @staticmethod
-    async def text_to_image(text: str, return_url=True) -> str:
+    async def text_to_image(self, text: str, return_url=True) -> str:
         """将文本转换为图片"""
-        return await html_renderer.render_t2i(text, return_url=return_url)
+        return await html_renderer.render_t2i(
+            text,
+            return_url=return_url,
+            template_name=self.context._config.get("t2i_active_template"),
+        )
 
-    @staticmethod
     async def html_render(
-        tmpl: str, data: dict, return_url=True, options: dict | None = None
+        self, tmpl: str, data: dict, return_url=True, options: dict | None = None
     ) -> str:
         """渲染 HTML"""
         return await html_renderer.render_custom_template(

astrbot/core/star/filter/command.py

@@ -7,7 +7,6 @@ from astrbot.core.config import AstrBotConfig
 from .custom_filter import CustomFilter
 from ..star_handler import StarHandlerMetadata
 
-
 class GreedyStr(str):
     """标记指令完成其他参数接收后的所有剩余文本。"""
 
@@ -153,10 +152,17 @@ class CommandFilter(HandlerFilter):
                     _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()
+                if message_str == _full:
+                    # 完全等于命令名 → 没参数
+                    message_str = ""
+                    ok = True
+                    break
+                elif message_str.startswith(_full):
+                    # 命令名后面无论是空格还是直接连参数都可以
+                    message_str = message_str[len(_full):].lstrip()
                     ok = True
                     break
+
         if not ok:
             return False
 

astrbot/core/star/filter/platform_adapter_type.py

@@ -18,6 +18,7 @@ class PlatformAdapterType(enum.Flag):
     KOOK = enum.auto()
     VOCECHAT = enum.auto()
     WEIXIN_OFFICIAL_ACCOUNT = enum.auto()
+    SATORI = enum.auto()
     ALL = (
         AIOCQHTTP
         | QQOFFICIAL
@@ -31,6 +32,7 @@ class PlatformAdapterType(enum.Flag):
         | KOOK
         | VOCECHAT
         | WEIXIN_OFFICIAL_ACCOUNT
+        | SATORI
     )
 
 
@@ -47,6 +49,7 @@ ADAPTER_NAME_2_TYPE = {
     "wechatpadpro": PlatformAdapterType.WECHATPADPRO,
     "vocechat": PlatformAdapterType.VOCECHAT,
     "weixin_official_account": PlatformAdapterType.WEIXIN_OFFICIAL_ACCOUNT,
+    "satori": PlatformAdapterType.SATORI,
 }
 
 

astrbot/core/star/register/__init__.py

@@ -8,6 +8,7 @@ from .star_handler import (
     register_permission_type,
     register_custom_filter,
     register_on_astrbot_loaded,
+    register_on_platform_loaded,
     register_on_llm_request,
     register_on_llm_response,
     register_llm_tool,
@@ -26,6 +27,7 @@ __all__ = [
     "register_permission_type",
     "register_custom_filter",
     "register_on_astrbot_loaded",
+    "register_on_platform_loaded",
     "register_on_llm_request",
     "register_on_llm_response",
     "register_llm_tool",

astrbot/core/star/register/star_handler.py

@@ -267,6 +267,18 @@ def register_on_astrbot_loaded(**kwargs):
     return decorator
 
 
+def register_on_platform_loaded(**kwargs):
+    """
+    当平台加载完成时
+    """
+
+    def decorator(awaitable):
+        _ = get_handler_or_create(awaitable, EventType.OnPlatformLoadedEvent, **kwargs)
+        return awaitable
+
+    return decorator
+
+
 def register_on_llm_request(**kwargs):
     """当有 LLM 请求时的事件
 
@@ -376,9 +388,11 @@ def register_llm_tool(name: str = None, **kwargs):
             # print(f"Registering tool {llm_tool_name} for agent", registering_agent._agent.name)
             if registering_agent._agent.tools is None:
                 registering_agent._agent.tools = []
-            registering_agent._agent.tools.append(llm_tools.spec_to_func(
-                llm_tool_name, args, docstring.description.strip(), awaitable
-            ))
+            registering_agent._agent.tools.append(
+                llm_tools.spec_to_func(
+                    llm_tool_name, args, docstring.description.strip(), awaitable
+                )
+            )
 
         return awaitable
 
@@ -421,7 +435,7 @@ def register_agent(
             run_hooks=run_hooks or BaseAgentRunHooks[AstrAgentContext](),
         )
         handoff_tool = HandoffTool(agent=agent)
-        handoff_tool.handler=awaitable
+        handoff_tool.handler = awaitable
         llm_tools.func_list.append(handoff_tool)
         return RegisteringAgent(agent)
 

astrbot/core/star/star_handler.py

@@ -34,19 +34,26 @@ class StarHandlerRegistry(Generic[T]):
     ) -> List[StarHandlerMetadata]:
         handlers = []
         for handler in self._handlers:
+            # 过滤事件类型
             if handler.event_type != event_type:
                 continue
+            # 过滤启用状态
             if only_activated:
                 plugin = star_map.get(handler.handler_module_path)
                 if not (plugin and plugin.activated):
                     continue
+            # 过滤插件白名单
             if plugins_name is not None and plugins_name != ["*"]:
                 plugin = star_map.get(handler.handler_module_path)
                 if not plugin:
                     continue
                 if (
                     plugin.name not in plugins_name
-                    and event_type != EventType.OnAstrBotLoadedEvent
+                    and event_type
+                    not in (
+                        EventType.OnAstrBotLoadedEvent,
+                        EventType.OnPlatformLoadedEvent,
+                    )
                     and not plugin.reserved
                 ):
                     continue
@@ -90,6 +97,7 @@ class EventType(enum.Enum):
     """
 
     OnAstrBotLoadedEvent = enum.auto()  # AstrBot 加载完成
+    OnPlatformLoadedEvent = enum.auto()  # 平台加载完成
 
     AdapterMessageEvent = enum.auto()  # 收到适配器发来的消息
     OnLLMRequestEvent = enum.auto()  # 收到 LLM 请求（可以是用户也可以是插件）