AstrBot 4.5.6__py3-none-any.whl → 4.5.7__py3-none-any.whl

astrbot/core/pipeline/respond/stage.py

@@ -10,7 +10,6 @@ from astrbot.core.message.message_event_result import MessageChain, ResultConten
 from astrbot.core.platform.astr_message_event import AstrMessageEvent
 from astrbot.core.star.star_handler import EventType
 from astrbot.core.utils.path_util import path_Mapping
-from astrbot.core.utils.session_lock import session_lock_manager
 
 from ..context import PipelineContext, call_event_hook
 from ..stage import Stage, register_stage
@@ -169,12 +168,15 @@ class RespondStage(Stage):
                 logger.warning("async_stream 为空，跳过发送。")
                 return
             # 流式结果直接交付平台适配器处理
-            use_fallback = self.config.get("provider_settings", {}).get(
-                "streaming_segmented",
-                False,
+            realtime_segmenting = (
+                self.config.get("provider_settings", {}).get(
+                    "unsupported_streaming_strategy",
+                    "realtime_segmenting",
+                )
+                == "realtime_segmenting"
             )
             logger.info(f"应用流式输出({event.get_platform_id()})")
-            await event.send_streaming(result.async_stream, use_fallback)
+            await event.send_streaming(result.async_stream, realtime_segmenting)
             return
         if len(result.chain) > 0:
             # 检查路径映射
@@ -218,21 +220,20 @@ class RespondStage(Stage):
                         f"实际消息链为空, 跳过发送阶段。header_chain: {header_comps}, actual_chain: {result.chain}",
                     )
                     return
-                async with session_lock_manager.acquire_lock(event.unified_msg_origin):
-                    for comp in result.chain:
-                        i = await self._calc_comp_interval(comp)
-                        await asyncio.sleep(i)
-                        try:
-                            if comp.type in need_separately:
-                                await event.send(MessageChain([comp]))
-                            else:
-                                await event.send(MessageChain([*header_comps, comp]))
-                                header_comps.clear()
-                        except Exception as e:
-                            logger.error(
-                                f"发送消息链失败: chain = {MessageChain([comp])}, error = {e}",
-                                exc_info=True,
-                            )
+                for comp in result.chain:
+                    i = await self._calc_comp_interval(comp)
+                    await asyncio.sleep(i)
+                    try:
+                        if comp.type in need_separately:
+                            await event.send(MessageChain([comp]))
+                        else:
+                            await event.send(MessageChain([*header_comps, comp]))
+                            header_comps.clear()
+                    except Exception as e:
+                        logger.error(
+                            f"发送消息链失败: chain = {MessageChain([comp])}, error = {e}",
+                            exc_info=True,
+                        )
             else:
                 if all(
                     comp.type in {ComponentType.Reply, ComponentType.At}

astrbot/core/platform/platform_metadata.py

@@ -16,3 +16,6 @@ class PlatformMetadata:
     """显示在 WebUI 配置页中的平台名称，如空则是 name"""
     logo_path: str | None = None
     """平台适配器的 logo 文件路径（相对于插件目录）"""
+
+    support_streaming_message: bool = True
+    """平台是否支持真实流式传输"""

astrbot/core/platform/register.py

@@ -14,6 +14,7 @@ def register_platform_adapter(
     default_config_tmpl: dict | None = None,
     adapter_display_name: str | None = None,
     logo_path: str | None = None,
+    support_streaming_message: bool = True,
 ):
     """用于注册平台适配器的带参装饰器。
 
@@ -42,6 +43,7 @@ def register_platform_adapter(
             default_config_tmpl=default_config_tmpl,
             adapter_display_name=adapter_display_name,
             logo_path=logo_path,
+            support_streaming_message=support_streaming_message,
         )
         platform_registry.append(pm)
         platform_cls_map[adapter_name] = cls

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

@@ -29,6 +29,7 @@ from .aiocqhttp_message_event import AiocqhttpMessageEvent
 @register_platform_adapter(
     "aiocqhttp",
     "适用于 OneBot V11 标准的消息平台适配器，支持反向 WebSockets。",
+    support_streaming_message=False,
 )
 class AiocqhttpAdapter(Platform):
     def __init__(
@@ -49,6 +50,7 @@ class AiocqhttpAdapter(Platform):
             name="aiocqhttp",
             description="适用于 OneBot 标准的消息平台适配器，支持反向 WebSockets。",
             id=self.config.get("id"),
+            support_streaming_message=False,
         )
 
         self.bot = CQHttp(

astrbot/core/platform/sources/dingtalk/dingtalk_adapter.py

@@ -37,7 +37,9 @@ class MyEventHandler(dingtalk_stream.EventHandler):
         return AckMessage.STATUS_OK, "OK"
 
 
-@register_platform_adapter("dingtalk", "钉钉机器人官方 API 适配器")
+@register_platform_adapter(
+    "dingtalk", "钉钉机器人官方 API 适配器", support_streaming_message=False
+)
 class DingtalkPlatformAdapter(Platform):
     def __init__(
         self,
@@ -74,6 +76,14 @@ class DingtalkPlatformAdapter(Platform):
         )
         self.client_ = client  # 用于 websockets 的 client
 
+    def _id_to_sid(self, dingtalk_id: str | None) -> str | None:
+        if not dingtalk_id:
+            return dingtalk_id
+        prefix = "$:LWCP_v1:$"
+        if dingtalk_id.startswith(prefix):
+            return dingtalk_id[len(prefix) :]
+        return dingtalk_id
+
     async def send_by_session(
         self,
         session: MessageSesion,
@@ -86,6 +96,7 @@ class DingtalkPlatformAdapter(Platform):
             name="dingtalk",
             description="钉钉机器人官方 API 适配器",
             id=self.config.get("id"),
+            support_streaming_message=False,
         )
 
     async def convert_msg(
@@ -102,10 +113,10 @@ class DingtalkPlatformAdapter(Platform):
             else MessageType.FRIEND_MESSAGE
         )
         abm.sender = MessageMember(
-            user_id=message.sender_id,
+            user_id=self._id_to_sid(message.sender_id),
             nickname=message.sender_nick,
         )
-        abm.self_id = message.chatbot_user_id
+        abm.self_id = self._id_to_sid(message.chatbot_user_id)
         abm.message_id = message.message_id
         abm.raw_message = message
 
@@ -113,8 +124,8 @@ class DingtalkPlatformAdapter(Platform):
             # 处理所有被 @ 的用户（包括机器人自己，因 at_users 已包含）
             if message.at_users:
                 for user in message.at_users:
-                    if user.dingtalk_id:
-                        abm.message.append(At(qq=user.dingtalk_id))
+                    if id := self._id_to_sid(user.dingtalk_id):
+                        abm.message.append(At(qq=id))
             abm.group_id = message.conversation_id
             if self.unique_session:
                 abm.session_id = abm.sender.user_id

astrbot/core/platform/sources/discord/discord_platform_adapter.py

@@ -34,7 +34,9 @@ else:
 
 
 # 注册平台适配器
-@register_platform_adapter("discord", "Discord 适配器 (基于 Pycord)")
+@register_platform_adapter(
+    "discord", "Discord 适配器 (基于 Pycord)", support_streaming_message=False
+)
 class DiscordPlatformAdapter(Platform):
     def __init__(
         self,
@@ -111,6 +113,7 @@ class DiscordPlatformAdapter(Platform):
             "Discord 适配器",
             id=self.config.get("id"),
             default_config_tmpl=self.config,
+            support_streaming_message=False,
         )
 
     @override

astrbot/core/platform/sources/discord/discord_platform_event.py

@@ -1,7 +1,7 @@
 import asyncio
 import base64
 import binascii
-import sys
+from collections.abc import AsyncGenerator
 from io import BytesIO
 from pathlib import Path
 
@@ -21,11 +21,6 @@ from astrbot.api.platform import AstrBotMessage, At, PlatformMetadata
 from .client import DiscordBotClient
 from .components import DiscordEmbed, DiscordView
 
-if sys.version_info >= (3, 12):
-    from typing import override
-else:
-    from typing_extensions import override
-
 
 # 自定义Discord视图组件（兼容旧版本）
 class DiscordViewComponent(BaseMessageComponent):
@@ -49,7 +44,6 @@ class DiscordPlatformEvent(AstrMessageEvent):
         self.client = client
         self.interaction_followup_webhook = interaction_followup_webhook
 
-    @override
     async def send(self, message: MessageChain):
         """发送消息到Discord平台"""
         # 解析消息链为 Discord 所需的对象
@@ -98,6 +92,21 @@ class DiscordPlatformEvent(AstrMessageEvent):
 
         await super().send(message)
 
+    async def send_streaming(
+        self, generator: AsyncGenerator[MessageChain, None], use_fallback: bool = False
+    ):
+        buffer = None
+        async for chain in generator:
+            if not buffer:
+                buffer = chain
+            else:
+                buffer.chain.extend(chain.chain)
+        if not buffer:
+            return None
+        buffer.squash_plain()
+        await self.send(buffer)
+        return await super().send_streaming(generator, use_fallback)
+
     async def _get_channel(self) -> discord.abc.Messageable | None:
         """获取当前事件对应的频道对象"""
         try:

astrbot/core/platform/sources/lark/lark_adapter.py

@@ -23,7 +23,9 @@ from ...register import register_platform_adapter
 from .lark_event import LarkMessageEvent
 
 
-@register_platform_adapter("lark", "飞书机器人官方 API 适配器")
+@register_platform_adapter(
+    "lark", "飞书机器人官方 API 适配器", support_streaming_message=False
+)
 class LarkPlatformAdapter(Platform):
     def __init__(
         self,
@@ -115,6 +117,7 @@ class LarkPlatformAdapter(Platform):
             name="lark",
             description="飞书机器人官方 API 适配器",
             id=self.config.get("id"),
+            support_streaming_message=False,
         )
 
     async def convert_msg(self, event: lark.im.v1.P2ImMessageReceiveV1):

astrbot/core/platform/sources/misskey/misskey_adapter.py

@@ -45,7 +45,9 @@ MAX_FILE_UPLOAD_COUNT = 16
 DEFAULT_UPLOAD_CONCURRENCY = 3
 
 
-@register_platform_adapter("misskey", "Misskey 平台适配器")
+@register_platform_adapter(
+    "misskey", "Misskey 平台适配器", support_streaming_message=False
+)
 class MisskeyPlatformAdapter(Platform):
     def __init__(
         self,
@@ -120,6 +122,7 @@ class MisskeyPlatformAdapter(Platform):
             description="Misskey 平台适配器",
             id=self.config.get("id", "misskey"),
             default_config_tmpl=default_config,
+            support_streaming_message=False,
         )
 
     async def run(self):

astrbot/core/platform/sources/satori/satori_adapter.py

@@ -29,8 +29,7 @@ from astrbot.core.platform.astr_message_event import MessageSession
 
 
 @register_platform_adapter(
-    "satori",
-    "Satori 协议适配器",
+    "satori", "Satori 协议适配器", support_streaming_message=False
 )
 class SatoriPlatformAdapter(Platform):
     def __init__(
@@ -60,6 +59,7 @@ class SatoriPlatformAdapter(Platform):
             name="satori",
             description="Satori 通用协议适配器",
             id=self.config["id"],
+            support_streaming_message=False,
         )
 
         self.ws: ClientConnection | None = None

astrbot/core/platform/sources/slack/slack_adapter.py

@@ -30,6 +30,7 @@ from .slack_event import SlackMessageEvent
 @register_platform_adapter(
     "slack",
     "适用于 Slack 的消息平台适配器，支持 Socket Mode 和 Webhook Mode。",
+    support_streaming_message=False,
 )
 class SlackAdapter(Platform):
     def __init__(
@@ -68,6 +69,7 @@ class SlackAdapter(Platform):
             name="slack",
             description="适用于 Slack 的消息平台适配器，支持 Socket Mode 和 Webhook Mode。",
             id=self.config.get("id"),
+            support_streaming_message=False,
         )
 
         # 初始化 Slack Web Client

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

@@ -163,6 +163,9 @@ class WebChatAdapter(Platform):
         _, _, payload = message.raw_message  # type: ignore
         message_event.set_extra("selected_provider", payload.get("selected_provider"))
         message_event.set_extra("selected_model", payload.get("selected_model"))
+        message_event.set_extra(
+            "enable_streaming", payload.get("enable_streaming", True)
+        )
 
         self.commit_event(message_event)
 

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

@@ -109,6 +109,7 @@ class WebChatMessageEvent(AstrMessageEvent):
 
     async def send_streaming(self, generator, use_fallback: bool = False):
         final_data = ""
+        reasoning_content = ""
         cid = self.session_id.split("!")[-1]
         web_chat_back_queue = webchat_queue_mgr.get_or_create_back_queue(cid)
         async for chain in generator:
@@ -124,16 +125,22 @@ class WebChatMessageEvent(AstrMessageEvent):
                 )
                 final_data = ""
                 continue
-            final_data += await WebChatMessageEvent._send(
+
+            r = await WebChatMessageEvent._send(
                 chain,
                 session_id=self.session_id,
                 streaming=True,
             )
+            if chain.type == "reasoning":
+                reasoning_content += chain.get_plain_text()
+            else:
+                final_data += r
 
         await web_chat_back_queue.put(
             {
                 "type": "complete",  # complete means we return the final result
                 "data": final_data,
+                "reasoning": reasoning_content,
                 "streaming": True,
                 "cid": cid,
             },

astrbot/core/platform/sources/wechatpadpro/wechatpadpro_adapter.py

@@ -32,7 +32,9 @@ except ImportError as e:
     )
 
 
-@register_platform_adapter("wechatpadpro", "WeChatPadPro 消息平台适配器")
+@register_platform_adapter(
+    "wechatpadpro", "WeChatPadPro 消息平台适配器", support_streaming_message=False
+)
 class WeChatPadProAdapter(Platform):
     def __init__(
         self,
@@ -51,6 +53,7 @@ class WeChatPadProAdapter(Platform):
             name="wechatpadpro",
             description="WeChatPadPro 消息平台适配器",
             id=self.config.get("id", "wechatpadpro"),
+            support_streaming_message=False,
         )
 
         # 保存配置信息

astrbot/core/platform/sources/wechatpadpro/wechatpadpro_message_event.py

@@ -1,6 +1,7 @@
 import asyncio
 import base64
 import io
+from collections.abc import AsyncGenerator
 from typing import TYPE_CHECKING
 
 import aiohttp
@@ -50,6 +51,21 @@ class WeChatPadProMessageEvent(AstrMessageEvent):
                     await self._send_voice(session, comp)
         await super().send(message)
 
+    async def send_streaming(
+        self, generator: AsyncGenerator[MessageChain, None], use_fallback: bool = False
+    ):
+        buffer = None
+        async for chain in generator:
+            if not buffer:
+                buffer = chain
+            else:
+                buffer.chain.extend(chain.chain)
+        if not buffer:
+            return None
+        buffer.squash_plain()
+        await self.send(buffer)
+        return await super().send_streaming(generator, use_fallback)
+
     async def _send_image(self, session: aiohttp.ClientSession, comp: Image):
         b64 = await comp.convert_to_base64()
         raw = self._validate_base64(b64)

astrbot/core/platform/sources/wecom/wecom_adapter.py

@@ -110,7 +110,7 @@ class WecomServer:
         await self.shutdown_event.wait()
 
 
-@register_platform_adapter("wecom", "wecom 适配器")
+@register_platform_adapter("wecom", "wecom 适配器", support_streaming_message=False)
 class WecomPlatformAdapter(Platform):
     def __init__(
         self,
@@ -196,6 +196,7 @@ class WecomPlatformAdapter(Platform):
             "wecom",
             "wecom 适配器",
             id=self.config.get("id", "wecom"),
+            support_streaming_message=False,
         )
 
     @override

astrbot/core/platform/sources/weixin_official_account/weixin_offacc_adapter.py

@@ -113,7 +113,9 @@ class WecomServer:
         await self.shutdown_event.wait()
 
 
-@register_platform_adapter("weixin_official_account", "微信公众平台 适配器")
+@register_platform_adapter(
+    "weixin_official_account", "微信公众平台 适配器", support_streaming_message=False
+)
 class WeixinOfficialAccountPlatformAdapter(Platform):
     def __init__(
         self,
@@ -195,6 +197,7 @@ class WeixinOfficialAccountPlatformAdapter(Platform):
             "weixin_official_account",
             "微信公众平台 适配器",
             id=self.config.get("id", "weixin_official_account"),
+            support_streaming_message=False,
         )
 
     @override

astrbot/core/provider/__init__.py

@@ -1,4 +1,4 @@
 from .entities import ProviderMetaData
-from .provider import Personality, Provider, STTProvider
+from .provider import Provider, STTProvider
 
-__all__ = ["Personality", "Provider", "ProviderMetaData", "STTProvider"]
+__all__ = ["Provider", "ProviderMetaData", "STTProvider"]

astrbot/core/provider/entities.py

@@ -30,18 +30,31 @@ class ProviderType(enum.Enum):
 
 
 @dataclass
-class ProviderMetaData:
+class ProviderMeta:
+    """The basic metadata of a provider instance."""
+
+    id: str
+    """the unique id of the provider instance that user configured"""
+    model: str | None
+    """the model name of the provider instance currently used"""
     type: str
-    """提供商适配器名称，如 openai, ollama"""
-    desc: str = ""
-    """提供商适配器描述"""
+    """the name of the provider adapter, such as openai, ollama"""
     provider_type: ProviderType = ProviderType.CHAT_COMPLETION
-    cls_type: Any = None
+    """the capability type of the provider adapter"""
+
+
+@dataclass
+class ProviderMetaData(ProviderMeta):
+    """The metadata of a provider adapter for registration."""
 
+    desc: str = ""
+    """the short description of the provider adapter"""
+    cls_type: Any = None
+    """the class type of the provider adapter"""
     default_config_tmpl: dict | None = None
-    """平台的默认配置模板"""
+    """the default configuration template of the provider adapter"""
     provider_display_name: str | None = None
-    """显示在 WebUI 配置页中的提供商名称，如空则是 type"""
+    """the display name of the provider shown in the WebUI configuration page; if empty, the type is used"""
 
 
 @dataclass
@@ -60,12 +73,20 @@ class ToolCallsResult:
         ]
         return ret
 
+    def to_openai_messages_model(
+        self,
+    ) -> list[AssistantMessageSegment | ToolCallMessageSegment]:
+        return [
+            self.tool_calls_info,
+            *self.tool_calls_result,
+        ]
+
 
 @dataclass
 class ProviderRequest:
-    prompt: str
+    prompt: str | None = None
     """提示词"""
-    session_id: str = ""
+    session_id: str | None = ""
     """会话 ID"""
     image_urls: list[str] = field(default_factory=list)
     """图片 URL 列表"""
@@ -181,25 +202,28 @@ class ProviderRequest:
 @dataclass
 class LLMResponse:
     role: str
-    """角色, assistant, tool, err"""
+    """The role of the message, e.g., assistant, tool, err"""
     result_chain: MessageChain | None = None
-    """返回的消息链"""
+    """A chain of message components representing the text completion from LLM."""
     tools_call_args: list[dict[str, Any]] = field(default_factory=list)
-    """工具调用参数"""
+    """Tool call arguments."""
     tools_call_name: list[str] = field(default_factory=list)
-    """工具调用名称"""
+    """Tool call names."""
     tools_call_ids: list[str] = field(default_factory=list)
-    """工具调用 ID"""
+    """Tool call IDs."""
+    reasoning_content: str = ""
+    """The reasoning content extracted from the LLM, if any."""
 
     raw_completion: (
         ChatCompletion | GenerateContentResponse | AnthropicMessage | None
     ) = None
-    _new_record: dict[str, Any] | None = None
+    """The raw completion response from the LLM provider."""
 
     _completion_text: str = ""
+    """The plain text of the completion."""
 
     is_chunk: bool = False
-    """是否是流式输出的单个 Chunk"""
+    """Indicates if the response is a chunked response."""
 
     def __init__(
         self,
@@ -213,7 +237,6 @@ class LLMResponse:
         | GenerateContentResponse
         | AnthropicMessage
         | None = None,
-        _new_record: dict[str, Any] | None = None,
         is_chunk: bool = False,
     ):
         """初始化 LLMResponse
@@ -241,7 +264,6 @@ class LLMResponse:
         self.tools_call_name = tools_call_name
         self.tools_call_ids = tools_call_ids
         self.raw_completion = raw_completion
-        self._new_record = _new_record
         self.is_chunk = is_chunk
 
     @property

astrbot/core/provider/func_tool_manager.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import copy
 import json
 import os
 from collections.abc import Awaitable, Callable
@@ -24,7 +25,16 @@ SUPPORTED_TYPES = [
     "boolean",
 ]  # json schema 支持的数据类型
 
-
+PY_TO_JSON_TYPE = {
+    "int": "number",
+    "float": "number",
+    "bool": "boolean",
+    "str": "string",
+    "dict": "object",
+    "list": "array",
+    "tuple": "array",
+    "set": "array",
+}
 # alias
 FuncTool = FunctionTool
 
@@ -106,7 +116,7 @@ class FunctionToolManager:
     def spec_to_func(
         self,
         name: str,
-        func_args: list,
+        func_args: list[dict],
         desc: str,
         handler: Callable[..., Awaitable[Any]],
     ) -> FuncTool:
@@ -115,10 +125,9 @@ class FunctionToolManager:
             "properties": {},
         }
         for param in func_args:
-            params["properties"][param["name"]] = {
-                "type": param["type"],
-                "description": param["description"],
-            }
+            p = copy.deepcopy(param)
+            p.pop("name", None)
+            params["properties"][param["name"]] = p
         return FuncTool(
             name=name,
             parameters=params,

astrbot/core/provider/manager.py

@@ -241,6 +241,8 @@ class ProviderManager:
                     )
                 case "zhipu_chat_completion":
                     from .sources.zhipu_source import ProviderZhipu as ProviderZhipu
+                case "groq_chat_completion":
+                    from .sources.groq_source import ProviderGroq as ProviderGroq
                 case "anthropic_chat_completion":
                     from .sources.anthropic_source import (
                         ProviderAnthropic as ProviderAnthropic,
@@ -354,6 +356,8 @@ class ProviderManager:
                 logger.error(f"无法找到 {provider_metadata.type} 的类")
                 return
 
+            provider_metadata.id = provider_config["id"]
+
             if provider_metadata.provider_type == ProviderType.SPEECH_TO_TEXT:
                 # STT 任务
                 inst = cls_type(provider_config, self.provider_settings)
@@ -394,7 +398,6 @@ class ProviderManager:
                 inst = cls_type(
                     provider_config,
                     self.provider_settings,
-                    self.selected_default_persona,
                 )
 
                 if getattr(inst, "initialize", None):