AstrBot 4.12.3__py3-none-any.whl → 4.13.0__py3-none-any.whl

astrbot/core/db/sqlite.py

@@ -16,6 +16,7 @@ from astrbot.core.db.po import (
     CommandConflict,
     ConversationV2,
     Persona,
+    PersonaFolder,
     PlatformMessageHistory,
     PlatformSession,
     PlatformStat,
@@ -51,8 +52,43 @@ 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、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:
+        """确保 personas 表有 folder_id 和 sort_order 列。
+
+        这是为了支持旧版数据库的平滑升级。新版数据库通过 SQLModel
+        的 metadata.create_all 自动创建这些列。
+        """
+        result = await conn.execute(text("PRAGMA table_info(personas)"))
+        columns = {row[1] for row in result.fetchall()}
+
+        if "folder_id" not in columns:
+            await conn.execute(
+                text(
+                    "ALTER TABLE personas ADD COLUMN folder_id VARCHAR(36) DEFAULT NULL"
+                )
+            )
+        if "sort_order" not in columns:
+            await conn.execute(
+                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
     # ====
@@ -541,6 +577,9 @@ class SQLiteDatabase(BaseDatabase):
         system_prompt,
         begin_dialogs=None,
         tools=None,
+        skills=None,
+        folder_id=None,
+        sort_order=0,
     ):
         """Insert a new persona record."""
         async with self.get_db() as session:
@@ -551,8 +590,13 @@ class SQLiteDatabase(BaseDatabase):
                     system_prompt=system_prompt,
                     begin_dialogs=begin_dialogs or [],
                     tools=tools,
+                    skills=skills,
+                    folder_id=folder_id,
+                    sort_order=sort_order,
                 )
                 session.add(new_persona)
+                await session.flush()
+                await session.refresh(new_persona)
                 return new_persona
 
     async def get_persona_by_id(self, persona_id):
@@ -577,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:
@@ -590,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)
@@ -605,6 +652,207 @@ class SQLiteDatabase(BaseDatabase):
                     delete(Persona).where(col(Persona.persona_id) == persona_id),
                 )
 
+    # ====
+    # Persona Folder Management
+    # ====
+
+    async def insert_persona_folder(
+        self,
+        name: str,
+        parent_id: str | None = None,
+        description: str | None = None,
+        sort_order: int = 0,
+    ) -> PersonaFolder:
+        """Insert a new persona folder."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                new_folder = PersonaFolder(
+                    name=name,
+                    parent_id=parent_id,
+                    description=description,
+                    sort_order=sort_order,
+                )
+                session.add(new_folder)
+                await session.flush()
+                await session.refresh(new_folder)
+                return new_folder
+
+    async def get_persona_folder_by_id(self, folder_id: str) -> PersonaFolder | None:
+        """Get a persona folder by its folder_id."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            query = select(PersonaFolder).where(PersonaFolder.folder_id == folder_id)
+            result = await session.execute(query)
+            return result.scalar_one_or_none()
+
+    async def get_persona_folders(
+        self, parent_id: str | None = None
+    ) -> list[PersonaFolder]:
+        """Get all persona folders, optionally filtered by parent_id.
+
+        Args:
+            parent_id: If None, returns root folders only. If specified, returns
+                       children of that folder.
+        """
+        async with self.get_db() as session:
+            session: AsyncSession
+            if parent_id is None:
+                # Get root folders (parent_id is NULL)
+                query = (
+                    select(PersonaFolder)
+                    .where(col(PersonaFolder.parent_id).is_(None))
+                    .order_by(col(PersonaFolder.sort_order), col(PersonaFolder.name))
+                )
+            else:
+                query = (
+                    select(PersonaFolder)
+                    .where(PersonaFolder.parent_id == parent_id)
+                    .order_by(col(PersonaFolder.sort_order), col(PersonaFolder.name))
+                )
+            result = await session.execute(query)
+            return list(result.scalars().all())
+
+    async def get_all_persona_folders(self) -> list[PersonaFolder]:
+        """Get all persona folders."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            query = select(PersonaFolder).order_by(
+                col(PersonaFolder.sort_order), col(PersonaFolder.name)
+            )
+            result = await session.execute(query)
+            return list(result.scalars().all())
+
+    async def update_persona_folder(
+        self,
+        folder_id: str,
+        name: str | None = None,
+        parent_id: T.Any = NOT_GIVEN,
+        description: T.Any = NOT_GIVEN,
+        sort_order: int | None = None,
+    ) -> PersonaFolder | None:
+        """Update a persona folder."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                query = update(PersonaFolder).where(
+                    col(PersonaFolder.folder_id) == folder_id
+                )
+                values: dict[str, T.Any] = {}
+                if name is not None:
+                    values["name"] = name
+                if parent_id is not NOT_GIVEN:
+                    values["parent_id"] = parent_id
+                if description is not NOT_GIVEN:
+                    values["description"] = description
+                if sort_order is not None:
+                    values["sort_order"] = sort_order
+                if not values:
+                    return None
+                query = query.values(**values)
+                await session.execute(query)
+        return await self.get_persona_folder_by_id(folder_id)
+
+    async def delete_persona_folder(self, folder_id: str) -> None:
+        """Delete a persona folder by its folder_id.
+
+        Note: This will also set folder_id to NULL for all personas in this folder,
+        moving them to the root directory.
+        """
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                # Move personas to root directory
+                await session.execute(
+                    update(Persona)
+                    .where(col(Persona.folder_id) == folder_id)
+                    .values(folder_id=None)
+                )
+                # Delete the folder
+                await session.execute(
+                    delete(PersonaFolder).where(
+                        col(PersonaFolder.folder_id) == folder_id
+                    ),
+                )
+
+    async def move_persona_to_folder(
+        self, persona_id: str, folder_id: str | None
+    ) -> Persona | None:
+        """Move a persona to a folder (or root if folder_id is None)."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                await session.execute(
+                    update(Persona)
+                    .where(col(Persona.persona_id) == persona_id)
+                    .values(folder_id=folder_id)
+                )
+        return await self.get_persona_by_id(persona_id)
+
+    async def get_personas_by_folder(
+        self, folder_id: str | None = None
+    ) -> list[Persona]:
+        """Get all personas in a specific folder.
+
+        Args:
+            folder_id: If None, returns personas in root directory.
+        """
+        async with self.get_db() as session:
+            session: AsyncSession
+            if folder_id is None:
+                query = (
+                    select(Persona)
+                    .where(col(Persona.folder_id).is_(None))
+                    .order_by(col(Persona.sort_order), col(Persona.persona_id))
+                )
+            else:
+                query = (
+                    select(Persona)
+                    .where(Persona.folder_id == folder_id)
+                    .order_by(col(Persona.sort_order), col(Persona.persona_id))
+                )
+            result = await session.execute(query)
+            return list(result.scalars().all())
+
+    async def batch_update_sort_order(
+        self,
+        items: list[dict],
+    ) -> None:
+        """Batch update sort_order for personas and/or folders.
+
+        Args:
+            items: List of dicts with keys:
+                - id: The persona_id or folder_id
+                - type: Either "persona" or "folder"
+                - sort_order: The new sort_order value
+        """
+        if not items:
+            return
+
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                for item in items:
+                    item_id = item.get("id")
+                    item_type = item.get("type")
+                    sort_order = item.get("sort_order")
+
+                    if item_id is None or item_type is None or sort_order is None:
+                        continue
+
+                    if item_type == "persona":
+                        await session.execute(
+                            update(Persona)
+                            .where(col(Persona.persona_id) == item_id)
+                            .values(sort_order=sort_order)
+                        )
+                    elif item_type == "folder":
+                        await session.execute(
+                            update(PersonaFolder)
+                            .where(col(PersonaFolder.folder_id) == item_id)
+                            .values(sort_order=sort_order)
+                        )
+
     async def insert_preference_or_update(self, scope, scope_id, key, value):
         """Insert a new preference record or update if it exists."""
         async with self.get_db() as session:

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

@@ -1,7 +1,7 @@
 from astrbot import logger
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 from astrbot.core.db import BaseDatabase
-from astrbot.core.db.po import Persona, Personality
+from astrbot.core.db.po import Persona, PersonaFolder, Personality
 from astrbot.core.platform.message_session import MessageSession
 
 DEFAULT_PERSONALITY = Personality(
@@ -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):
@@ -94,14 +97,166 @@ class PersonaManager:
         """获取所有 personas"""
         return await self.db.get_personas()
 
+    async def get_personas_by_folder(
+        self, folder_id: str | None = None
+    ) -> list[Persona]:
+        """获取指定文件夹中的 personas
+
+        Args:
+            folder_id: 文件夹 ID，None 表示根目录
+        """
+        return await self.db.get_personas_by_folder(folder_id)
+
+    async def move_persona_to_folder(
+        self, persona_id: str, folder_id: str | None
+    ) -> Persona | None:
+        """移动 persona 到指定文件夹
+
+        Args:
+            persona_id: Persona ID
+            folder_id: 目标文件夹 ID，None 表示移动到根目录
+        """
+        persona = await self.db.move_persona_to_folder(persona_id, folder_id)
+        if persona:
+            for i, p in enumerate(self.personas):
+                if p.persona_id == persona_id:
+                    self.personas[i] = persona
+                    break
+        return persona
+
+    # ====
+    # Persona Folder Management
+    # ====
+
+    async def create_folder(
+        self,
+        name: str,
+        parent_id: str | None = None,
+        description: str | None = None,
+        sort_order: int = 0,
+    ) -> PersonaFolder:
+        """创建新的文件夹"""
+        return await self.db.insert_persona_folder(
+            name=name,
+            parent_id=parent_id,
+            description=description,
+            sort_order=sort_order,
+        )
+
+    async def get_folder(self, folder_id: str) -> PersonaFolder | None:
+        """获取指定文件夹"""
+        return await self.db.get_persona_folder_by_id(folder_id)
+
+    async def get_folders(self, parent_id: str | None = None) -> list[PersonaFolder]:
+        """获取文件夹列表
+
+        Args:
+            parent_id: 父文件夹 ID，None 表示获取根目录下的文件夹
+        """
+        return await self.db.get_persona_folders(parent_id)
+
+    async def get_all_folders(self) -> list[PersonaFolder]:
+        """获取所有文件夹"""
+        return await self.db.get_all_persona_folders()
+
+    async def update_folder(
+        self,
+        folder_id: str,
+        name: str | None = None,
+        parent_id: str | None = None,
+        description: str | None = None,
+        sort_order: int | None = None,
+    ) -> PersonaFolder | None:
+        """更新文件夹信息"""
+        return await self.db.update_persona_folder(
+            folder_id=folder_id,
+            name=name,
+            parent_id=parent_id,
+            description=description,
+            sort_order=sort_order,
+        )
+
+    async def delete_folder(self, folder_id: str) -> None:
+        """删除文件夹
+
+        Note: 文件夹内的 personas 会被移动到根目录
+        """
+        await self.db.delete_persona_folder(folder_id)
+
+    async def batch_update_sort_order(self, items: list[dict]) -> None:
+        """批量更新 personas 和/或 folders 的排序顺序
+
+        Args:
+            items: 包含以下键的字典列表：
+                - id: persona_id 或 folder_id
+                - type: "persona" 或 "folder"
+                - sort_order: 新的排序顺序值
+        """
+        await self.db.batch_update_sort_order(items)
+        # 刷新缓存
+        self.personas = await self.get_all_personas()
+        self.get_v3_persona_data()
+
+    async def get_folder_tree(self) -> list[dict]:
+        """获取文件夹树形结构
+
+        Returns:
+            树形结构的文件夹列表，每个文件夹包含 children 子列表
+        """
+        all_folders = await self.get_all_folders()
+        folder_map: dict[str, dict] = {}
+
+        # 创建文件夹字典
+        for folder in all_folders:
+            folder_map[folder.folder_id] = {
+                "folder_id": folder.folder_id,
+                "name": folder.name,
+                "parent_id": folder.parent_id,
+                "description": folder.description,
+                "sort_order": folder.sort_order,
+                "children": [],
+            }
+
+        # 构建树形结构
+        root_folders = []
+        for folder_id, folder_data in folder_map.items():
+            parent_id = folder_data["parent_id"]
+            if parent_id is None:
+                root_folders.append(folder_data)
+            elif parent_id in folder_map:
+                folder_map[parent_id]["children"].append(folder_data)
+
+        # 递归排序
+        def sort_folders(folders: list[dict]) -> list[dict]:
+            folders.sort(key=lambda f: (f["sort_order"], f["name"]))
+            for folder in folders:
+                if folder["children"]:
+                    folder["children"] = sort_folders(folder["children"])
+            return folders
+
+        return sort_folders(root_folders)
+
     async def create_persona(
         self,
         persona_id: str,
         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:
-        """创建新的 persona。tools 参数为 None 时表示使用所有工具，空列表表示不使用任何工具"""
+        """创建新的 persona。
+
+        Args:
+            persona_id: Persona 唯一标识
+            system_prompt: 系统提示词
+            begin_dialogs: 预设对话列表
+            tools: 工具列表，None 表示使用所有工具，空列表表示不使用任何工具
+            skills: Skills 列表，None 表示使用所有 Skills，空列表表示不使用任何 Skills
+            folder_id: 所属文件夹 ID，None 表示根目录
+            sort_order: 排序顺序
+        """
         if await self.db.get_persona_by_id(persona_id):
             raise ValueError(f"Persona with ID {persona_id} already exists.")
         new_persona = await self.db.insert_persona(
@@ -109,6 +264,9 @@ class PersonaManager:
             system_prompt,
             begin_dialogs,
             tools=tools,
+            skills=skills,
+            folder_id=folder_id,
+            sort_order=sort_order,
         )
         self.personas.append(new_persona)
         self.get_v3_persona_data()
@@ -132,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
         ]
@@ -187,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("/")