AstrBot 4.6.0__py3-none-any.whl → 4.6.1__py3-none-any.whl

astrbot/core/config/default.py

@@ -4,7 +4,7 @@ import os
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.6.0"
+VERSION = "4.6.1"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 # 默认配置
@@ -1308,6 +1308,19 @@ CONFIG_METADATA_2 = {
                         "timeout": 20,
                         "launch_model_if_not_running": False,
                     },
+                    "阿里云百炼重排序": {
+                        "id": "bailian_rerank",
+                        "type": "bailian_rerank",
+                        "provider": "bailian",
+                        "provider_type": "rerank",
+                        "enable": True,
+                        "rerank_api_key": "",
+                        "rerank_api_base": "https://dashscope.aliyuncs.com/api/v1/services/rerank/text-rerank/text-rerank",
+                        "rerank_model": "qwen3-rerank",
+                        "timeout": 30,
+                        "return_documents": False,
+                        "instruct": "",
+                    },
                     "Xinference STT": {
                         "id": "xinference_stt",
                         "type": "xinference_stt",
@@ -1342,6 +1355,16 @@ CONFIG_METADATA_2 = {
                         "description": "重排序模型名称",
                         "type": "string",
                     },
+                    "return_documents": {
+                        "description": "是否在排序结果中返回文档原文",
+                        "type": "bool",
+                        "hint": "默认值false，以减少网络传输开销。",
+                    },
+                    "instruct": {
+                        "description": "自定义排序任务类型说明",
+                        "type": "string",
+                        "hint": "仅在使用 qwen3-rerank 模型时生效。建议使用英文撰写。",
+                    },
                     "launch_model_if_not_running": {
                         "description": "模型未运行时自动启动",
                         "type": "bool",

astrbot/core/db/migration/migra_webchat_session.py

@@ -25,7 +25,7 @@ async def migrate_webchat_session(db_helper: BaseDatabase):
     """
     # 检查是否已经完成迁移
     migration_done = await db_helper.get_preference(
-        "global", "global", "migration_done_webchat_session"
+        "global", "global", "migration_done_webchat_session_1"
     )
     if migration_done:
         return
@@ -43,7 +43,7 @@ async def migrate_webchat_session(db_helper: BaseDatabase):
                     func.max(PlatformMessageHistory.updated_at).label("latest"),
                 )
                 .where(col(PlatformMessageHistory.platform_id) == "webchat")
-                .where(col(PlatformMessageHistory.sender_id) == "astrbot")
+                .where(col(PlatformMessageHistory.sender_id) != "bot")
                 .group_by(col(PlatformMessageHistory.user_id))
             )
 
@@ -53,7 +53,7 @@ async def migrate_webchat_session(db_helper: BaseDatabase):
             if not webchat_users:
                 logger.info("没有找到需要迁移的 WebChat 数据")
                 await sp.put_async(
-                    "global", "global", "migration_done_webchat_session", True
+                    "global", "global", "migration_done_webchat_session_1", True
                 )
                 return
 
@@ -124,7 +124,7 @@ async def migrate_webchat_session(db_helper: BaseDatabase):
                 logger.info("没有新会话需要迁移")
 
         # 标记迁移完成
-        await sp.put_async("global", "global", "migration_done_webchat_session", True)
+        await sp.put_async("global", "global", "migration_done_webchat_session_1", True)
 
     except Exception as e:
         logger.error(f"迁移过程中发生错误: {e}", exc_info=True)

astrbot/core/provider/manager.py

@@ -331,6 +331,10 @@ class ProviderManager:
                     from .sources.xinference_rerank_source import (
                         XinferenceRerankProvider as XinferenceRerankProvider,
                     )
+                case "bailian_rerank":
+                    from .sources.bailian_rerank_source import (
+                        BailianRerankProvider as BailianRerankProvider,
+                    )
         except (ImportError, ModuleNotFoundError) as e:
             logger.critical(
                 f"加载 {provider_config['type']}({provider_config['id']}) 提供商适配器失败：{e}。可能是因为有未安装的依赖。",

astrbot/core/provider/sources/bailian_rerank_source.py

@@ -0,0 +1,236 @@
+import os
+
+import aiohttp
+
+from astrbot import logger
+
+from ..entities import ProviderType, RerankResult
+from ..provider import RerankProvider
+from ..register import register_provider_adapter
+
+
+class BailianRerankError(Exception):
+    """百炼重排序服务异常基类"""
+
+    pass
+
+
+class BailianAPIError(BailianRerankError):
+    """百炼API返回错误"""
+
+    pass
+
+
+class BailianNetworkError(BailianRerankError):
+    """百炼网络请求错误"""
+
+    pass
+
+
+@register_provider_adapter(
+    "bailian_rerank", "阿里云百炼文本排序适配器", provider_type=ProviderType.RERANK
+)
+class BailianRerankProvider(RerankProvider):
+    """阿里云百炼文本重排序适配器."""
+
+    def __init__(self, provider_config: dict, provider_settings: dict) -> None:
+        super().__init__(provider_config, provider_settings)
+        self.provider_config = provider_config
+        self.provider_settings = provider_settings
+
+        # API配置
+        self.api_key = provider_config.get("rerank_api_key") or os.getenv(
+            "DASHSCOPE_API_KEY", ""
+        )
+        if not self.api_key:
+            raise ValueError("阿里云百炼 API Key 不能为空。")
+
+        self.model = provider_config.get("rerank_model", "qwen3-rerank")
+        self.timeout = provider_config.get("timeout", 30)
+        self.return_documents = provider_config.get("return_documents", False)
+        self.instruct = provider_config.get("instruct", "")
+
+        self.base_url = provider_config.get(
+            "rerank_api_base",
+            "https://dashscope.aliyuncs.com/api/v1/services/rerank/text-rerank/text-rerank",
+        )
+
+        # 设置HTTP客户端
+        headers = {
+            "Authorization": f"Bearer {self.api_key}",
+            "Content-Type": "application/json",
+        }
+
+        self.client = aiohttp.ClientSession(
+            headers=headers, timeout=aiohttp.ClientTimeout(total=self.timeout)
+        )
+
+        # 设置模型名称
+        self.set_model(self.model)
+
+        logger.info(f"AstrBot 百炼 Rerank 初始化完成。模型: {self.model}")
+
+    def _build_payload(
+        self, query: str, documents: list[str], top_n: int | None
+    ) -> dict:
+        """构建请求载荷
+
+        Args:
+            query: 查询文本
+            documents: 文档列表
+            top_n: 返回前N个结果，如果为None则返回所有结果
+
+        Returns:
+            请求载荷字典
+        """
+        base = {"model": self.model, "input": {"query": query, "documents": documents}}
+
+        params = {
+            k: v
+            for k, v in [
+                ("top_n", top_n if top_n is not None and top_n > 0 else None),
+                ("return_documents", True if self.return_documents else None),
+                (
+                    "instruct",
+                    self.instruct
+                    if self.instruct and self.model == "qwen3-rerank"
+                    else None,
+                ),
+            ]
+            if v is not None
+        }
+
+        if params:
+            base["parameters"] = params
+
+        return base
+
+    def _parse_results(self, data: dict) -> list[RerankResult]:
+        """解析API响应结果
+
+        Args:
+            data: API响应数据
+
+        Returns:
+            重排序结果列表
+
+        Raises:
+            BailianAPIError: API返回错误
+            KeyError: 结果缺少必要字段
+        """
+        # 检查响应状态
+        if data.get("code", "200") != "200":
+            raise BailianAPIError(
+                f"百炼 API 错误: {data.get('code')} – {data.get('message', '')}"
+            )
+
+        results = data.get("output", {}).get("results", [])
+        if not results:
+            logger.warning(f"百炼 Rerank 返回空结果: {data}")
+            return []
+
+        # 转换为RerankResult对象，使用.get()避免KeyError
+        rerank_results = []
+        for idx, result in enumerate(results):
+            try:
+                index = result.get("index", idx)
+                relevance_score = result.get("relevance_score", 0.0)
+
+                if relevance_score is None:
+                    logger.warning(f"结果 {idx} 缺少 relevance_score，使用默认值 0.0")
+                    relevance_score = 0.0
+
+                rerank_result = RerankResult(
+                    index=index, relevance_score=relevance_score
+                )
+                rerank_results.append(rerank_result)
+            except Exception as e:
+                logger.warning(f"解析结果 {idx} 时出错: {e}, result={result}")
+                continue
+
+        return rerank_results
+
+    def _log_usage(self, data: dict) -> None:
+        """记录使用量信息
+
+        Args:
+            data: API响应数据
+        """
+        tokens = data.get("usage", {}).get("total_tokens", 0)
+        if tokens > 0:
+            logger.debug(f"百炼 Rerank 消耗 Token: {tokens}")
+
+    async def rerank(
+        self,
+        query: str,
+        documents: list[str],
+        top_n: int | None = None,
+    ) -> list[RerankResult]:
+        """
+        对文档进行重排序
+
+        Args:
+            query: 查询文本
+            documents: 待排序的文档列表
+            top_n: 返回前N个结果，如果为None则使用配置中的默认值
+
+        Returns:
+            重排序结果列表
+        """
+        if not documents:
+            logger.warning("文档列表为空，返回空结果")
+            return []
+
+        if not query.strip():
+            logger.warning("查询文本为空，返回空结果")
+            return []
+
+        # 检查限制
+        if len(documents) > 500:
+            logger.warning(
+                f"文档数量({len(documents)})超过限制(500)，将截断前500个文档"
+            )
+            documents = documents[:500]
+
+        try:
+            # 构建请求载荷，如果top_n为None则返回所有重排序结果
+            payload = self._build_payload(query, documents, top_n)
+
+            logger.debug(
+                f"百炼 Rerank 请求: query='{query[:50]}...', 文档数量={len(documents)}"
+            )
+
+            # 发送请求
+            async with self.client.post(self.base_url, json=payload) as response:
+                response.raise_for_status()
+                response_data = await response.json()
+
+                # 解析结果并记录使用量
+                results = self._parse_results(response_data)
+                self._log_usage(response_data)
+
+                logger.debug(f"百炼 Rerank 成功返回 {len(results)} 个结果")
+
+                return results
+
+        except aiohttp.ClientError as e:
+            error_msg = f"网络请求失败: {e}"
+            logger.error(f"百炼 Rerank 网络请求失败: {e}")
+            raise BailianNetworkError(error_msg) from e
+        except BailianRerankError:
+            raise
+        except Exception as e:
+            error_msg = f"重排序失败: {e}"
+            logger.error(f"百炼 Rerank 处理失败: {e}")
+            raise BailianRerankError(error_msg) from e
+
+    async def terminate(self) -> None:
+        """关闭HTTP客户端会话."""
+        if self.client:
+            logger.info("关闭 百炼 Rerank 客户端会话")
+            try:
+                await self.client.close()
+            except Exception as e:
+                logger.error(f"关闭 百炼 Rerank 客户端时出错: {e}")
+            finally:
+                self.client = None

{astrbot-4.6.0.dist-info → astrbot-4.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AstrBot
-Version: 4.6.0
+Version: 4.6.1
 Summary: Easy-to-use multi-platform LLM chatbot and development framework
 License-File: LICENSE
 Keywords: Astrbot,Astrbot Module,Astrbot Plugin
@@ -93,7 +93,7 @@ Description-Content-Type: text/markdown
 <a href="https://github.com/AstrBotDevs/AstrBot/issues">问题提交</a>
 </div>
 
-AstrBot 是一个开源的一站式 Agent 聊天机器人平台及开发框架。
+AstrBot 是一个开源的一站式 Agent 聊天机器人平台，可无缝接入主流即时通讯软件，为个人、开发者和团队打造可靠、可扩展的对话式智能基础设施。无论是个人 AI 伙伴、智能客服、自动化助手，还是企业知识库，AstrBot 都能在你的即时通讯软件平台的工作流中快速构建生产可用的 AI 应用。
 
 ## 主要功能
 

{astrbot-4.6.0.dist-info → astrbot-4.6.1.dist-info}/RECORD

@@ -51,14 +51,14 @@ astrbot/core/agent/runners/base.py,sha256=5vDPiI_65ZlmVpuak-A4K2NW4uVhVD6wYRERKb
 astrbot/core/agent/runners/tool_loop_agent_runner.py,sha256=1bbuYHBz7A3U68Rl-ubG_-u_l4qjVTufkotQdBrIO8M,16781
 astrbot/core/config/__init__.py,sha256=vZjtpC7vr-IvBgSUtbS04C0wpulmCG5tPmcEP1WYE_4,172
 astrbot/core/config/astrbot_config.py,sha256=nGyvHyR9VJH9Pk0XKYyeDFVxjwbyVb9u0lIsuvpe3fg,6276
-astrbot/core/config/default.py,sha256=lA-1SepLA11TV0LzmbKW_C2kSQVXJFuX3dkrb1ACllI,136327
+astrbot/core/config/default.py,sha256=jKQ6gqwTB1bZLWQ_pZSk1YsKLtGAdZW45rk3wxvrF8M,137547
 astrbot/core/db/__init__.py,sha256=s4oIWazGk2U1-9dkr3bvq8M4g9nwOXy4e3f53zlvAJk,10326
 astrbot/core/db/po.py,sha256=w4NaoMc8112YMT3H3NBMOd0HQyuphZ5sTUjU8vZOHR8,9406
 astrbot/core/db/sqlite.py,sha256=F117PS3BIss6-NuXOeTWV_8CVkSDCjqGnLf3yuftQjg,30076
 astrbot/core/db/migration/helper.py,sha256=Kogq0FLJdvWTDuAVWLT1PlTGGJcWkDMWO37KM-G8lTk,2087
 astrbot/core/db/migration/migra_3_to_4.py,sha256=hNn_tMququot1qUg3cx_nzxODxcZSlf4M_7YtBgKl2o,15277
 astrbot/core/db/migration/migra_45_to_46.py,sha256=wQk8NUiCNgmpSczO9U-OW6mMRHPWtJDlKuTCOGF8-WY,1560
-astrbot/core/db/migration/migra_webchat_session.py,sha256=OXgosbb0d6cSQ-x_N_RRjLiy0SUAtUQ5GBL72xpEAH8,5249
+astrbot/core/db/migration/migra_webchat_session.py,sha256=KN2MaT4RPgaHuwQMGoSR_h6hPGEnPbuy_sVlVISgyuE,5251
 astrbot/core/db/migration/shared_preferences_v3.py,sha256=91zq_MrdAMF1MH5fxLaFkZO19nPNIW4gwqCCRn9u2dQ,1241
 astrbot/core/db/migration/sqlite_v3.py,sha256=pBBS5UemoVqus0aLJ5avqb3HgoN-b_S4fN5m4tBVf_U,15051
 astrbot/core/db/vec_db/base.py,sha256=0YxoCPNj_zVprLMamUj-OkUHJDlywIfdN8Q0Kpslm3A,1759
@@ -171,11 +171,12 @@ astrbot/core/provider/__init__.py,sha256=0NVyKtTapnrUy0lkXVYWyM5KetwtDwXmTwBzqLG
 astrbot/core/provider/entites.py,sha256=0eYiQ-xttqFTb3WZR2b1oemdZy3d5sevELvj9FixJtE,388
 astrbot/core/provider/entities.py,sha256=AwD8KOG8dSlfQXSc1n8gx4xv2vW4niZDiaMoO1Y_dOw,12533
 astrbot/core/provider/func_tool_manager.py,sha256=28fOKbpWOxiclwfcNkmP6sHSBlK4cZKwPXyNhFjjXps,21181
-astrbot/core/provider/manager.py,sha256=OzoEniML-bxbIO1GG2IMnzVDZ-IlVGQCbBFB0MB4zZw,22592
+astrbot/core/provider/manager.py,sha256=3nQXBwlIWt_Ds834vlfThunqu-GxnXttNZOODvNQqC8,22790
 astrbot/core/provider/provider.py,sha256=bMJBBZzNwHhVv8dEiO1tNUclzxS78Yb01vUbceHZXKA,10680
 astrbot/core/provider/register.py,sha256=0WMYrT9vbRjeq-72HD0oRT45kJmeKA96UgSItpTJbX8,1904
 astrbot/core/provider/sources/anthropic_source.py,sha256=kRbJk0K-li84mWwapxYezGlkEF03Lg1brZDZnjmGrQ8,15584
 astrbot/core/provider/sources/azure_tts_source.py,sha256=uhPr4Dja6XANesAmrfZiuINNIlXej0NV7Goo8ahMm14,9387
+astrbot/core/provider/sources/bailian_rerank_source.py,sha256=-kxF2XRnQRikGggymOBS2aJHRi8Y-zZgc4ykmred9UQ,7451
 astrbot/core/provider/sources/coze_api_client.py,sha256=0k8pQsFsbjKdF-jkY91qZWsC8YSaSmwC98TMTK-zqw0,10853
 astrbot/core/provider/sources/coze_source.py,sha256=FXqhRUOjKXwBsUBfVXBlLm5pM--IQpzzFViIUFltX1M,25341
 astrbot/core/provider/sources/dashscope_source.py,sha256=DlvP4tkBLZGHl77LvWbjdtfNO0spr6y0nypPzwKN-n8,7369
@@ -262,8 +263,8 @@ astrbot/dashboard/routes/static_file.py,sha256=7KnNcOb1BVqSTft114LhGsDkfg69X2jHE
 astrbot/dashboard/routes/t2i.py,sha256=F6smxdL99MF7cRw3hqS6-2GErw8Zhsv0V0mfBUeEk-c,8931
 astrbot/dashboard/routes/tools.py,sha256=YsVFrwVIhxAI-Ikme7YPrHVnPVTkJ1IaH7n6ciREjdE,14663
 astrbot/dashboard/routes/update.py,sha256=qXiqQ_dbqRVftOzGgCQrvK8-qopVK6zKhhVVJ9SK26U,6648
-astrbot-4.6.0.dist-info/METADATA,sha256=xugOHJn1hx--yvwaSY3uBlEds-BOHTzEV2p7dGZ34XU,10069
-astrbot-4.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-astrbot-4.6.0.dist-info/entry_points.txt,sha256=OEF09YmhBWYuViXrvTLLpstF4ccmNwDL8r7nnFD0pfI,53
-astrbot-4.6.0.dist-info/licenses/LICENSE,sha256=zPfQj5Mq8-gThIiBcxETr7t8gND9bZWOjTGQAr80TQI,34500
-astrbot-4.6.0.dist-info/RECORD,,
+astrbot-4.6.1.dist-info/METADATA,sha256=RIhPkfOxwegvGss371jfFDGETbOLn05MEdc8qIvAycg,10370
+astrbot-4.6.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+astrbot-4.6.1.dist-info/entry_points.txt,sha256=OEF09YmhBWYuViXrvTLLpstF4ccmNwDL8r7nnFD0pfI,53
+astrbot-4.6.1.dist-info/licenses/LICENSE,sha256=zPfQj5Mq8-gThIiBcxETr7t8gND9bZWOjTGQAr80TQI,34500
+astrbot-4.6.1.dist-info/RECORD,,