Merge branch 'origin/dev' into dev

Resolved merge conflicts in:
- func_tool_manager.py: kept origin version (full implementation)
- astr_main_agent*.py: kept HEAD version (complete refactor)
- cron_tools.py: kept HEAD version (with get_all_tools)
- config/default.py: kept HEAD version (DEFAULT_WEB_SEARCH_PROVIDER)
- dashboard/*.vue: kept HEAD version
- web_searcher engines: kept HEAD version
- Added new tools: knowledge_base_tools, message_tools, registry, web_search_tools

Author: LIghtJUNction

.github/workflows/docker-image.yml

@@ -70,14 +70,14 @@ jobs:
         uses: docker/setup-buildx-action@v4.0.0
 
       - name: Log in to DockerHub
-        uses: docker/login-action@v4.0.0
+        uses: docker/login-action@v4.1.0
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: Login to GitHub Container Registry
         if: env.HAS_GHCR_TOKEN == 'true'
-        uses: docker/login-action@v4.0.0
+        uses: docker/login-action@v4.1.0
         with:
           registry: ghcr.io
           username: ${{ env.GHCR_OWNER }}
@@ -169,14 +169,14 @@ jobs:
         uses: docker/setup-buildx-action@v4.0.0
 
       - name: Log in to DockerHub
-        uses: docker/login-action@v4.0.0
+        uses: docker/login-action@v4.1.0
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_PASSWORD }}
 
       - name: Login to GitHub Container Registry
         if: env.HAS_GHCR_TOKEN == 'true'
-        uses: docker/login-action@v4.0.0
+        uses: docker/login-action@v4.1.0
         with:
           registry: ghcr.io
           username: ${{ env.GHCR_OWNER }}

README.md

@@ -157,6 +157,7 @@ Connect AstrBot to your favorite chat platform.
 | LINE | Official |
 | Satori | Official |
 | Misskey | Official |
+| Mattermost | Official |
 | WhatsApp (Coming Soon) | Official |
 | [Matrix](https://github.com/stevessr/astrbot_plugin_matrix_adapter) | Community |
 | [KOOK](https://github.com/wuyan1003/astrbot_plugin_kook_adapter) | Community |

astrbot/builtin_stars/web_searcher/metadata.yaml

@@ -135,7 +135,13 @@ async def on_tool_end(
         platform_name = run_context.context.event.get_platform_name()
         if (
             platform_name == "webchat"
-            and tool.name in ["web_search_tavily", "web_search_bocha"]
+            and tool.name
+            in [
+                "web_search_baidu",
+                "web_search_tavily",
+                "web_search_bocha",
+                "web_search_brave",
+            ]
             and len(run_context.messages) > 0
             and tool_result
             and len(tool_result.content)

astrbot/core/astr_agent_hooks.py

@@ -7,6 +7,7 @@
 
 from astrbot.core.db.po import (
     Attachment,
+    ChatUIProject,
     CommandConfig,
     CommandConflict,
     ConversationV2,
@@ -16,6 +17,7 @@
     PlatformSession,
     PlatformStat,
     Preference,
+    SessionProjectRelation,
 )
 from astrbot.core.knowledge_base.models import (
     KBDocument,
@@ -44,6 +46,8 @@
     "preferences": Preference,
     "platform_message_history": PlatformMessageHistory,
     "platform_sessions": PlatformSession,
+    "chatui_projects": ChatUIProject,
+    "session_project_relations": SessionProjectRelation,
     "attachments": Attachment,
     "command_configs": CommandConfig,
     "command_conflicts": CommandConflict,

astrbot/core/backup/constants.py

@@ -1,12 +1,12 @@
 from contextlib import asynccontextmanager
 from pathlib import Path
+from typing import TYPE_CHECKING
 
 from sqlalchemy import delete, func, select, text, update
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
 from sqlmodel import col, desc
 
 from astrbot.core import logger
-from astrbot.core.db.vec_db.faiss_impl import FaissVecDB
 from astrbot.core.knowledge_base.models import (
     BaseKBModel,
     KBDocument,
@@ -15,6 +15,9 @@
 )
 from astrbot.core.utils.astrbot_path import get_astrbot_knowledge_base_path
 
+if TYPE_CHECKING:
+    from astrbot.core.db.vec_db.faiss_impl import FaissVecDB
+
 
 class KBSQLiteDatabase:
     def __init__(self, db_path: str | None = None) -> None:
@@ -295,7 +298,7 @@ async def get_documents_with_metadata_batch(
 
         return metadata_map
 
-    async def delete_document_by_id(self, doc_id: str, vec_db: FaissVecDB) -> None:
+    async def delete_document_by_id(self, doc_id: str, vec_db: "FaissVecDB") -> None:
         """删除单个文档及其相关数据"""
         # 在知识库表中删除
         async with self.get_db() as session, session.begin():
@@ -323,7 +326,7 @@ async def get_media_by_id(self, media_id: str) -> KBMedia | None:
             result = await session.execute(stmt)
             return result.scalar_one_or_none()
 
-    async def update_kb_stats(self, kb_id: str, vec_db: FaissVecDB) -> None:
+    async def update_kb_stats(self, kb_id: str, vec_db: "FaissVecDB") -> None:
         """更新知识库统计信息"""
         chunk_cnt = await vec_db.count_documents()
 

astrbot/core/knowledge_base/kb_db_sqlite.py

@@ -6,13 +6,16 @@
 import json
 import os
 from dataclasses import dataclass
+from typing import TYPE_CHECKING
 
 import jieba
 from rank_bm25 import BM25Okapi
 
-from astrbot.core.db.vec_db.faiss_impl import FaissVecDB
 from astrbot.core.knowledge_base.kb_db_sqlite import KBSQLiteDatabase
 
+if TYPE_CHECKING:
+    from astrbot.core.db.vec_db.faiss_impl import FaissVecDB
+
 
 @dataclass
 class SparseResult:
@@ -73,7 +76,7 @@ async def retrieve(
         top_k_sparse = 0
         chunks = []
         for kb_id in kb_ids:
-            vec_db: FaissVecDB = kb_options.get(kb_id, {}).get("vec_db")
+            vec_db: FaissVecDB | None = kb_options.get(kb_id, {}).get("vec_db")
             if not vec_db:
                 continue
             result = await vec_db.document_storage.get_documents(

astrbot/core/knowledge_base/retrieval/sparse_retriever.py

@@ -212,6 +212,10 @@ async def load_platform(self, platform_config: dict) -> None:
                     from .sources.kook.kook_adapter import (  # noqa: F401
                         KookPlatformAdapter,
                     )
+                case "mattermost":
+                    from .sources.mattermost.mattermost_adapter import (
+                        MattermostPlatformAdapter,  # noqa: F401
+                    )
         except (ImportError, ModuleNotFoundError) as e:
             logger.error(
                 f"加载平台适配器 {platform_config['type']} 失败,原因:{e}｡请检查依赖库是否安装｡提示:可以在 管理面板->平台日志->安装Pip库 中安装依赖库｡",