AstrBot 4.13.1__tar.gz → 4.13.2__tar.gz

{astrbot-4.13.1 → astrbot-4.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AstrBot
-Version: 4.13.1
+Version: 4.13.2
 Summary: Easy-to-use multi-platform LLM chatbot and development framework
 License-File: LICENSE
 Keywords: Astrbot,Astrbot Module,Astrbot Plugin

{astrbot-4.13.1 → astrbot-4.13.2}/astrbot/builtin_stars/astrbot/process_llm_request.py

@@ -38,7 +38,12 @@ class ProcessLLMRequest:
         req.func_tool.add_tool(LOCAL_PYTHON_TOOL)
 
     async def _ensure_persona(
-        self, req: ProviderRequest, cfg: dict, umo: str, platform_type: str
+        self,
+        req: ProviderRequest,
+        cfg: dict,
+        umo: str,
+        platform_type: str,
+        event: AstrMessageEvent,
     ):
         """确保用户人格已加载"""
         if not req.conversation:
@@ -121,6 +126,9 @@ class ProcessLLMRequest:
             req.func_tool = toolset
         else:
             req.func_tool.merge(toolset)
+        event.trace.record(
+            "sel_persona", persona_id=persona_id, persona_toolset=toolset.names()
+        )
         logger.debug(f"Tool set for persona {persona_id}: {toolset.names()}")
 
     async def _ensure_img_caption(
@@ -225,7 +233,7 @@ class ProcessLLMRequest:
             # inject persona for this request
             platform_type = event.get_platform_name()
             await self._ensure_persona(
-                req, cfg, event.unified_msg_origin, platform_type
+                req, cfg, event.unified_msg_origin, platform_type, event
             )
 
             # image caption

astrbot-4.13.2/astrbot/cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "4.13.2"

{astrbot-4.13.1 → astrbot-4.13.2}/astrbot/core/__init__.py

@@ -20,6 +20,8 @@ astrbot_config = AstrBotConfig()
 t2i_base_url = astrbot_config.get("t2i_endpoint", "https://t2i.soulter.top/text2img")
 html_renderer = HtmlRenderer(t2i_base_url)
 logger = LogManager.GetLogger(log_name="astrbot")
+LogManager.configure_logger(logger, astrbot_config)
+LogManager.configure_trace_logger(astrbot_config)
 db_helper = SQLiteDatabase(DB_PATH)
 # 简单的偏好设置存储, 这里后续应该存储到数据库中, 一些部分可以存储到配置中
 sp = SharedPreferences(db_helper=db_helper)

{astrbot-4.13.1 → astrbot-4.13.2}/astrbot/core/config/default.py

@@ -5,7 +5,7 @@ from typing import Any, TypedDict
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.13.1"
+VERSION = "4.13.2"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [
@@ -182,6 +182,12 @@ DEFAULT_CONFIG = {
     },
     "wake_prefix": ["/"],
     "log_level": "INFO",
+    "log_file_enable": False,
+    "log_file_path": "logs/astrbot.log",
+    "log_file_max_mb": 20,
+    "trace_log_enable": False,
+    "trace_log_path": "logs/astrbot.trace.log",
+    "trace_log_max_mb": 20,
     "pip_install_arg": "",
     "pypi_index_url": "https://mirrors.aliyun.com/pypi/simple/",
     "persona": [],  # deprecated
@@ -2321,6 +2327,18 @@ CONFIG_METADATA_2 = {
                 "type": "string",
                 "options": ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
             },
+            "log_file_enable": {"type": "bool"},
+            "log_file_path": {"type": "string", "condition": {"log_file_enable": True}},
+            "log_file_max_mb": {"type": "int", "condition": {"log_file_enable": True}},
+            "trace_log_enable": {"type": "bool"},
+            "trace_log_path": {
+                "type": "string",
+                "condition": {"trace_log_enable": True},
+            },
+            "trace_log_max_mb": {
+                "type": "int",
+                "condition": {"trace_log_enable": True},
+            },
             "t2i_strategy": {
                 "type": "string",
                 "options": ["remote", "local"],
@@ -3253,6 +3271,36 @@ CONFIG_METADATA_3_SYSTEM = {
                         "hint": "控制台输出日志的级别。",
                         "options": ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
                     },
+                    "log_file_enable": {
+                        "description": "启用文件日志",
+                        "type": "bool",
+                        "hint": "开启后会将日志写入指定文件。",
+                    },
+                    "log_file_path": {
+                        "description": "日志文件路径",
+                        "type": "string",
+                        "hint": "相对路径以 data 目录为基准，例如 logs/astrbot.log；支持绝对路径。",
+                    },
+                    "log_file_max_mb": {
+                        "description": "日志文件大小上限 (MB)",
+                        "type": "int",
+                        "hint": "超过大小后自动轮转，默认 20MB。",
+                    },
+                    "trace_log_enable": {
+                        "description": "启用 Trace 文件日志",
+                        "type": "bool",
+                        "hint": "将 Trace 事件写入独立文件（不影响控制台输出）。",
+                    },
+                    "trace_log_path": {
+                        "description": "Trace 日志文件路径",
+                        "type": "string",
+                        "hint": "相对路径以 data 目录为基准，例如 logs/astrbot.trace.log；支持绝对路径。",
+                    },
+                    "trace_log_max_mb": {
+                        "description": "Trace 日志大小上限 (MB)",
+                        "type": "int",
+                        "hint": "超过大小后自动轮转，默认 20MB。",
+                    },
                     "pip_install_arg": {
                         "description": "pip 安装额外参数",
                         "type": "string",

{astrbot-4.13.1 → astrbot-4.13.2}/astrbot/core/core_lifecycle.py

@@ -17,7 +17,7 @@ import traceback
 from asyncio import Queue
 
 from astrbot.api import logger, sp
-from astrbot.core import LogBroker
+from astrbot.core import LogBroker, LogManager
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 from astrbot.core.config.default import VERSION
 from astrbot.core.conversation_mgr import ConversationManager
@@ -80,9 +80,13 @@ class AstrBotCoreLifecycle:
         # 初始化日志代理
         logger.info("AstrBot v" + VERSION)
         if os.environ.get("TESTING", ""):
-            logger.setLevel("DEBUG")  # 测试模式下设置日志级别为 DEBUG
+            LogManager.configure_logger(
+                logger, self.astrbot_config, override_level="DEBUG"
+            )
+            LogManager.configure_trace_logger(self.astrbot_config)
         else:
-            logger.setLevel(self.astrbot_config["log_level"])  # 设置日志级别
+            LogManager.configure_logger(logger, self.astrbot_config)
+            LogManager.configure_trace_logger(self.astrbot_config)
 
         await self.db.initialize()
 

{astrbot-4.13.1 → astrbot-4.13.2}/astrbot/core/event_bus.py

@@ -54,6 +54,7 @@ class EventBus:
             event (AstrMessageEvent): 事件对象
 
         """
+        event.trace.record("event_dispatch", config_name=conf_name)
         # 如果有发送者名称: [平台名] 发送者名称/发送者ID: 消息概要
         if event.get_sender_name():
             logger.info(

{astrbot-4.13.1 → astrbot-4.13.2}/astrbot/core/log.py

@@ -27,13 +27,15 @@ import sys
 import time
 from asyncio import Queue
 from collections import deque
+from logging.handlers import RotatingFileHandler
 
 import colorlog
 
 from astrbot.core.config.default import VERSION
+from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
 # 日志缓存大小
-CACHED_SIZE = 200
+CACHED_SIZE = 500
 # 日志颜色配置
 log_color_config = {
     "DEBUG": "green",
@@ -163,6 +165,9 @@ class LogManager:
     提供了获取默认日志记录器logger和设置队列处理器的方法
     """
 
+    _FILE_HANDLER_FLAG = "_astrbot_file_handler"
+    _TRACE_FILE_HANDLER_FLAG = "_astrbot_trace_file_handler"
+
     @classmethod
     def GetLogger(cls, log_name: str = "default"):
         """获取指定名称的日志记录器logger
@@ -266,3 +271,186 @@ class LogManager:
                 ),
             )
         logger.addHandler(handler)
+
+    @classmethod
+    def _default_log_path(cls) -> str:
+        return os.path.join(get_astrbot_data_path(), "logs", "astrbot.log")
+
+    @classmethod
+    def _resolve_log_path(cls, configured_path: str | None) -> str:
+        if not configured_path:
+            return cls._default_log_path()
+        if os.path.isabs(configured_path):
+            return configured_path
+        return os.path.join(get_astrbot_data_path(), configured_path)
+
+    @classmethod
+    def _get_file_handlers(cls, logger: logging.Logger) -> list[logging.Handler]:
+        return [
+            handler
+            for handler in logger.handlers
+            if getattr(handler, cls._FILE_HANDLER_FLAG, False)
+        ]
+
+    @classmethod
+    def _get_trace_file_handlers(cls, logger: logging.Logger) -> list[logging.Handler]:
+        return [
+            handler
+            for handler in logger.handlers
+            if getattr(handler, cls._TRACE_FILE_HANDLER_FLAG, False)
+        ]
+
+    @classmethod
+    def _remove_file_handlers(cls, logger: logging.Logger):
+        for handler in cls._get_file_handlers(logger):
+            logger.removeHandler(handler)
+            try:
+                handler.close()
+            except Exception:
+                pass
+
+    @classmethod
+    def _remove_trace_file_handlers(cls, logger: logging.Logger):
+        for handler in cls._get_trace_file_handlers(logger):
+            logger.removeHandler(handler)
+            try:
+                handler.close()
+            except Exception:
+                pass
+
+    @classmethod
+    def _add_file_handler(
+        cls,
+        logger: logging.Logger,
+        file_path: str,
+        max_mb: int | None = None,
+        backup_count: int = 3,
+        trace: bool = False,
+    ):
+        os.makedirs(os.path.dirname(file_path) or ".", exist_ok=True)
+        max_bytes = 0
+        if max_mb and max_mb > 0:
+            max_bytes = max_mb * 1024 * 1024
+        if max_bytes > 0:
+            file_handler = RotatingFileHandler(
+                file_path,
+                maxBytes=max_bytes,
+                backupCount=backup_count,
+                encoding="utf-8",
+            )
+        else:
+            file_handler = logging.FileHandler(file_path, encoding="utf-8")
+        file_handler.setLevel(logger.level)
+        if trace:
+            formatter = logging.Formatter(
+                "[%(asctime)s] %(message)s",
+                datefmt="%Y-%m-%d %H:%M:%S",
+            )
+        else:
+            formatter = logging.Formatter(
+                "[%(asctime)s] %(plugin_tag)s [%(short_levelname)s]%(astrbot_version_tag)s [%(filename)s:%(lineno)d]: %(message)s",
+                datefmt="%Y-%m-%d %H:%M:%S",
+            )
+        file_handler.setFormatter(formatter)
+        setattr(
+            file_handler,
+            cls._TRACE_FILE_HANDLER_FLAG if trace else cls._FILE_HANDLER_FLAG,
+            True,
+        )
+        logger.addHandler(file_handler)
+
+    @classmethod
+    def configure_logger(
+        cls,
+        logger: logging.Logger,
+        config: dict | None,
+        override_level: str | None = None,
+    ):
+        """根据配置设置日志级别和文件日志。
+
+        Args:
+            logger: 需要配置的 logger
+            config: 配置字典
+            override_level: 若提供，将覆盖配置中的日志级别
+        """
+        if not config:
+            return
+
+        level = override_level or config.get("log_level")
+        if level:
+            try:
+                logger.setLevel(level)
+            except Exception:
+                logger.setLevel(logging.INFO)
+
+        # 兼容旧版嵌套配置
+        if "log_file" in config:
+            file_conf = config.get("log_file") or {}
+            enable_file = bool(file_conf.get("enable", False))
+            file_path = file_conf.get("path")
+            max_mb = file_conf.get("max_mb")
+        else:
+            enable_file = bool(config.get("log_file_enable", False))
+            file_path = config.get("log_file_path")
+            max_mb = config.get("log_file_max_mb")
+
+        file_path = cls._resolve_log_path(file_path)
+
+        existing = cls._get_file_handlers(logger)
+        if not enable_file:
+            cls._remove_file_handlers(logger)
+            return
+
+        # 如果已有文件处理器且路径一致，则仅同步级别
+        if existing:
+            handler = existing[0]
+            base = getattr(handler, "baseFilename", "")
+            if base and os.path.abspath(base) == os.path.abspath(file_path):
+                handler.setLevel(logger.level)
+                return
+            cls._remove_file_handlers(logger)
+
+        cls._add_file_handler(logger, file_path, max_mb=max_mb)
+
+    @classmethod
+    def configure_trace_logger(cls, config: dict | None):
+        """为 trace 事件配置独立的文件日志，不向控制台输出。"""
+        if not config:
+            return
+
+        enable = bool(
+            config.get("trace_log_enable")
+            or (config.get("log_file", {}) or {}).get("trace_enable", False)
+        )
+        path = config.get("trace_log_path")
+        max_mb = config.get("trace_log_max_mb")
+        if "log_file" in config:
+            legacy = config.get("log_file") or {}
+            path = path or legacy.get("trace_path")
+            max_mb = max_mb or legacy.get("trace_max_mb")
+
+        if not enable:
+            trace_logger = logging.getLogger("astrbot.trace")
+            cls._remove_trace_file_handlers(trace_logger)
+            return
+
+        file_path = cls._resolve_log_path(path or "logs/astrbot.trace.log")
+        trace_logger = logging.getLogger("astrbot.trace")
+        trace_logger.setLevel(logging.INFO)
+        trace_logger.propagate = False
+
+        existing = cls._get_trace_file_handlers(trace_logger)
+        if existing:
+            handler = existing[0]
+            base = getattr(handler, "baseFilename", "")
+            if base and os.path.abspath(base) == os.path.abspath(file_path):
+                handler.setLevel(trace_logger.level)
+                return
+            cls._remove_trace_file_handlers(trace_logger)
+
+        cls._add_file_handler(
+            trace_logger,
+            file_path,
+            max_mb=max_mb,
+            trace=True,
+        )

{astrbot-4.13.1 → astrbot-4.13.2}/astrbot/core/pipeline/process_stage/method/agent_sub_stages/internal.py

@@ -692,6 +692,17 @@ class InternalAgentSubStage(Stage):
                 if action_type == "live":
                     req.system_prompt += f"\n{LIVE_MODE_SYSTEM_PROMPT}\n"
 
+                event.trace.record(
+                    "astr_agent_prepare",
+                    system_prompt=req.system_prompt,
+                    tools=req.func_tool.names() if req.func_tool else [],
+                    stream=streaming_response,
+                    chat_provider={
+                        "id": provider.provider_config.get("id", ""),
+                        "model": provider.get_model(),
+                    },
+                )
+
                 await agent_runner.reset(
                     provider=provider,
                     request=req,
@@ -796,12 +807,20 @@ class InternalAgentSubStage(Stage):
                     ):
                         yield
 
+                final_resp = agent_runner.get_final_llm_resp()
+
+                event.trace.record(
+                    "astr_agent_complete",
+                    stats=agent_runner.stats.to_dict(),
+                    resp=final_resp.completion_text if final_resp else None,
+                )
+
                 # 检查事件是否被停止，如果被停止则不保存历史记录
                 if not event.is_stopped():
                     await self._save_to_history(
                         event,
                         req,
-                        agent_runner.get_final_llm_resp(),
+                        final_resp,
                         agent_runner.run_context.messages,
                         agent_runner.stats,
                     )

{astrbot-4.13.1 → astrbot-4.13.2}/astrbot/core/pipeline/scheduler.py

@@ -85,4 +85,6 @@ class PipelineScheduler:
         if isinstance(event, WebChatMessageEvent | WecomAIBotMessageEvent):
             await event.send(None)
 
+        event.trace.record("event_end")
+
         logger.debug("pipeline 执行完毕。")

{astrbot-4.13.1 → astrbot-4.13.2}/astrbot/core/platform/astr_message_event.py

@@ -4,6 +4,7 @@ import hashlib
 import re
 import uuid
 from collections.abc import AsyncGenerator
+from time import time
 from typing import Any
 
 from astrbot import logger
@@ -22,6 +23,7 @@ from astrbot.core.message.message_event_result import MessageChain, MessageEvent
 from astrbot.core.platform.message_type import MessageType
 from astrbot.core.provider.entities import ProviderRequest
 from astrbot.core.utils.metrics import Metric
+from astrbot.core.utils.trace import TraceSpan
 
 from .astrbot_message import AstrBotMessage, Group
 from .message_session import MessageSesion, MessageSession  # noqa
@@ -59,6 +61,21 @@ class AstrMessageEvent(abc.ABC):
         self._result: MessageEventResult | None = None
         """消息事件的结果"""
 
+        self.created_at = time()
+        """事件创建时间(Unix timestamp)"""
+        self.trace = TraceSpan(
+            name="AstrMessageEvent",
+            umo=self.unified_msg_origin,
+            sender_name=self.get_sender_name(),
+            message_outline=self.get_message_outline(),
+        )
+        """用于记录事件处理的 TraceSpan 对象"""
+        self.span = self.trace
+        """事件级 TraceSpan(别名: span)"""
+
+        self.trace.record("umo", umo=self.unified_msg_origin)
+        self.trace.record("event_created", created_at=self.created_at)
+
         self._has_send_oper = False
         """在此次事件中是否有过至少一次发送消息的操作"""
         self.call_llm = False

astrbot-4.13.2/astrbot/core/utils/trace.py

@@ -0,0 +1,73 @@
+import json
+import logging
+import time
+import uuid
+from typing import Any
+
+from astrbot import logger
+from astrbot.core import LogManager, astrbot_config
+from astrbot.core.log import LogQueueHandler
+
+_cached_log_broker = None
+_trace_logger = None
+
+
+def _get_log_broker():
+    global _cached_log_broker
+    if _cached_log_broker is not None:
+        return _cached_log_broker
+    for handler in logger.handlers:
+        if isinstance(handler, LogQueueHandler):
+            _cached_log_broker = handler.log_broker
+            return _cached_log_broker
+    return None
+
+
+def _get_trace_logger():
+    global _trace_logger
+    if _trace_logger is not None:
+        return _trace_logger
+
+    # 按配置初始化 trace 文件日志
+    LogManager.configure_trace_logger(astrbot_config)
+    _trace_logger = logging.getLogger("astrbot.trace")
+    return _trace_logger
+
+
+class TraceSpan:
+    def __init__(
+        self,
+        name: str,
+        umo: str | None = None,
+        sender_name: str | None = None,
+        message_outline: str | None = None,
+    ) -> None:
+        self.span_id = str(uuid.uuid4())
+        self.name = name
+        self.umo = umo
+        self.sender_name = sender_name
+        self.message_outline = message_outline
+        self.started_at = time.time()
+
+    def record(self, action: str, **fields: Any) -> None:
+        payload = {
+            "type": "trace",
+            "level": "TRACE",
+            "time": time.time(),
+            "span_id": self.span_id,
+            "name": self.name,
+            "umo": self.umo,
+            "sender_name": self.sender_name,
+            "message_outline": self.message_outline,
+            "action": action,
+            "fields": fields,
+        }
+        log_broker = _get_log_broker()
+        if log_broker:
+            log_broker.publish(payload)
+        else:
+            logger.info(f"[trace] {payload}")
+
+        trace_logger = _get_trace_logger()
+        if trace_logger and trace_logger.handlers:
+            trace_logger.info(json.dumps(payload, ensure_ascii=False))

astrbot-4.13.2/changelogs/v4.13.2.md

@@ -0,0 +1,8 @@
+## What's Changed
+
+### fixes
+
+- feat(chat): feat: trace and log file config ([#4747](https://github.com/AstrBotDevs/AstrBot/issues/4747))
+- fix: WebUI shows success message when skills upload failed ([#4768](https://github.com/AstrBotDevs/AstrBot/issues/4768))
+- fix: cannot use tools when using skills-like tool schema mode ([#4775](https://github.com/AstrBotDevs/AstrBot/issues/4775))
+- fix(context): llm tools' origin in WebUI displayed `unknown` ([#4776](https://github.com/AstrBotDevs/AstrBot/issues/4776))