AstrBot 4.6.1__py3-none-any.whl → 4.7.1__py3-none-any.whl

astrbot/core/pipeline/process_stage/method/{llm_request.py → agent_sub_stages/internal.py}

@@ -21,27 +21,24 @@ from astrbot.core.provider.entities import (
     LLMResponse,
     ProviderRequest,
 )
-from astrbot.core.star.session_llm_manager import SessionServiceManager
 from astrbot.core.star.star_handler import EventType, star_map
 from astrbot.core.utils.metrics import Metric
 from astrbot.core.utils.session_lock import session_lock_manager
 
-from ....astr_agent_context import AgentContextWrapper
-from ....astr_agent_hooks import MAIN_AGENT_HOOKS
-from ....astr_agent_run_util import AgentRunner, run_agent
-from ....astr_agent_tool_exec import FunctionToolExecutor
-from ...context import PipelineContext, call_event_hook
-from ..stage import Stage
-from ..utils import KNOWLEDGE_BASE_QUERY_TOOL, retrieve_knowledge_base
+from .....astr_agent_context import AgentContextWrapper
+from .....astr_agent_hooks import MAIN_AGENT_HOOKS
+from .....astr_agent_run_util import AgentRunner, run_agent
+from .....astr_agent_tool_exec import FunctionToolExecutor
+from ....context import PipelineContext, call_event_hook
+from ...stage import Stage
+from ...utils import KNOWLEDGE_BASE_QUERY_TOOL, retrieve_knowledge_base
 
 
-class LLMRequestSubStage(Stage):
+class InternalAgentSubStage(Stage):
     async def initialize(self, ctx: PipelineContext) -> None:
         self.ctx = ctx
         conf = ctx.astrbot_config
         settings = conf["provider_settings"]
-        self.bot_wake_prefixs: list[str] = conf["wake_prefix"]  # list
-        self.provider_wake_prefix: str = settings["wake_prefix"]  # str
         self.max_context_length = settings["max_context_length"]  # int
         self.dequeue_context_length: int = min(
             max(1, settings["dequeue_context_length"]),
@@ -59,13 +56,6 @@ class LLMRequestSubStage(Stage):
         self.show_reasoning = settings.get("display_reasoning_text", False)
         self.kb_agentic_mode: bool = conf.get("kb_agentic_mode", False)
 
-        for bwp in self.bot_wake_prefixs:
-            if self.provider_wake_prefix.startswith(bwp):
-                logger.info(
-                    f"识别 LLM 聊天额外唤醒前缀 {self.provider_wake_prefix} 以机器人唤醒前缀 {bwp} 开头，已自动去除。",
-                )
-                self.provider_wake_prefix = self.provider_wake_prefix[len(bwp) :]
-
         self.conv_manager = ctx.plugin_manager.context.conversation_manager
 
     def _select_provider(self, event: AstrMessageEvent):
@@ -304,21 +294,10 @@ class LLMRequestSubStage(Stage):
         return fixed_messages
 
     async def process(
-        self,
-        event: AstrMessageEvent,
-        _nested: bool = False,
-    ) -> None | AsyncGenerator[None, None]:
+        self, event: AstrMessageEvent, provider_wake_prefix: str
+    ) -> AsyncGenerator[None, None]:
         req: ProviderRequest | None = None
 
-        if not self.ctx.astrbot_config["provider_settings"]["enable"]:
-            logger.debug("未启用 LLM 能力，跳过处理。")
-            return
-
-        # 检查会话级别的LLM启停状态
-        if not SessionServiceManager.should_process_llm_request(event):
-            logger.debug(f"会话 {event.unified_msg_origin} 禁用了 LLM，跳过处理。")
-            return
-
         provider = self._select_provider(event)
         if provider is None:
             return
@@ -348,12 +327,12 @@ class LLMRequestSubStage(Stage):
                 req.image_urls = []
                 if sel_model := event.get_extra("selected_model"):
                     req.model = sel_model
-                if self.provider_wake_prefix and not event.message_str.startswith(
-                    self.provider_wake_prefix
+                if provider_wake_prefix and not event.message_str.startswith(
+                    provider_wake_prefix
                 ):
                     return
 
-                req.prompt = event.message_str[len(self.provider_wake_prefix) :]
+                req.prompt = event.message_str[len(provider_wake_prefix) :]
                 # func_tool selection 现在已经转移到 packages/astrbot 插件中进行选择。
                 # req.func_tool = self.ctx.plugin_manager.context.get_llm_tool_manager()
                 for comp in event.message_obj.message:

astrbot/core/pipeline/process_stage/method/agent_sub_stages/third_party.py

@@ -0,0 +1,202 @@
+import asyncio
+from collections.abc import AsyncGenerator
+from typing import TYPE_CHECKING
+
+from astrbot.core import logger
+from astrbot.core.agent.runners.coze.coze_agent_runner import CozeAgentRunner
+from astrbot.core.agent.runners.dashscope.dashscope_agent_runner import (
+    DashscopeAgentRunner,
+)
+from astrbot.core.agent.runners.dify.dify_agent_runner import DifyAgentRunner
+from astrbot.core.message.components import Image
+from astrbot.core.message.message_event_result import (
+    MessageChain,
+    MessageEventResult,
+    ResultContentType,
+)
+
+if TYPE_CHECKING:
+    from astrbot.core.agent.runners.base import BaseAgentRunner
+from astrbot.core.platform.astr_message_event import AstrMessageEvent
+from astrbot.core.provider.entities import (
+    ProviderRequest,
+)
+from astrbot.core.star.star_handler import EventType
+from astrbot.core.utils.metrics import Metric
+
+from .....astr_agent_context import AgentContextWrapper, AstrAgentContext
+from .....astr_agent_hooks import MAIN_AGENT_HOOKS
+from ....context import PipelineContext, call_event_hook
+from ...stage import Stage
+
+AGENT_RUNNER_TYPE_KEY = {
+    "dify": "dify_agent_runner_provider_id",
+    "coze": "coze_agent_runner_provider_id",
+    "dashscope": "dashscope_agent_runner_provider_id",
+}
+
+
+async def run_third_party_agent(
+    runner: "BaseAgentRunner",
+    stream_to_general: bool = False,
+) -> AsyncGenerator[MessageChain | None, None]:
+    """
+    运行第三方 agent runner 并转换响应格式
+    类似于 run_agent 函数，但专门处理第三方 agent runner
+    """
+    try:
+        async for resp in runner.step_until_done(max_step=30):  # type: ignore[misc]
+            if resp.type == "streaming_delta":
+                if stream_to_general:
+                    continue
+                yield resp.data["chain"]
+            elif resp.type == "llm_result":
+                if stream_to_general:
+                    yield resp.data["chain"]
+    except Exception as e:
+        logger.error(f"Third party agent runner error: {e}")
+        err_msg = (
+            f"\nAstrBot 请求失败。\n错误类型: {type(e).__name__}\n"
+            f"错误信息: {e!s}\n\n请在控制台查看和分享错误详情。\n"
+        )
+        yield MessageChain().message(err_msg)
+
+
+class ThirdPartyAgentSubStage(Stage):
+    async def initialize(self, ctx: PipelineContext) -> None:
+        self.ctx = ctx
+        self.conf = ctx.astrbot_config
+        self.runner_type = self.conf["provider_settings"]["agent_runner_type"]
+        self.prov_id = self.conf["provider_settings"].get(
+            AGENT_RUNNER_TYPE_KEY.get(self.runner_type, ""),
+            "",
+        )
+        settings = ctx.astrbot_config["provider_settings"]
+        self.streaming_response: bool = settings["streaming_response"]
+        self.unsupported_streaming_strategy: str = settings[
+            "unsupported_streaming_strategy"
+        ]
+
+    async def process(
+        self, event: AstrMessageEvent, provider_wake_prefix: str
+    ) -> AsyncGenerator[None, None]:
+        req: ProviderRequest | None = None
+
+        if provider_wake_prefix and not event.message_str.startswith(
+            provider_wake_prefix
+        ):
+            return
+
+        self.prov_cfg: dict = next(
+            (p for p in self.conf["provider"] if p["id"] == self.prov_id),
+            {},
+        )
+        if not self.prov_id or not self.prov_cfg:
+            logger.error(
+                "Third Party Agent Runner provider ID is not configured properly."
+            )
+            return
+
+        # make provider request
+        req = ProviderRequest()
+        req.session_id = event.unified_msg_origin
+        req.prompt = event.message_str[len(provider_wake_prefix) :]
+        for comp in event.message_obj.message:
+            if isinstance(comp, Image):
+                image_path = await comp.convert_to_base64()
+                req.image_urls.append(image_path)
+
+        if not req.prompt and not req.image_urls:
+            return
+
+        # call event hook
+        if await call_event_hook(event, EventType.OnLLMRequestEvent, req):
+            return
+
+        if self.runner_type == "dify":
+            runner = DifyAgentRunner[AstrAgentContext]()
+        elif self.runner_type == "coze":
+            runner = CozeAgentRunner[AstrAgentContext]()
+        elif self.runner_type == "dashscope":
+            runner = DashscopeAgentRunner[AstrAgentContext]()
+        else:
+            raise ValueError(
+                f"Unsupported third party agent runner type: {self.runner_type}",
+            )
+
+        astr_agent_ctx = AstrAgentContext(
+            context=self.ctx.plugin_manager.context,
+            event=event,
+        )
+
+        streaming_response = self.streaming_response
+        if (enable_streaming := event.get_extra("enable_streaming")) is not None:
+            streaming_response = bool(enable_streaming)
+
+        stream_to_general = (
+            self.unsupported_streaming_strategy == "turn_off"
+            and not event.platform_meta.support_streaming_message
+        )
+
+        await runner.reset(
+            request=req,
+            run_context=AgentContextWrapper(
+                context=astr_agent_ctx,
+                tool_call_timeout=60,
+            ),
+            agent_hooks=MAIN_AGENT_HOOKS,
+            provider_config=self.prov_cfg,
+            streaming=streaming_response,
+        )
+
+        if streaming_response and not stream_to_general:
+            # 流式响应
+            event.set_result(
+                MessageEventResult()
+                .set_result_content_type(ResultContentType.STREAMING_RESULT)
+                .set_async_stream(
+                    run_third_party_agent(
+                        runner,
+                        stream_to_general=False,
+                    ),
+                ),
+            )
+            yield
+            if runner.done():
+                final_resp = runner.get_final_llm_resp()
+                if final_resp and final_resp.result_chain:
+                    event.set_result(
+                        MessageEventResult(
+                            chain=final_resp.result_chain.chain or [],
+                            result_content_type=ResultContentType.STREAMING_FINISH,
+                        ),
+                    )
+        else:
+            # 非流式响应或转换为普通响应
+            async for _ in run_third_party_agent(
+                runner,
+                stream_to_general=stream_to_general,
+            ):
+                yield
+
+            final_resp = runner.get_final_llm_resp()
+
+            if not final_resp or not final_resp.result_chain:
+                logger.warning("Agent Runner 未返回最终结果。")
+                return
+
+            event.set_result(
+                MessageEventResult(
+                    chain=final_resp.result_chain.chain or [],
+                    result_content_type=ResultContentType.LLM_RESULT,
+                ),
+            )
+            yield
+
+        asyncio.create_task(
+            Metric.upload(
+                llm_tick=1,
+                model_name=self.runner_type,
+                provider_type=self.runner_type,
+            ),
+        )

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

@@ -24,7 +24,7 @@ class StarRequestSubStage(Stage):
     async def process(
         self,
         event: AstrMessageEvent,
-    ) -> None | AsyncGenerator[None, None]:
+    ) -> AsyncGenerator[None, None]:
         activated_handlers: list[StarHandlerMetadata] = event.get_extra(
             "activated_handlers",
         )

astrbot/core/pipeline/process_stage/stage.py

@@ -7,7 +7,7 @@ from astrbot.core.star.star_handler import StarHandlerMetadata
 
 from ..context import PipelineContext
 from ..stage import Stage, register_stage
-from .method.llm_request import LLMRequestSubStage
+from .method.agent_request import AgentRequestSubStage
 from .method.star_request import StarRequestSubStage
 
 
@@ -17,9 +17,12 @@ class ProcessStage(Stage):
         self.ctx = ctx
         self.config = ctx.astrbot_config
         self.plugin_manager = ctx.plugin_manager
-        self.llm_request_sub_stage = LLMRequestSubStage()
-        await self.llm_request_sub_stage.initialize(ctx)
 
+        # initialize agent sub stage
+        self.agent_sub_stage = AgentRequestSubStage()
+        await self.agent_sub_stage.initialize(ctx)
+
+        # initialize star request sub stage
         self.star_request_sub_stage = StarRequestSubStage()
         await self.star_request_sub_stage.initialize(ctx)
 
@@ -39,7 +42,7 @@ class ProcessStage(Stage):
                     # Handler 的 LLM 请求
                     event.set_extra("provider_request", resp)
                     _t = False
-                    async for _ in self.llm_request_sub_stage.process(event):
+                    async for _ in self.agent_sub_stage.process(event):
                         _t = True
                         yield
                     if not _t:
@@ -67,5 +70,5 @@ class ProcessStage(Stage):
                     logger.info("未找到可用的 LLM 提供商，请先前往配置服务提供商。")
                     return
 
-                async for _ in self.llm_request_sub_stage.process(event):
+                async for _ in self.agent_sub_stage.process(event):
                     yield

astrbot/core/pipeline/result_decorate/stage.py

@@ -161,11 +161,21 @@ class ResultDecorateStage(Stage):
                                 # 不分段回复
                                 new_chain.append(comp)
                                 continue
-                            split_response = re.findall(
-                                self.regex,
-                                comp.text,
-                                re.DOTALL | re.MULTILINE,
-                            )
+                            try:
+                                split_response = re.findall(
+                                    self.regex,
+                                    comp.text,
+                                    re.DOTALL | re.MULTILINE,
+                                )
+                            except re.error:
+                                logger.error(
+                                    f"分段回复正则表达式错误，使用默认分段方式: {traceback.format_exc()}",
+                                )
+                                split_response = re.findall(
+                                    r".*?[。？！~…]+|.+$",
+                                    comp.text,
+                                    re.DOTALL | re.MULTILINE,
+                                )
                             if not split_response:
                                 new_chain.append(comp)
                                 continue

astrbot/core/provider/manager.py

@@ -1,7 +1,7 @@
 import asyncio
 import traceback
 
-from astrbot.core import logger, sp
+from astrbot.core import astrbot_config, logger, sp
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 from astrbot.core.db import BaseDatabase
 
@@ -24,6 +24,7 @@ class ProviderManager:
         db_helper: BaseDatabase,
         persona_mgr: PersonaManager,
     ):
+        self.reload_lock = asyncio.Lock()
         self.persona_mgr = persona_mgr
         self.acm = acm
         config = acm.confs["default"]
@@ -226,6 +227,9 @@ class ProviderManager:
 
     async def load_provider(self, provider_config: dict):
         if not provider_config["enable"]:
+            logger.info(f"Provider {provider_config['id']} is disabled, skipping")
+            return
+        if provider_config.get("provider_type", "") == "agent_runner":
             return
 
         logger.info(
@@ -247,14 +251,6 @@ class ProviderManager:
                     from .sources.anthropic_source import (
                         ProviderAnthropic as ProviderAnthropic,
                     )
-                case "dify":
-                    from .sources.dify_source import ProviderDify as ProviderDify
-                case "coze":
-                    from .sources.coze_source import ProviderCoze as ProviderCoze
-                case "dashscope":
-                    from .sources.dashscope_source import (
-                        ProviderDashscope as ProviderDashscope,
-                    )
                 case "googlegenai_chat_completion":
                     from .sources.gemini_source import (
                         ProviderGoogleGenAI as ProviderGoogleGenAI,
@@ -440,40 +436,46 @@ class ProviderManager:
             )
 
     async def reload(self, provider_config: dict):
-        await self.terminate_provider(provider_config["id"])
-        if provider_config["enable"]:
-            await self.load_provider(provider_config)
-
-        # 和配置文件保持同步
-        config_ids = [provider["id"] for provider in self.providers_config]
-        logger.debug(f"providers in user's config: {config_ids}")
-        for key in list(self.inst_map.keys()):
-            if key not in config_ids:
-                await self.terminate_provider(key)
-
-        if len(self.provider_insts) == 0:
-            self.curr_provider_inst = None
-        elif self.curr_provider_inst is None and len(self.provider_insts) > 0:
-            self.curr_provider_inst = self.provider_insts[0]
-            logger.info(
-                f"自动选择 {self.curr_provider_inst.meta().id} 作为当前提供商适配器。",
-            )
+        async with self.reload_lock:
+            await self.terminate_provider(provider_config["id"])
+            if provider_config["enable"]:
+                await self.load_provider(provider_config)
 
-        if len(self.stt_provider_insts) == 0:
-            self.curr_stt_provider_inst = None
-        elif self.curr_stt_provider_inst is None and len(self.stt_provider_insts) > 0:
-            self.curr_stt_provider_inst = self.stt_provider_insts[0]
-            logger.info(
-                f"自动选择 {self.curr_stt_provider_inst.meta().id} 作为当前语音转文本提供商适配器。",
-            )
+            # 和配置文件保持同步
+            self.providers_config = astrbot_config["provider"]
+            config_ids = [provider["id"] for provider in self.providers_config]
+            logger.info(f"providers in user's config: {config_ids}")
+            for key in list(self.inst_map.keys()):
+                if key not in config_ids:
+                    await self.terminate_provider(key)
 
-        if len(self.tts_provider_insts) == 0:
-            self.curr_tts_provider_inst = None
-        elif self.curr_tts_provider_inst is None and len(self.tts_provider_insts) > 0:
-            self.curr_tts_provider_inst = self.tts_provider_insts[0]
-            logger.info(
-                f"自动选择 {self.curr_tts_provider_inst.meta().id} 作为当前文本转语音提供商适配器。",
-            )
+            if len(self.provider_insts) == 0:
+                self.curr_provider_inst = None
+            elif self.curr_provider_inst is None and len(self.provider_insts) > 0:
+                self.curr_provider_inst = self.provider_insts[0]
+                logger.info(
+                    f"自动选择 {self.curr_provider_inst.meta().id} 作为当前提供商适配器。",
+                )
+
+            if len(self.stt_provider_insts) == 0:
+                self.curr_stt_provider_inst = None
+            elif (
+                self.curr_stt_provider_inst is None and len(self.stt_provider_insts) > 0
+            ):
+                self.curr_stt_provider_inst = self.stt_provider_insts[0]
+                logger.info(
+                    f"自动选择 {self.curr_stt_provider_inst.meta().id} 作为当前语音转文本提供商适配器。",
+                )
+
+            if len(self.tts_provider_insts) == 0:
+                self.curr_tts_provider_inst = None
+            elif (
+                self.curr_tts_provider_inst is None and len(self.tts_provider_insts) > 0
+            ):
+                self.curr_tts_provider_inst = self.tts_provider_insts[0]
+                logger.info(
+                    f"自动选择 {self.curr_tts_provider_inst.meta().id} 作为当前文本转语音提供商适配器。",
+                )
 
     def get_insts(self):
         return self.provider_insts

astrbot/core/star/session_llm_manager.py

@@ -171,110 +171,3 @@ class SessionServiceManager:
 
         # 如果没有配置，默认为启用（兼容性考虑）
         return True
-
-    @staticmethod
-    def set_session_status(session_id: str, enabled: bool) -> None:
-        """设置会话的整体启停状态
-
-        Args:
-            session_id: 会话ID (unified_msg_origin)
-            enabled: True表示启用，False表示禁用
-
-        """
-        session_config = (
-            sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
-        )
-        session_config["session_enabled"] = enabled
-        sp.put(
-            "session_service_config",
-            session_config,
-            scope="umo",
-            scope_id=session_id,
-        )
-
-        logger.info(
-            f"会话 {session_id} 的整体状态已更新为: {'启用' if enabled else '禁用'}",
-        )
-
-    @staticmethod
-    def should_process_session_request(event: AstrMessageEvent) -> bool:
-        """检查是否应该处理会话请求（会话整体启停检查）
-
-        Args:
-            event: 消息事件
-
-        Returns:
-            bool: True表示应该处理，False表示跳过
-
-        """
-        session_id = event.unified_msg_origin
-        return SessionServiceManager.is_session_enabled(session_id)
-
-    # =============================================================================
-    # 会话命名相关方法
-    # =============================================================================
-
-    @staticmethod
-    def get_session_custom_name(session_id: str) -> str | None:
-        """获取会话的自定义名称
-
-        Args:
-            session_id: 会话ID (unified_msg_origin)
-
-        Returns:
-            str: 自定义名称，如果没有设置则返回None
-
-        """
-        session_services = sp.get(
-            "session_service_config",
-            {},
-            scope="umo",
-            scope_id=session_id,
-        )
-        return session_services.get("custom_name")
-
-    @staticmethod
-    def set_session_custom_name(session_id: str, custom_name: str) -> None:
-        """设置会话的自定义名称
-
-        Args:
-            session_id: 会话ID (unified_msg_origin)
-            custom_name: 自定义名称，可以为空字符串来清除名称
-
-        """
-        session_config = (
-            sp.get("session_service_config", {}, scope="umo", scope_id=session_id) or {}
-        )
-        if custom_name and custom_name.strip():
-            session_config["custom_name"] = custom_name.strip()
-        else:
-            # 如果传入空名称，则删除自定义名称
-            session_config.pop("custom_name", None)
-        sp.put(
-            "session_service_config",
-            session_config,
-            scope="umo",
-            scope_id=session_id,
-        )
-
-        logger.info(
-            f"会话 {session_id} 的自定义名称已更新为: {custom_name.strip() if custom_name and custom_name.strip() else '已清除'}",
-        )
-
-    @staticmethod
-    def get_session_display_name(session_id: str) -> str:
-        """获取会话的显示名称（优先显示自定义名称，否则显示原始session_id的最后一段）
-
-        Args:
-            session_id: 会话ID (unified_msg_origin)
-
-        Returns:
-            str: 显示名称
-
-        """
-        custom_name = SessionServiceManager.get_session_custom_name(session_id)
-        if custom_name:
-            return custom_name
-
-        # 如果没有自定义名称，返回session_id的最后一段
-        return session_id.split(":")[2] if session_id.count(":") >= 2 else session_id