AstrBot 4.11.3__py3-none-any.whl → 4.12.0__py3-none-any.whl

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.11.3"
+__version__ = "4.12.0"

astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -227,7 +227,8 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                         encrypted=llm_resp.reasoning_signature,
                     )
                 )
-            parts.append(TextPart(text=llm_resp.completion_text or "*No response*"))
+            if llm_resp.completion_text:
+                parts.append(TextPart(text=llm_resp.completion_text))
             self.run_context.messages.append(Message(role="assistant", content=parts))
 
             # call the on_agent_done hook
@@ -277,7 +278,8 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                         encrypted=llm_resp.reasoning_signature,
                     )
                 )
-            parts.append(TextPart(text=llm_resp.completion_text or "*No response*"))
+            if llm_resp.completion_text:
+                parts.append(TextPart(text=llm_resp.completion_text))
             tool_calls_result = ToolCallsResult(
                 tool_calls_info=AssistantMessageSegment(
                     tool_calls=llm_resp.to_openai_to_calls_model(),
@@ -361,7 +363,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                         ToolCallMessageSegment(
                             role="tool",
                             tool_call_id=func_tool_id,
-                            content=f"error: 未找到工具 {func_tool_name}",
+                            content=f"error: Tool {func_tool_name} not found.",
                         ),
                     )
                     continue
@@ -427,7 +429,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                                 ToolCallMessageSegment(
                                     role="tool",
                                     tool_call_id=func_tool_id,
-                                    content="返回了图片(已直接发送给用户)",
+                                    content="The tool has successfully returned an image and sent directly to the user. You can describe it in your next response.",
                                 ),
                             )
                             yield MessageChain(type="tool_direct_result").base64_image(
@@ -452,7 +454,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                                     ToolCallMessageSegment(
                                         role="tool",
                                         tool_call_id=func_tool_id,
-                                        content="返回了图片(已直接发送给用户)",
+                                        content="The tool has successfully returned an image and sent directly to the user. You can describe it in your next response.",
                                     ),
                                 )
                                 yield MessageChain(
@@ -463,7 +465,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                                     ToolCallMessageSegment(
                                         role="tool",
                                         tool_call_id=func_tool_id,
-                                        content="返回的数据类型不受支持",
+                                        content="The tool has returned a data type that is not supported.",
                                     ),
                                 )
 
@@ -480,7 +482,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                             ToolCallMessageSegment(
                                 role="tool",
                                 tool_call_id=func_tool_id,
-                                content="*工具没有返回值或者将结果直接发送给了用户*",
+                                content="The tool has no return value, or has sent the result directly to the user.",
                             ),
                         )
                     else:
@@ -492,7 +494,7 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
                             ToolCallMessageSegment(
                                 role="tool",
                                 tool_call_id=func_tool_id,
-                                content="*工具返回了不支持的类型，请告诉用户检查这个工具的定义和实现。*",
+                                content="*The tool has returned an unsupported type. Please tell the user to check the definition and implementation of this tool.*",
                             ),
                         )
 

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.11.3"
+VERSION = "4.12.0"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [
@@ -113,6 +113,14 @@ DEFAULT_CONFIG = {
             "provider": "moonshotai",
             "moonshotai_api_key": "",
         },
+        "sandbox": {
+            "enable": False,
+            "booter": "shipyard",
+            "shipyard_endpoint": "",
+            "shipyard_access_token": "",
+            "shipyard_ttl": 3600,
+            "shipyard_max_sessions": 10,
+        },
     },
     "provider_stt_settings": {
         "enable": False,
@@ -242,7 +250,7 @@ CONFIG_METADATA_2 = {
                         "callback_server_host": "0.0.0.0",
                         "port": 6196,
                     },
-                    "OneBot v11 (QQ 个人号等)": {
+                    "OneBot v11": {
                         "id": "default",
                         "type": "aiocqhttp",
                         "enable": False,
@@ -989,17 +997,6 @@ CONFIG_METADATA_2 = {
                         "api_base": "http://127.0.0.1:1234/v1",
                         "custom_headers": {},
                     },
-                    "ModelStack": {
-                        "id": "modelstack",
-                        "provider": "modelstack",
-                        "type": "openai_chat_completion",
-                        "provider_type": "chat_completion",
-                        "enable": True,
-                        "key": [],
-                        "api_base": "https://modelstack.app/v1",
-                        "timeout": 120,
-                        "custom_headers": {},
-                    },
                     "Gemini_OpenAI_API": {
                         "id": "google_gemini_openai",
                         "provider": "google",
@@ -2550,6 +2547,62 @@ CONFIG_METADATA_3 = {
             #         "provider_settings.enable": True,
             #     },
             # },
+            "sandbox": {
+                "description": "Agent 沙箱环境",
+                "type": "object",
+                "items": {
+                    "provider_settings.sandbox.enable": {
+                        "description": "启用沙箱环境",
+                        "type": "bool",
+                        "hint": "启用后，Agent 可以使用沙箱环境中的工具和资源，如 Python 代码执行、Shell 等。",
+                    },
+                    "provider_settings.sandbox.booter": {
+                        "description": "沙箱环境驱动器",
+                        "type": "string",
+                        "options": ["shipyard"],
+                        "condition": {
+                            "provider_settings.sandbox.enable": True,
+                        },
+                    },
+                    "provider_settings.sandbox.shipyard_endpoint": {
+                        "description": "Shipyard API Endpoint",
+                        "type": "string",
+                        "hint": "Shipyard 服务的 API 访问地址。",
+                        "condition": {
+                            "provider_settings.sandbox.enable": True,
+                            "provider_settings.sandbox.booter": "shipyard",
+                        },
+                        "_special": "check_shipyard_connection",
+                    },
+                    "provider_settings.sandbox.shipyard_access_token": {
+                        "description": "Shipyard Access Token",
+                        "type": "string",
+                        "hint": "用于访问 Shipyard 服务的访问令牌。",
+                        "condition": {
+                            "provider_settings.sandbox.enable": True,
+                            "provider_settings.sandbox.booter": "shipyard",
+                        },
+                    },
+                    "provider_settings.sandbox.shipyard_ttl": {
+                        "description": "Shipyard Session TTL",
+                        "type": "int",
+                        "hint": "Shipyard 会话的生存时间（秒）。",
+                        "condition": {
+                            "provider_settings.sandbox.enable": True,
+                            "provider_settings.sandbox.booter": "shipyard",
+                        },
+                    },
+                    "provider_settings.sandbox.shipyard_max_sessions": {
+                        "description": "Shipyard Max Sessions",
+                        "type": "int",
+                        "hint": "Shipyard 最大会话数量。",
+                        "condition": {
+                            "provider_settings.sandbox.enable": True,
+                            "provider_settings.sandbox.booter": "shipyard",
+                        },
+                    },
+                },
+            },
             "truncate_and_compress": {
                 "description": "上下文管理策略",
                 "type": "object",

astrbot/core/db/__init__.py

@@ -9,6 +9,7 @@ from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_asyn
 
 from astrbot.core.db.po import (
     Attachment,
+    ChatUIProject,
     CommandConfig,
     CommandConflict,
     ConversationV2,
@@ -17,6 +18,7 @@ from astrbot.core.db.po import (
     PlatformSession,
     PlatformStat,
     Preference,
+    SessionProjectRelation,
     Stats,
 )
 
@@ -446,8 +448,11 @@ class BaseDatabase(abc.ABC):
         platform_id: str | None = None,
         page: int = 1,
         page_size: int = 20,
-    ) -> list[PlatformSession]:
-        """Get all Platform sessions for a specific creator (username) and optionally platform."""
+    ) -> list[dict]:
+        """Get all Platform sessions for a specific creator (username) and optionally platform.
+
+        Returns a list of dicts containing session info and project info (if session belongs to a project).
+        """
         ...
 
     @abc.abstractmethod
@@ -463,3 +468,80 @@ class BaseDatabase(abc.ABC):
     async def delete_platform_session(self, session_id: str) -> None:
         """Delete a Platform session by its ID."""
         ...
+
+    # ====
+    # ChatUI Project Management
+    # ====
+
+    @abc.abstractmethod
+    async def create_chatui_project(
+        self,
+        creator: str,
+        title: str,
+        emoji: str | None = "📁",
+        description: str | None = None,
+    ) -> ChatUIProject:
+        """Create a new ChatUI project."""
+        ...
+
+    @abc.abstractmethod
+    async def get_chatui_project_by_id(self, project_id: str) -> ChatUIProject | None:
+        """Get a ChatUI project by its ID."""
+        ...
+
+    @abc.abstractmethod
+    async def get_chatui_projects_by_creator(
+        self,
+        creator: str,
+        page: int = 1,
+        page_size: int = 100,
+    ) -> list[ChatUIProject]:
+        """Get all ChatUI projects for a specific creator."""
+        ...
+
+    @abc.abstractmethod
+    async def update_chatui_project(
+        self,
+        project_id: str,
+        title: str | None = None,
+        emoji: str | None = None,
+        description: str | None = None,
+    ) -> None:
+        """Update a ChatUI project."""
+        ...
+
+    @abc.abstractmethod
+    async def delete_chatui_project(self, project_id: str) -> None:
+        """Delete a ChatUI project by its ID."""
+        ...
+
+    @abc.abstractmethod
+    async def add_session_to_project(
+        self,
+        session_id: str,
+        project_id: str,
+    ) -> SessionProjectRelation:
+        """Add a session to a project."""
+        ...
+
+    @abc.abstractmethod
+    async def remove_session_from_project(self, session_id: str) -> None:
+        """Remove a session from its project."""
+        ...
+
+    @abc.abstractmethod
+    async def get_project_sessions(
+        self,
+        project_id: str,
+        page: int = 1,
+        page_size: int = 100,
+    ) -> list[PlatformSession]:
+        """Get all sessions in a project."""
+        ...
+
+    @abc.abstractmethod
+    async def get_project_by_session(
+        self, session_id: str, creator: str
+    ) -> ChatUIProject | None:
+        """Get the project that a session belongs to."""
+        ...

astrbot/core/db/po.py

@@ -239,6 +239,71 @@ class Attachment(SQLModel, table=True):
     )
 
 
+class ChatUIProject(SQLModel, table=True):
+    """This class represents projects for organizing ChatUI conversations.
+
+    Projects allow users to group related conversations together.
+    """
+
+    __tablename__: str = "chatui_projects"
+
+    inner_id: int | None = Field(
+        primary_key=True,
+        sa_column_kwargs={"autoincrement": True},
+        default=None,
+    )
+    project_id: str = Field(
+        max_length=36,
+        nullable=False,
+        unique=True,
+        default_factory=lambda: str(uuid.uuid4()),
+    )
+    creator: str = Field(nullable=False)
+    """Username of the project creator"""
+    emoji: str | None = Field(default="📁", max_length=10)
+    """Emoji icon for the project"""
+    title: str = Field(nullable=False, max_length=255)
+    """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(
+            "project_id",
+            name="uix_chatui_project_id",
+        ),
+    )
+
+
+class SessionProjectRelation(SQLModel, table=True):
+    """This class represents the relationship between platform sessions and ChatUI projects."""
+
+    __tablename__: str = "session_project_relations"
+
+    id: int | None = Field(
+        primary_key=True,
+        sa_column_kwargs={"autoincrement": True},
+        default=None,
+    )
+    session_id: str = Field(nullable=False, max_length=100)
+    """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(
+            "session_id",
+            name="uix_session_project_relation",
+        ),
+    )
+
+
 class CommandConfig(SQLModel, table=True):
     """Per-command configuration overrides for dashboard management."""
 

astrbot/core/db/sqlite.py

@@ -11,6 +11,7 @@ from sqlmodel import col, delete, desc, func, or_, select, text, update
 from astrbot.core.db import BaseDatabase
 from astrbot.core.db.po import (
     Attachment,
+    ChatUIProject,
     CommandConfig,
     CommandConflict,
     ConversationV2,
@@ -19,6 +20,7 @@ from astrbot.core.db.po import (
     PlatformSession,
     PlatformStat,
     Preference,
+    SessionProjectRelation,
     SQLModel,
 )
 from astrbot.core.db.po import (
@@ -1060,12 +1062,35 @@ class SQLiteDatabase(BaseDatabase):
         platform_id: str | None = None,
         page: int = 1,
         page_size: int = 20,
-    ) -> list[PlatformSession]:
-        """Get all Platform sessions for a specific creator (username) and optionally platform."""
+    ) -> list[dict]:
+        """Get all Platform sessions for a specific creator (username) and optionally platform.
+
+        Returns a list of dicts containing session info and project info (if session belongs to a project).
+        """
         async with self.get_db() as session:
             session: AsyncSession
             offset = (page - 1) * page_size
-            query = select(PlatformSession).where(PlatformSession.creator == creator)
+
+            # LEFT JOIN with SessionProjectRelation and ChatUIProject to get project info
+            query = (
+                select(
+                    PlatformSession,
+                    col(ChatUIProject.project_id),
+                    col(ChatUIProject.title).label("project_title"),
+                    col(ChatUIProject.emoji).label("project_emoji"),
+                )
+                .outerjoin(
+                    SessionProjectRelation,
+                    col(PlatformSession.session_id)
+                    == col(SessionProjectRelation.session_id),
+                )
+                .outerjoin(
+                    ChatUIProject,
+                    col(SessionProjectRelation.project_id)
+                    == col(ChatUIProject.project_id),
+                )
+                .where(col(PlatformSession.creator) == creator)
+            )
 
             if platform_id:
                 query = query.where(PlatformSession.platform_id == platform_id)
@@ -1076,7 +1101,24 @@ class SQLiteDatabase(BaseDatabase):
                 .limit(page_size)
             )
             result = await session.execute(query)
-            return list(result.scalars().all())
+
+            # Convert to list of dicts with session and project info
+            sessions_with_projects = []
+            for row in result.all():
+                platform_session = row[0]
+                project_id = row[1]
+                project_title = row[2]
+                project_emoji = row[3]
+
+                session_dict = {
+                    "session": platform_session,
+                    "project_id": project_id,
+                    "project_title": project_title,
+                    "project_emoji": project_emoji,
+                }
+                sessions_with_projects.append(session_dict)
+
+            return sessions_with_projects
 
     async def update_platform_session(
         self,
@@ -1107,3 +1149,182 @@ class SQLiteDatabase(BaseDatabase):
                         col(PlatformSession.session_id) == session_id,
                     ),
                 )
+
+    # ====
+    # ChatUI Project Management
+    # ====
+
+    async def create_chatui_project(
+        self,
+        creator: str,
+        title: str,
+        emoji: str | None = "📁",
+        description: str | None = None,
+    ) -> ChatUIProject:
+        """Create a new ChatUI project."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                project = ChatUIProject(
+                    creator=creator,
+                    title=title,
+                    emoji=emoji,
+                    description=description,
+                )
+                session.add(project)
+                await session.flush()
+                await session.refresh(project)
+                return project
+
+    async def get_chatui_project_by_id(self, project_id: str) -> ChatUIProject | None:
+        """Get a ChatUI project by its ID."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            result = await session.execute(
+                select(ChatUIProject).where(
+                    col(ChatUIProject.project_id) == project_id,
+                ),
+            )
+            return result.scalar_one_or_none()
+
+    async def get_chatui_projects_by_creator(
+        self,
+        creator: str,
+        page: int = 1,
+        page_size: int = 100,
+    ) -> list[ChatUIProject]:
+        """Get all ChatUI projects for a specific creator."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            offset = (page - 1) * page_size
+            result = await session.execute(
+                select(ChatUIProject)
+                .where(col(ChatUIProject.creator) == creator)
+                .order_by(desc(ChatUIProject.updated_at))
+                .limit(page_size)
+                .offset(offset),
+            )
+            return list(result.scalars().all())
+
+    async def update_chatui_project(
+        self,
+        project_id: str,
+        title: str | None = None,
+        emoji: str | None = None,
+        description: str | None = None,
+    ) -> None:
+        """Update a ChatUI project."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                values: dict[str, T.Any] = {"updated_at": datetime.now(timezone.utc)}
+                if title is not None:
+                    values["title"] = title
+                if emoji is not None:
+                    values["emoji"] = emoji
+                if description is not None:
+                    values["description"] = description
+
+                await session.execute(
+                    update(ChatUIProject)
+                    .where(col(ChatUIProject.project_id) == project_id)
+                    .values(**values),
+                )
+
+    async def delete_chatui_project(self, project_id: str) -> None:
+        """Delete a ChatUI project by its ID."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                # First remove all session relations
+                await session.execute(
+                    delete(SessionProjectRelation).where(
+                        col(SessionProjectRelation.project_id) == project_id,
+                    ),
+                )
+                # Then delete the project
+                await session.execute(
+                    delete(ChatUIProject).where(
+                        col(ChatUIProject.project_id) == project_id,
+                    ),
+                )
+
+    async def add_session_to_project(
+        self,
+        session_id: str,
+        project_id: str,
+    ) -> SessionProjectRelation:
+        """Add a session to a project."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                # First remove existing relation if any
+                await session.execute(
+                    delete(SessionProjectRelation).where(
+                        col(SessionProjectRelation.session_id) == session_id,
+                    ),
+                )
+                # Then create new relation
+                relation = SessionProjectRelation(
+                    session_id=session_id,
+                    project_id=project_id,
+                )
+                session.add(relation)
+                await session.flush()
+                await session.refresh(relation)
+                return relation
+
+    async def remove_session_from_project(self, session_id: str) -> None:
+        """Remove a session from its project."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            async with session.begin():
+                await session.execute(
+                    delete(SessionProjectRelation).where(
+                        col(SessionProjectRelation.session_id) == session_id,
+                    ),
+                )
+
+    async def get_project_sessions(
+        self,
+        project_id: str,
+        page: int = 1,
+        page_size: int = 100,
+    ) -> list[PlatformSession]:
+        """Get all sessions in a project."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            offset = (page - 1) * page_size
+            result = await session.execute(
+                select(PlatformSession)
+                .join(
+                    SessionProjectRelation,
+                    col(PlatformSession.session_id)
+                    == col(SessionProjectRelation.session_id),
+                )
+                .where(col(SessionProjectRelation.project_id) == project_id)
+                .order_by(desc(PlatformSession.updated_at))
+                .limit(page_size)
+                .offset(offset),
+            )
+            return list(result.scalars().all())
+
+    async def get_project_by_session(
+        self, session_id: str, creator: str
+    ) -> ChatUIProject | None:
+        """Get the project that a session belongs to."""
+        async with self.get_db() as session:
+            session: AsyncSession
+            result = await session.execute(
+                select(ChatUIProject)
+                .join(
+                    SessionProjectRelation,
+                    col(ChatUIProject.project_id)
+                    == col(SessionProjectRelation.project_id),
+                )
+                .where(
+                    col(SessionProjectRelation.session_id) == session_id,
+                    col(ChatUIProject.creator) == creator,
+                ),
+            )
+            return result.scalar_one_or_none()