Merge branch 'master' into feat/universal-conversation-title

Author: 2ndelement

.github/workflows/unit_tests.yml

@@ -0,0 +1,37 @@
+name: Unit Tests
+
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - 'README*.md'
+      - 'changelogs/**'
+      - 'dashboard/**'
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  unit-tests:
+    name: Run pytest suite
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.12'
+
+      - name: Install uv
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install uv
+
+      - name: Run tests
+        run: |
+          chmod +x scripts/run_pytests_ci.sh
+          bash ./scripts/run_pytests_ci.sh ./tests

astrbot/core/astr_main_agent_resources.py

@@ -33,6 +33,7 @@
     RunBrowserSkillTool,
     SyncSkillReleaseTool,
 )
+from astrbot.core.knowledge_base.kb_helper import KBHelper
 from astrbot.core.message.message_event_result import MessageChain
 from astrbot.core.platform.message_session import MessageSession
 from astrbot.core.star.context import Context
@@ -396,6 +397,18 @@ async def call(
         return f"Message sent to session {target_session}"
 
 
+def check_all_kb(kb_list: list[KBHelper | None]) -> bool:
+    """检查是否所有的知识库都为空
+    Args:
+        kb_list: 所选的知识库
+    Returns:
+        bool: 是否全为空
+    """
+    return not any(
+        kb and (kb.kb.doc_count != 0 or kb.kb.chunk_count != 0) for kb in kb_list
+    )
+
+
 async def retrieve_knowledge_base(
     query: str,
     umo: str,
@@ -454,6 +467,12 @@ async def retrieve_knowledge_base(
     if not kb_names:
         return
 
+    all_kbs = [await kb_mgr.get_kb_by_name(kb) for kb in kb_names]
+
+    if check_all_kb(all_kbs):
+        logger.debug("所配置的所有知识库全为空，跳过检索过程")
+        return
+
     logger.debug(f"[知识库] 开始检索知识库，数量: {len(kb_names)}, top_k={top_k}")
     kb_context = await kb_mgr.retrieve(
         query=query,

astrbot/core/computer/computer_client.py

@@ -214,7 +214,7 @@ def parse_description(text: str) -> str:
     if end_idx is None:
         return ""
 
-    frontmatter = "\n".join(lines[1:end_idx])
+    frontmatter = "\\n".join(lines[1:end_idx])
     try:
         import yaml
     except ImportError:

astrbot/core/config/default.py

@@ -7,6 +7,38 @@
 
 VERSION = "4.21.0"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
+PERSONAL_WECHAT_CONFIG_METADATA = {
+    "weixin_oc_base_url": {
+        "description": "Base URL",
+        "type": "string",
+        "hint": "默认值: https://ilinkai.weixin.qq.com",
+    },
+    "weixin_oc_bot_type": {
+        "description": "扫码参数 bot_type",
+        "type": "string",
+        "hint": "默认值: 3",
+    },
+    "weixin_oc_qr_poll_interval": {
+        "description": "二维码状态轮询间隔（秒）",
+        "type": "int",
+        "hint": "每隔多少秒轮询一次二维码状态。",
+    },
+    "weixin_oc_long_poll_timeout_ms": {
+        "description": "getUpdates 长轮询超时时间（毫秒）",
+        "type": "int",
+        "hint": "会话消息拉取接口超时参数。",
+    },
+    "weixin_oc_api_timeout_ms": {
+        "description": "HTTP 请求超时（毫秒）",
+        "type": "int",
+        "hint": "通用 API 请求超时参数。",
+    },
+    "weixin_oc_token": {
+        "description": "登录后 token（可留空）",
+        "type": "string",
+        "hint": "扫码登录成功后会自动写入；高级场景可手动填写。",
+    },
+}
 
 WEBHOOK_SUPPORTED_PLATFORMS = [
     "qq_official_webhook",
@@ -364,6 +396,16 @@ class ChatProviderTemplate(TypedDict):
                         "callback_server_host": "0.0.0.0",
                         "port": 6198,
                     },
+                    "个人微信": {
+                        "id": "weixin_personal",
+                        "type": "weixin_oc",
+                        "enable": False,
+                        "weixin_oc_base_url": "https://ilinkai.weixin.qq.com",
+                        "weixin_oc_bot_type": "3",
+                        "weixin_oc_qr_poll_interval": 1,
+                        "weixin_oc_long_poll_timeout_ms": 35_000,
+                        "weixin_oc_api_timeout_ms": 15_000,
+                    },
                     "飞书(Lark)": {
                         "id": "lark",
                         "type": "lark",
@@ -869,6 +911,7 @@ class ChatProviderTemplate(TypedDict):
                         "type": "bool",
                         "hint": "Webhook 模式下使用 AstrBot 统一 Webhook 入口，无需单独开启端口。回调地址为 /api/platform/webhook/{webhook_uuid}。",
                     },
+                    **PERSONAL_WECHAT_CONFIG_METADATA,
                     "webhook_uuid": {
                         "invisible": True,
                         "description": "Webhook UUID",

astrbot/core/platform/manager.py

@@ -170,6 +170,10 @@ async def load_platform(self, platform_config: dict) -> None:
                     from .sources.misskey.misskey_adapter import (
                         MisskeyPlatformAdapter,  # noqa: F401
                     )
+                case "weixin_oc":
+                    from .sources.weixin_oc.weixin_oc_adapter import (
+                        WeixinOCAdapter,  # noqa: F401
+                    )
                 case "slack":
                     from .sources.slack.slack_adapter import SlackAdapter  # noqa: F401
                 case "satori":

astrbot/core/platform/sources/telegram/tg_adapter.py

@@ -8,7 +8,7 @@
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
 from telegram import BotCommand, Update
 from telegram.constants import ChatType
-from telegram.error import InvalidToken, Unauthorized
+from telegram.error import Forbidden, InvalidToken
 from telegram.ext import ApplicationBuilder, ContextTypes, ExtBot, filters
 from telegram.ext import MessageHandler as TelegramMessageHandler
 
@@ -183,7 +183,7 @@ async def run(self) -> None:
                     )
             except asyncio.CancelledError:
                 raise
-            except (Unauthorized, InvalidToken) as e:
+            except (Forbidden, InvalidToken) as e:
                 logger.error(
                     f"Telegram token is invalid or unauthorized: {e}. Polling stopped."
                 )