AstrBot 4.12.4__py3-none-any.whl → 4.13.1__py3-none-any.whl

astrbot/core/db/po.py

@@ -6,6 +6,14 @@ from typing import TypedDict
 from sqlmodel import JSON, Field, SQLModel, Text, UniqueConstraint
 
 
+class TimestampMixin(SQLModel):
+    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
+    updated_at: datetime = Field(
+        default_factory=lambda: datetime.now(timezone.utc),
+        sa_column_kwargs={"onupdate": lambda: datetime.now(timezone.utc)},
+    )
+
+
 class PlatformStat(SQLModel, table=True):
     """This class represents the statistics of bot usage across different platforms.
 
@@ -30,7 +38,7 @@ class PlatformStat(SQLModel, table=True):
     )
 
 
-class ConversationV2(SQLModel, table=True):
+class ConversationV2(TimestampMixin, SQLModel, table=True):
     __tablename__: str = "conversations"
 
     inner_conversation_id: int | None = Field(
@@ -47,11 +55,7 @@ class ConversationV2(SQLModel, table=True):
     platform_id: str = Field(nullable=False)
     user_id: str = Field(nullable=False)
     content: list | None = Field(default=None, sa_type=JSON)
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
+
     title: str | None = Field(default=None, max_length=255)
     persona_id: str | None = Field(default=None)
     token_usage: int = Field(default=0, nullable=False)
@@ -68,7 +72,7 @@ class ConversationV2(SQLModel, table=True):
     )
 
 
-class PersonaFolder(SQLModel, table=True):
+class PersonaFolder(TimestampMixin, SQLModel, table=True):
     """Persona 文件夹，支持递归层级结构。
 
     用于组织和管理多个 Persona，类似于文件系统的目录结构。
@@ -92,11 +96,6 @@ class PersonaFolder(SQLModel, table=True):
     """父文件夹ID，NULL表示根目录"""
     description: str | None = Field(default=None, sa_type=Text)
     sort_order: int = Field(default=0)
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
 
     __table_args__ = (
         UniqueConstraint(
@@ -106,7 +105,7 @@ class PersonaFolder(SQLModel, table=True):
     )
 
 
-class Persona(SQLModel, table=True):
+class Persona(TimestampMixin, SQLModel, table=True):
     """Persona is a set of instructions for LLMs to follow.
 
     It can be used to customize the behavior of LLMs.
@@ -125,15 +124,12 @@ class Persona(SQLModel, table=True):
     """a list of strings, each representing a dialog to start with"""
     tools: list | None = Field(default=None, sa_type=JSON)
     """None means use ALL tools for default, empty list means no tools, otherwise a list of tool names."""
+    skills: list | None = Field(default=None, sa_type=JSON)
+    """None means use ALL skills for default, empty list means no skills, otherwise a list of skill names."""
     folder_id: str | None = Field(default=None, max_length=36)
     """所属文件夹ID，NULL 表示在根目录"""
     sort_order: int = Field(default=0)
     """排序顺序"""
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
 
     __table_args__ = (
         UniqueConstraint(
@@ -143,7 +139,7 @@ class Persona(SQLModel, table=True):
     )
 
 
-class Preference(SQLModel, table=True):
+class Preference(TimestampMixin, SQLModel, table=True):
     """This class represents preferences for bots."""
 
     __tablename__: str = "preferences"
@@ -159,11 +155,6 @@ class Preference(SQLModel, table=True):
     """ID of the scope, such as 'global', 'umo', 'plugin_name'."""
     key: str = Field(nullable=False)
     value: dict = Field(sa_type=JSON, nullable=False)
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
 
     __table_args__ = (
         UniqueConstraint(
@@ -175,7 +166,7 @@ class Preference(SQLModel, table=True):
     )
 
 
-class PlatformMessageHistory(SQLModel, table=True):
+class PlatformMessageHistory(TimestampMixin, SQLModel, table=True):
     """This class represents the message history for a specific platform.
 
     It is used to store messages that are not LLM-generated, such as user messages
@@ -196,14 +187,9 @@ class PlatformMessageHistory(SQLModel, table=True):
         default=None,
     )  # Name of the sender in the platform
     content: dict = Field(sa_type=JSON, nullable=False)  # a message chain list
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
 
 
-class PlatformSession(SQLModel, table=True):
+class PlatformSession(TimestampMixin, SQLModel, table=True):
     """Platform session table for managing user sessions across different platforms.
 
     A session represents a chat window for a specific user on a specific platform.
@@ -231,11 +217,6 @@ class PlatformSession(SQLModel, table=True):
     """Display name for the session"""
     is_group: int = Field(default=0, nullable=False)
     """0 for private chat, 1 for group chat (not implemented yet)"""
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
 
     __table_args__ = (
         UniqueConstraint(
@@ -245,7 +226,7 @@ class PlatformSession(SQLModel, table=True):
     )
 
 
-class Attachment(SQLModel, table=True):
+class Attachment(TimestampMixin, SQLModel, table=True):
     """This class represents attachments for messages in AstrBot.
 
     Attachments can be images, files, or other media types.
@@ -267,11 +248,6 @@ class Attachment(SQLModel, table=True):
     path: str = Field(nullable=False)  # Path to the file on disk
     type: str = Field(nullable=False)  # Type of the file (e.g., 'image', 'file')
     mime_type: str = Field(nullable=False)  # MIME type of the file
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
 
     __table_args__ = (
         UniqueConstraint(
@@ -281,7 +257,7 @@ class Attachment(SQLModel, table=True):
     )
 
 
-class ChatUIProject(SQLModel, table=True):
+class ChatUIProject(TimestampMixin, SQLModel, table=True):
     """This class represents projects for organizing ChatUI conversations.
 
     Projects allow users to group related conversations together.
@@ -308,11 +284,6 @@ class ChatUIProject(SQLModel, table=True):
     """Title of the project"""
     description: str | None = Field(default=None, max_length=1000)
     """Description of the project"""
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
 
     __table_args__ = (
         UniqueConstraint(
@@ -336,7 +307,6 @@ class SessionProjectRelation(SQLModel, table=True):
     """Session ID from PlatformSession"""
     project_id: str = Field(nullable=False, max_length=36)
     """Project ID from ChatUIProject"""
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
 
     __table_args__ = (
         UniqueConstraint(
@@ -346,7 +316,7 @@ class SessionProjectRelation(SQLModel, table=True):
     )
 
 
-class CommandConfig(SQLModel, table=True):
+class CommandConfig(TimestampMixin, SQLModel, table=True):
     """Per-command configuration overrides for dashboard management."""
 
     __tablename__ = "command_configs"  # type: ignore
@@ -366,14 +336,9 @@ class CommandConfig(SQLModel, table=True):
     note: str | None = Field(default=None, sa_type=Text)
     extra_data: dict | None = Field(default=None, sa_type=JSON)
     auto_managed: bool = Field(default=False, nullable=False)
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
 
 
-class CommandConflict(SQLModel, table=True):
+class CommandConflict(TimestampMixin, SQLModel, table=True):
     """Conflict tracking for duplicated command names."""
 
     __tablename__ = "command_conflicts"  # type: ignore
@@ -390,11 +355,6 @@ class CommandConflict(SQLModel, table=True):
     note: str | None = Field(default=None, sa_type=Text)
     extra_data: dict | None = Field(default=None, sa_type=JSON)
     auto_generated: bool = Field(default=False, nullable=False)
-    created_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
-    updated_at: datetime = Field(
-        default_factory=lambda: datetime.now(timezone.utc),
-        sa_column_kwargs={"onupdate": datetime.now(timezone.utc)},
-    )
 
     __table_args__ = (
         UniqueConstraint(
@@ -442,6 +402,8 @@ class Personality(TypedDict):
     """情感模拟对话预设。在 v4.0.0 版本及之后，已被废弃。"""
     tools: list[str] | None
     """工具列表。None 表示使用所有工具，空列表表示不使用任何工具"""
+    skills: list[str] | None
+    """Skills 列表。None 表示使用所有 Skills，空列表表示不使用任何 Skills"""
 
     # cache
     _begin_dialogs_processed: list[dict]

astrbot/core/db/sqlite.py

@@ -52,8 +52,9 @@ class SQLiteDatabase(BaseDatabase):
             await conn.execute(text("PRAGMA temp_store=MEMORY"))
             await conn.execute(text("PRAGMA mmap_size=134217728"))
             await conn.execute(text("PRAGMA optimize"))
-            # 确保 personas 表有 folder_id 和 sort_order 列（前向兼容）
+            # 确保 personas 表有 folder_id、sort_order、skills 列（前向兼容）
             await self._ensure_persona_folder_columns(conn)
+            await self._ensure_persona_skills_column(conn)
             await conn.commit()
 
     async def _ensure_persona_folder_columns(self, conn) -> None:
@@ -76,6 +77,18 @@ class SQLiteDatabase(BaseDatabase):
                 text("ALTER TABLE personas ADD COLUMN sort_order INTEGER DEFAULT 0")
             )
 
+    async def _ensure_persona_skills_column(self, conn) -> None:
+        """确保 personas 表有 skills 列。
+
+        这是为了支持旧版数据库的平滑升级。新版数据库通过 SQLModel
+        的 metadata.create_all 自动创建这些列。
+        """
+        result = await conn.execute(text("PRAGMA table_info(personas)"))
+        columns = {row[1] for row in result.fetchall()}
+
+        if "skills" not in columns:
+            await conn.execute(text("ALTER TABLE personas ADD COLUMN skills JSON"))
+
     # ====
     # Platform Statistics
     # ====
@@ -564,6 +577,7 @@ class SQLiteDatabase(BaseDatabase):
         system_prompt,
         begin_dialogs=None,
         tools=None,
+        skills=None,
         folder_id=None,
         sort_order=0,
     ):
@@ -576,6 +590,7 @@ class SQLiteDatabase(BaseDatabase):
                     system_prompt=system_prompt,
                     begin_dialogs=begin_dialogs or [],
                     tools=tools,
+                    skills=skills,
                     folder_id=folder_id,
                     sort_order=sort_order,
                 )
@@ -606,6 +621,7 @@ class SQLiteDatabase(BaseDatabase):
         system_prompt=None,
         begin_dialogs=None,
         tools=NOT_GIVEN,
+        skills=NOT_GIVEN,
     ):
         """Update a persona's system prompt or begin dialogs."""
         async with self.get_db() as session:
@@ -619,6 +635,8 @@ class SQLiteDatabase(BaseDatabase):
                     values["begin_dialogs"] = begin_dialogs
                 if tools is not NOT_GIVEN:
                     values["tools"] = tools
+                if skills is not NOT_GIVEN:
+                    values["skills"] = skills
                 if not values:
                     return None
                 query = query.values(**values)

astrbot/core/message/components.py

@@ -567,7 +567,7 @@ class Node(BaseMessageComponent):
     async def to_dict(self):
         data_content = []
         for comp in self.content:
-            if isinstance(comp, (Image, Record)):
+            if isinstance(comp, Image | Record):
                 # For Image and Record segments, we convert them to base64
                 bs64 = await comp.convert_to_base64()
                 data_content.append(
@@ -584,7 +584,7 @@ class Node(BaseMessageComponent):
                 # For File segments, we need to handle the file differently
                 d = await comp.to_dict()
                 data_content.append(d)
-            elif isinstance(comp, (Node, Nodes)):
+            elif isinstance(comp, Node | Nodes):
                 # For Node segments, we recursively convert them to dict
                 d = await comp.to_dict()
                 data_content.append(d)

astrbot/core/persona_mgr.py

@@ -10,6 +10,7 @@ DEFAULT_PERSONALITY = Personality(
     begin_dialogs=[],
     mood_imitation_dialogs=[],
     tools=None,
+    skills=None,
     _begin_dialogs_processed=[],
     _mood_imitation_dialogs_processed="",
 )
@@ -71,6 +72,7 @@ class PersonaManager:
         system_prompt: str | None = None,
         begin_dialogs: list[str] | None = None,
         tools: list[str] | None = None,
+        skills: list[str] | None = None,
     ):
         """更新指定 persona 的信息。tools 参数为 None 时表示使用所有工具，空列表表示不使用任何工具"""
         existing_persona = await self.db.get_persona_by_id(persona_id)
@@ -81,6 +83,7 @@ class PersonaManager:
             system_prompt,
             begin_dialogs,
             tools=tools,
+            skills=skills,
         )
         if persona:
             for i, p in enumerate(self.personas):
@@ -239,6 +242,7 @@ class PersonaManager:
         system_prompt: str,
         begin_dialogs: list[str] | None = None,
         tools: list[str] | None = None,
+        skills: list[str] | None = None,
         folder_id: str | None = None,
         sort_order: int = 0,
     ) -> Persona:
@@ -249,6 +253,7 @@ class PersonaManager:
             system_prompt: 系统提示词
             begin_dialogs: 预设对话列表
             tools: 工具列表，None 表示使用所有工具，空列表表示不使用任何工具
+            skills: Skills 列表，None 表示使用所有 Skills，空列表表示不使用任何 Skills
             folder_id: 所属文件夹 ID，None 表示根目录
             sort_order: 排序顺序
         """
@@ -259,6 +264,7 @@ class PersonaManager:
             system_prompt,
             begin_dialogs,
             tools=tools,
+            skills=skills,
             folder_id=folder_id,
             sort_order=sort_order,
         )
@@ -284,6 +290,7 @@ class PersonaManager:
                 "begin_dialogs": persona.begin_dialogs or [],
                 "mood_imitation_dialogs": [],  # deprecated
                 "tools": persona.tools,
+                "skills": persona.skills,
             }
             for persona in self.personas
         ]
@@ -339,6 +346,7 @@ class PersonaManager:
             system_prompt=selected_default_persona["prompt"],
             begin_dialogs=selected_default_persona["begin_dialogs"],
             tools=selected_default_persona["tools"] or None,
+            skills=selected_default_persona["skills"] or None,
         )
 
         return v3_persona_config, personas_v3, selected_default_persona

astrbot/core/pipeline/context_utils.py

@@ -48,7 +48,7 @@ async def call_handler(
                 # 这里逐步执行异步生成器, 对于每个 yield 返回的 ret, 执行下面的代码
                 # 返回值只能是 MessageEventResult 或者 None（无返回值）
                 _has_yielded = True
-                if isinstance(ret, (MessageEventResult, CommandResult)):
+                if isinstance(ret, MessageEventResult | CommandResult):
                     # 如果返回值是 MessageEventResult, 设置结果并继续
                     event.set_result(ret)
                     yield
@@ -65,7 +65,7 @@ async def call_handler(
     elif inspect.iscoroutine(ready_to_call):
         # 如果只是一个协程, 直接执行
         ret = await ready_to_call
-        if isinstance(ret, (MessageEventResult, CommandResult)):
+        if isinstance(ret, MessageEventResult | CommandResult):
             event.set_result(ret)
             yield
         else:

astrbot/core/pipeline/preprocess_stage/stage.py

@@ -52,7 +52,7 @@ class PreProcessStage(Stage):
             message_chain = event.get_messages()
 
             for idx, component in enumerate(message_chain):
-                if isinstance(component, (Record, Image)) and component.url:
+                if isinstance(component, Record | Image) and component.url:
                     for mapping in mappings:
                         from_, to_ = mapping.split(":")
                         from_ = from_.removesuffix("/")

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

@@ -46,6 +46,7 @@ from ...utils import (
     PYTHON_TOOL,
     SANDBOX_MODE_PROMPT,
     TOOL_CALL_PROMPT,
+    TOOL_CALL_PROMPT_SKILLS_LIKE_MODE,
     decoded_blocked,
     retrieve_knowledge_base,
 )
@@ -62,6 +63,13 @@ class InternalAgentSubStage(Stage):
         ]
         self.max_step: int = settings.get("max_agent_step", 30)
         self.tool_call_timeout: int = settings.get("tool_call_timeout", 60)
+        self.tool_schema_mode: str = settings.get("tool_schema_mode", "full")
+        if self.tool_schema_mode not in ("skills_like", "full"):
+            logger.warning(
+                "Unsupported tool_schema_mode: %s, fallback to skills_like",
+                self.tool_schema_mode,
+            )
+            self.tool_schema_mode = "full"
         if isinstance(self.max_step, bool):  # workaround: #2622
             self.max_step = 30
         self.show_tool_use: bool = settings.get("show_tool_use_status", True)
@@ -517,7 +525,7 @@ class InternalAgentSubStage(Stage):
             has_valid_message = bool(event.message_str and event.message_str.strip())
             # 检查是否有图片或其他媒体内容
             has_media_content = any(
-                isinstance(comp, (Image, File)) for comp in event.message_obj.message
+                isinstance(comp, Image | File) for comp in event.message_obj.message
             )
 
             if (
@@ -574,9 +582,7 @@ class InternalAgentSubStage(Stage):
                             req.extra_user_content_parts.append(
                                 TextPart(text=f"[Image Attachment: path {image_path}]")
                             )
-                        elif isinstance(comp, File) and self.sandbox_cfg.get(
-                            "enable", False
-                        ):
+                        elif isinstance(comp, File):
                             file_path = await comp.get_file()
                             file_name = comp.name or os.path.basename(file_path)
                             req.extra_user_content_parts.append(
@@ -603,7 +609,10 @@ class InternalAgentSubStage(Stage):
                         logger.error(f"Error occurred while applying file extract: {e}")
 
                 if not req.prompt and not req.image_urls:
-                    return
+                    if not event.get_group_id() and req.extra_user_content_parts:
+                        req.prompt = "<attachment>"
+                    else:
+                        return
 
                 # call event hook
                 if await call_event_hook(event, EventType.OnLLMRequestEvent, req):
@@ -672,7 +681,12 @@ class InternalAgentSubStage(Stage):
 
                 # 注入基本 prompt
                 if req.func_tool and req.func_tool.tools:
-                    req.system_prompt += f"\n{TOOL_CALL_PROMPT}\n"
+                    tool_prompt = (
+                        TOOL_CALL_PROMPT
+                        if self.tool_schema_mode == "full"
+                        else TOOL_CALL_PROMPT_SKILLS_LIKE_MODE
+                    )
+                    req.system_prompt += f"\n{tool_prompt}\n"
 
                 action_type = event.get_extra("action_type")
                 if action_type == "live":
@@ -693,6 +707,7 @@ class InternalAgentSubStage(Stage):
                     llm_compress_provider=self._get_compress_provider(),
                     truncate_turns=self.dequeue_context_length,
                     enforce_max_turns=self.max_context_length,
+                    tool_schema_mode=self.tool_schema_mode,
                 )
 
                 # 检测 Live Mode

astrbot/core/pipeline/process_stage/utils.py

@@ -7,10 +7,11 @@ from astrbot.api import logger, sp
 from astrbot.core.agent.run_context import ContextWrapper
 from astrbot.core.agent.tool import FunctionTool, ToolExecResult
 from astrbot.core.astr_agent_context import AstrAgentContext
-from astrbot.core.sandbox.tools import (
+from astrbot.core.computer.tools import (
     ExecuteShellTool,
     FileDownloadTool,
     FileUploadTool,
+    LocalPythonTool,
     PythonTool,
 )
 from astrbot.core.star.context import Context
@@ -39,11 +40,23 @@ SANDBOX_MODE_PROMPT = (
 
 TOOL_CALL_PROMPT = (
     "You MUST NOT return an empty response, especially after invoking a tool."
-    "Before calling any tool, provide a brief explanatory message to the user stating the purpose of the tool call."
-    "After the tool call is completed, you must briefly summarize the results returned by the tool for the user."
-    "Keep the role-play and style consistent throughout the conversation."
+    " Before calling any tool, provide a brief explanatory message to the user stating the purpose of the tool call."
+    " Use the provided tool schema to format arguments and do not guess parameters that are not defined."
+    " After the tool call is completed, you must briefly summarize the results returned by the tool for the user."
+    " Keep the role-play and style consistent throughout the conversation."
 )
 
+TOOL_CALL_PROMPT_SKILLS_LIKE_MODE = (
+    "You MUST NOT return an empty response, especially after invoking a tool."
+    " Before calling any tool, provide a brief explanatory message to the user stating the purpose of the tool call."
+    " Tool schemas are provided in two stages: first only name and description; "
+    "if you decide to use a tool, the full parameter schema will be provided in "
+    "a follow-up step. Do not guess arguments before you see the schema."
+    " After the tool call is completed, you must briefly summarize the results returned by the tool for the user."
+    " Keep the role-play and style consistent throughout the conversation."
+)
+
+
 CHATUI_SPECIAL_DEFAULT_PERSONA_PROMPT = (
     "You are a calm, patient friend with a systems-oriented way of thinking.\n"
     "When someone expresses strong emotional needs, you begin by offering a concise, grounding response "
@@ -194,7 +207,9 @@ async def retrieve_knowledge_base(
 KNOWLEDGE_BASE_QUERY_TOOL = KnowledgeBaseQueryTool()
 
 EXECUTE_SHELL_TOOL = ExecuteShellTool()
+LOCAL_EXECUTE_SHELL_TOOL = ExecuteShellTool(is_local=True)
 PYTHON_TOOL = PythonTool()
+LOCAL_PYTHON_TOOL = LocalPythonTool()
 FILE_UPLOAD_TOOL = FileUploadTool()
 FILE_DOWNLOAD_TOOL = FileDownloadTool()
 

astrbot/core/pipeline/scheduler.py

@@ -82,7 +82,7 @@ class PipelineScheduler:
         await self._process_stages(event)
 
         # 如果没有发送操作, 则发送一个空消息, 以便于后续的处理
-        if isinstance(event, (WebChatMessageEvent, WecomAIBotMessageEvent)):
+        if isinstance(event, WebChatMessageEvent | WecomAIBotMessageEvent):
             await event.send(None)
 
         logger.debug("pipeline 执行完毕。")

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

@@ -33,7 +33,7 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
     @staticmethod
     async def _from_segment_to_dict(segment: BaseMessageComponent) -> dict:
         """修复部分字段"""
-        if isinstance(segment, (Image, Record)):
+        if isinstance(segment, Image | Record):
             # For Image and Record segments, we convert them to base64
             bs64 = await segment.convert_to_base64()
             return {
@@ -110,7 +110,7 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
         """
         # 转发消息、文件消息不能和普通消息混在一起发送
         send_one_by_one = any(
-            isinstance(seg, (Node, Nodes, File)) for seg in message_chain.chain
+            isinstance(seg, Node | Nodes | File) for seg in message_chain.chain
         )
         if not send_one_by_one:
             ret = await cls._parse_onebot_json(message_chain)
@@ -119,7 +119,7 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
             await cls._dispatch_send(bot, event, is_group, session_id, ret)
             return
         for seg in message_chain.chain:
-            if isinstance(seg, (Node, Nodes)):
+            if isinstance(seg, Node | Nodes):
                 # 合并转发消息
                 if isinstance(seg, Node):
                     nodes = Nodes([seg])

astrbot/core/platform/sources/qqofficial/qqofficial_message_event.py

@@ -90,12 +90,10 @@ class QQOfficialMessageEvent(AstrMessageEvent):
 
         if not isinstance(
             source,
-            (
-                botpy.message.Message,
-                botpy.message.GroupMessage,
-                botpy.message.DirectMessage,
-                botpy.message.C2CMessage,
-            ),
+            botpy.message.Message
+            | botpy.message.GroupMessage
+            | botpy.message.DirectMessage
+            | botpy.message.C2CMessage,
         ):
             logger.warning(f"[QQOfficial] 不支持的消息源类型: {type(source)}")
             return None
@@ -120,7 +118,7 @@ class QQOfficialMessageEvent(AstrMessageEvent):
             "msg_id": self.message_obj.message_id,
         }
 
-        if not isinstance(source, (botpy.message.Message, botpy.message.DirectMessage)):
+        if not isinstance(source, botpy.message.Message | botpy.message.DirectMessage):
             payload["msg_seq"] = random.randint(1, 10000)
 
         ret = None

astrbot/core/provider/manager.py

@@ -1,5 +1,6 @@
 import asyncio
 import copy
+import os
 import traceback
 from typing import Protocol, runtime_checkable
 
@@ -406,10 +407,40 @@ class ProviderManager:
                 pc = merged_config
         return pc
 
+    def _resolve_env_key_list(self, provider_config: dict) -> dict:
+        keys = provider_config.get("key", [])
+        if not isinstance(keys, list):
+            return provider_config
+        resolved_keys = []
+        for idx, key in enumerate(keys):
+            if isinstance(key, str) and key.startswith("$"):
+                env_key = key[1:]
+                if env_key.startswith("{") and env_key.endswith("}"):
+                    env_key = env_key[1:-1]
+                if env_key:
+                    env_val = os.getenv(env_key)
+                    if env_val is None:
+                        provider_id = provider_config.get("id")
+                        logger.warning(
+                            f"Provider {provider_id} 配置项 key[{idx}] 使用环境变量 {env_key} 但未设置。",
+                        )
+                        resolved_keys.append("")
+                    else:
+                        resolved_keys.append(env_val)
+                else:
+                    resolved_keys.append(key)
+            else:
+                resolved_keys.append(key)
+        provider_config["key"] = resolved_keys
+        return provider_config
+
     async def load_provider(self, provider_config: dict):
         # 如果 provider_source_id 存在且不为空，则从 provider_sources 中找到对应的配置并合并
         provider_config = self.get_merged_provider_config(provider_config)
 
+        if provider_config.get("provider_type", "") == "chat_completion":
+            provider_config = self._resolve_env_key_list(provider_config)
+
         if not provider_config["enable"]:
             logger.info(f"Provider {provider_config['id']} is disabled, skipping")
             return

astrbot/core/provider/sources/gemini_source.py

@@ -382,15 +382,18 @@ class ProviderGoogleGenAI(Provider):
                     append_or_extend(gemini_contents, parts, types.ModelContent)
 
             elif role == "tool" and not native_tool_enabled:
-                parts = [
-                    types.Part.from_function_response(
-                        name=message["tool_call_id"],
-                        response={
-                            "name": message["tool_call_id"],
-                            "content": message["content"],
-                        },
-                    ),
-                ]
+                func_name = message.get("name", message["tool_call_id"])
+                part = types.Part.from_function_response(
+                    name=func_name,
+                    response={
+                        "name": func_name,
+                        "content": message["content"],
+                    },
+                )
+                if part.function_response:
+                    part.function_response.id = message["tool_call_id"]
+
+                parts = [part]
                 append_or_extend(gemini_contents, parts, types.UserContent)
 
         if gemini_contents and isinstance(gemini_contents[0], types.ModelContent):