Merge branch 'master' of https://github.com/elecvoid243/AstrBot

Author: elecvoid243

astrbot/builtin_stars/astrbot/.astrbot-plugin/i18n/en-US.json

@@ -0,0 +1,6 @@
+{
+  "metadata": {
+    "display_name": "AstrBot",
+    "desc": "AstrBot's internal plugin, providing some basic capabilities."
+  }
+}

astrbot/builtin_stars/astrbot/.astrbot-plugin/i18n/zh-CN.json

@@ -0,0 +1,6 @@
+{
+  "metadata": {
+    "display_name": "AstrBot",
+    "desc": "AstrBot 的内部插件，提供一些基础能力。"
+  }
+}

astrbot/builtin_stars/astrbot/main.py

@@ -1,10 +1,20 @@
+import copy
 import traceback
+from sys import maxsize
 
+import astrbot.api.message_components as Comp
 from astrbot.api import star
 from astrbot.api.event import AstrMessageEvent, filter
 from astrbot.api.message_components import Image, Plain
 from astrbot.api.provider import LLMResponse, ProviderRequest
 from astrbot.core import logger
+from astrbot.core.utils.session_waiter import (
+    FILTERS,
+    USER_SESSIONS,
+    SessionController,
+    SessionWaiter,
+    session_waiter,
+)
 
 from .long_term_memory import LongTermMemory
 
@@ -18,6 +28,103 @@ def __init__(self, context: star.Context) -> None:
         except BaseException as e:
             logger.error(f"聊天增强 err: {e}")
 
+    @filter.event_message_type(filter.EventMessageType.ALL, priority=maxsize)
+    async def handle_session_control_agent(self, event: AstrMessageEvent) -> None:
+        """会话控制代理"""
+        for session_filter in FILTERS:
+            session_id = session_filter.filter(event)
+            if session_id in USER_SESSIONS:
+                await SessionWaiter.trigger(session_id, event)
+                event.stop_event()
+
+    @filter.event_message_type(filter.EventMessageType.ALL, priority=maxsize - 1)
+    async def handle_empty_mention(self, event: AstrMessageEvent):
+        """处理只有一个 @ 或仅有唤醒前缀的消息，并等待用户下一条内容。"""
+        try:
+            messages = event.get_messages()
+            cfg = self.context.get_config(umo=event.unified_msg_origin)
+            p_settings = cfg["platform_settings"]
+            wake_prefix = cfg.get("wake_prefix", [])
+            if len(messages) != 1:
+                return
+
+            is_empty_mention = (
+                isinstance(messages[0], Comp.At)
+                and str(messages[0].qq) == str(event.get_self_id())
+                and p_settings.get("empty_mention_waiting", True)
+            )
+            is_wake_prefix_only = (
+                isinstance(messages[0], Comp.Plain)
+                and messages[0].text.strip() in wake_prefix
+            )
+
+            if not (is_empty_mention or is_wake_prefix_only):
+                return
+
+            if p_settings.get("empty_mention_waiting_need_reply", True):
+                try:
+                    curr_cid = await self.context.conversation_manager.get_curr_conversation_id(
+                        event.unified_msg_origin,
+                    )
+                    conversation = None
+
+                    if curr_cid:
+                        conversation = (
+                            await self.context.conversation_manager.get_conversation(
+                                event.unified_msg_origin,
+                                curr_cid,
+                            )
+                        )
+                    else:
+                        curr_cid = (
+                            await self.context.conversation_manager.new_conversation(
+                                event.unified_msg_origin,
+                                platform_id=event.get_platform_id(),
+                            )
+                        )
+
+                    yield event.request_llm(
+                        prompt=(
+                            "注意，你正在社交媒体上中与用户进行聊天，用户只是通过@来唤醒你，但并未在这条消息中输入内容，他可能会在接下来一条发送他想发送的内容。"
+                            "你友好地询问用户想要聊些什么或者需要什么帮助，回复要符合人设，不要太过机械化。"
+                            "请注意，你仅需要输出要回复用户的内容，不要输出其他任何东西"
+                        ),
+                        session_id=curr_cid,
+                        contexts=[],
+                        system_prompt="",
+                        conversation=conversation,
+                    )
+                except Exception as e:
+                    logger.error(f"LLM response failed: {e!s}")
+                    yield event.plain_result("想要问什么呢？😄")
+
+            @session_waiter(60)
+            async def empty_mention_waiter(
+                controller: SessionController,
+                event: AstrMessageEvent,
+            ) -> None:
+                if not event.message_str or not event.message_str.strip():
+                    return
+                event.message_obj.message.insert(
+                    0,
+                    Comp.At(qq=event.get_self_id(), name=event.get_self_id()),
+                )
+                new_event = copy.copy(event)
+                self.context.get_event_queue().put_nowait(new_event)
+                event.stop_event()
+                controller.stop()
+
+            try:
+                await empty_mention_waiter(event)
+            except TimeoutError:
+                pass
+            except Exception as e:
+                yield event.plain_result("发生错误，请联系管理员: " + str(e))
+            finally:
+                event.stop_event()
+        except Exception as e:
+            logger.error("handle_empty_mention error: " + str(e))
+
     def ltm_enabled(self, event: AstrMessageEvent):
         ltmse = self.context.get_config(umo=event.unified_msg_origin)[
             "provider_ltm_settings"

astrbot/builtin_stars/astrbot/metadata.yaml

@@ -1,4 +1,4 @@
 name: astrbot
-desc: AstrBot 自带插件，包含人格注入、思考内容注入、群聊上下文感知等功能的实现，禁用后将无法使用这些功能。
-author: Soulter
-version: 4.1.0
+desc: AstrBot's internal plugin, providing some basic capabilities.
+author: AstrBot Team
+version: 4.1.0

astrbot/builtin_stars/builtin_commands/.astrbot-plugin/i18n/en-US.json

@@ -0,0 +1,6 @@
+{
+  "metadata": {
+    "display_name": "Built-in Commands",
+    "desc": "AstrBot's internal plugin, providing built-in commands such as /reset, /help, and /sid."
+  }
+}

astrbot/builtin_stars/builtin_commands/.astrbot-plugin/i18n/zh-CN.json

@@ -0,0 +1,6 @@
+{
+  "metadata": {
+    "display_name": "内置指令",
+    "desc": "AstrBot 自带插件，提供 /reset、/help、/sid 等内置指令。"
+  }
+}

astrbot/builtin_stars/builtin_commands/metadata.yaml

@@ -1,4 +1,4 @@
 name: builtin_commands
-desc: AstrBot 自带指令，提供常用的对话管理、工具使用、插件管理等功能。
+desc: AstrBot's internal plugin, providing all built-in commands such as /reset.
 author: Soulter
 version: 0.0.1

astrbot/builtin_stars/session_controller/main.py

@@ -153,6 +153,8 @@ class MainAgentBuildConfig:
     This enforce max turns before compression"""
     dequeue_context_length: int = 1
     """The number of oldest turns to remove when context length limit is reached."""
+    fallback_max_context_tokens: int = 128000
+    """Fallback max context tokens. When max_context_tokens is 0 and the model is not in LLM_METADATAS, use this value."""
     llm_safety_mode: bool = True
     """This will inject healthy and safe system prompt into the main agent,
     to prevent LLM output harmful information"""
@@ -400,6 +402,9 @@ async def _ensure_persona_and_skills(
         event, extract_persona_custom_error_message_from_persona(persona)
     )
 
+    if req.system_prompt is None:
+        req.system_prompt = ""
+
     if persona:
         # Inject persona system prompt
         if prompt := persona["prompt"]:
@@ -1462,6 +1467,11 @@ async def build_main_agent(
             provider.provider_config["max_context_tokens"] = model_info["limit"][
                 "context"
             ]
+        else:
+            # fallback: default to configured fallback value
+            provider.provider_config["max_context_tokens"] = (
+                config.fallback_max_context_tokens
+            )
 
     if event.get_platform_name() == "webchat":
         asyncio.create_task(_handle_webchat(event, req, provider))