Merge branch 'AstrBotDevs:master' into master

Author: elecvoid243

astrbot/core/astr_main_agent.py

@@ -153,6 +153,8 @@ class MainAgentBuildConfig:
     This enforce max turns before compression"""
     dequeue_context_length: int = 1
     """The number of oldest turns to remove when context length limit is reached."""
+    fallback_max_context_tokens: int = 128000
+    """Fallback max context tokens. When max_context_tokens is 0 and the model is not in LLM_METADATAS, use this value."""
     llm_safety_mode: bool = True
     """This will inject healthy and safe system prompt into the main agent,
     to prevent LLM output harmful information"""
@@ -1465,6 +1467,11 @@ async def build_main_agent(
             provider.provider_config["max_context_tokens"] = model_info["limit"][
                 "context"
             ]
+        else:
+            # fallback: default to configured fallback value
+            provider.provider_config["max_context_tokens"] = (
+                config.fallback_max_context_tokens
+            )
 
     if event.get_platform_name() == "webchat":
         asyncio.create_task(_handle_webchat(event, req, provider))

astrbot/core/config/default.py

@@ -1,7 +1,6 @@
 """如需修改配置，请在 `data/cmd_config.json` 中修改或者在管理面板中可视化修改。"""
 
 import os
-from typing import Any, TypedDict
 
 from astrbot.core.computer.booters.cua_defaults import CUA_DEFAULT_CONFIG
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
@@ -316,24 +315,6 @@
 }
 
 
-class ChatProviderTemplate(TypedDict):
-    id: str
-    provider_source_id: str
-    model: str
-    modalities: list
-    custom_extra_body: dict[str, Any]
-    max_context_tokens: int
-
-
-CHAT_PROVIDER_TEMPLATE = {
-    "id": "",
-    "provide_source_id": "",
-    "model": "",
-    "modalities": [],
-    "custom_extra_body": {},
-    "max_context_tokens": 0,
-}
-
 """
 AstrBot v3 时代的配置元数据，目前仅承担以下功能：
 
@@ -1992,13 +1973,13 @@ class ChatProviderTemplate(TypedDict):
                         "options": ["text", "image", "audio", "tool_use"],
                         "labels": ["文本", "图像", "音频", "工具使用"],
                         "render_type": "checkbox",
-                        "hint": "模型支持的模态。如所填写的模型不支持图像，请取消勾选图像。",
+                        "hint": "模型支持的模态及能力。",
                     },
                     "custom_headers": {
-                        "description": "自定义添加请求头",
+                        "description": "自定义请求头",
                         "type": "dict",
                         "items": {},
-                        "hint": "此处添加的键值对将被合并到 OpenAI SDK 的 default_headers 中，用于自定义 HTTP 请求头。值必须为字符串。",
+                        "hint": "此处添加的键值对将被合并到 OpenAI SDK 的 default_headers 中，用于自定义 HTTP 请求头。",
                     },
                     "ollama_disable_thinking": {
                         "description": "关闭思考模式",
@@ -2009,7 +1990,7 @@ class ChatProviderTemplate(TypedDict):
                         "description": "自定义请求体参数",
                         "type": "dict",
                         "items": {},
-                        "hint": "用于在请求时添加额外的参数，如 temperature、top_p、max_tokens 等。",
+                        "hint": "用于在请求时添加额外的参数，如 temperature, top_p, max_tokens, reasoning_effort 等。",
                         "template_schema": {
                             "temperature": {
                                 "name": "Temperature",
@@ -2652,7 +2633,7 @@ class ChatProviderTemplate(TypedDict):
                     "max_context_tokens": {
                         "description": "模型上下文窗口大小",
                         "type": "int",
-                        "hint": "模型最大上下文 Token 大小。如果为 0，则会自动从模型元数据填充（如有），也可手动修改。",
+                        "hint": "模型最大上下文 Token 大小。如果为 0，则会自动从模型元数据填充（如有）",
                     },
                     "dify_api_key": {
                         "description": "API Key",
@@ -3566,6 +3547,14 @@ class ChatProviderTemplate(TypedDict):
                             "provider_settings.agent_runner_type": "local",
                         },
                     },
+                    "provider_settings.fallback_max_context_tokens": {
+                        "description": "上下文窗口兜底值",
+                        "type": "int",
+                        "hint": "当 max_context_tokens 为 0 且模型不在内置元数据中时，使用此值作为上下文窗口大小。默认 128000。",
+                        "condition": {
+                            "provider_settings.agent_runner_type": "local",
+                        },
+                    },
                 },
                 "condition": {
                     "provider_settings.agent_runner_type": "local",

astrbot/core/knowledge_base/kb_mgr.py

@@ -36,8 +36,6 @@ def __init__(
     async def initialize(self) -> None:
         """初始化知识库模块"""
         try:
-            logger.info("正在初始化知识库模块...")
-
             # 初始化数据库
             await self._init_kb_database()
 

astrbot/core/pipeline/process_stage/method/agent_sub_stages/internal.py

@@ -107,6 +107,9 @@ async def initialize(self, ctx: PipelineContext) -> None:
         )
         if self.dequeue_context_length <= 0:
             self.dequeue_context_length = 1
+        self.fallback_max_context_tokens: int = settings.get(
+            "fallback_max_context_tokens", 128000
+        )
 
         self.llm_safety_mode = settings.get("llm_safety_mode", True)
         self.safety_mode_strategy = settings.get(
@@ -136,6 +139,7 @@ async def initialize(self, ctx: PipelineContext) -> None:
             llm_compress_provider_id=self.llm_compress_provider_id,
             max_context_length=self.max_context_length,
             dequeue_context_length=self.dequeue_context_length,
+            fallback_max_context_tokens=self.fallback_max_context_tokens,
             llm_safety_mode=self.llm_safety_mode,
             safety_mode_strategy=self.safety_mode_strategy,
             computer_use_runtime=self.computer_use_runtime,

astrbot/core/platform/astr_message_event.py

@@ -53,6 +53,8 @@ def __init__(
         self.is_at_or_wake_command = False
         """是否是 At 机器人或者带有唤醒词或者是私聊(插件注册的事件监听器会让 is_wake 设为 True, 但是不会让这个属性置为 True)"""
         self._extras: dict[str, Any] = {}
+        self._force_stopped: bool = False
+        """独立的停止标志，不依赖 _result，不会被 clear_result() 重置"""
         message_type = getattr(message_obj, "type", None)
         if not isinstance(message_type, MessageType):
             try:
@@ -336,20 +338,24 @@ async def check_count(self, event: AstrMessageEvent):
 
     def stop_event(self) -> None:
         """终止事件传播。"""
+        self._force_stopped = True
         if self._result is None:
             self.set_result(MessageEventResult().stop_event())
         else:
             self._result.stop_event()
 
     def continue_event(self) -> None:
         """继续事件传播。"""
+        self._force_stopped = False
         if self._result is None:
             self.set_result(MessageEventResult().continue_event())
         else:
             self._result.continue_event()
 
     def is_stopped(self) -> bool:
         """是否终止事件传播。"""
+        if self._force_stopped:
+            return True
         if self._result is None:
             return False  # 默认是继续传播
         return self._result.is_stopped()

astrbot/core/platform/platform.py

@@ -1,4 +1,5 @@
 import abc
+import asyncio
 import uuid
 from asyncio import Queue
 from collections.abc import Coroutine
@@ -138,7 +139,9 @@ async def send_by_session(
 
         异步方法。
         """
-        await Metric.upload(msg_event_tick=1, adapter_name=self.meta().name)
+        asyncio.create_task(
+            Metric.upload(msg_event_tick=1, adapter_name=self.meta().name)
+        )
 
     def commit_event(self, event: AstrMessageEvent) -> None:
         """提交一个事件到事件队列。"""

astrbot/core/platform/sources/lark/lark_event.py

@@ -949,7 +949,9 @@ async def _fallback_send_streaming(self, generator, use_fallback: bool = False):
             buffer.squash_plain()
             await self.send(buffer)
 
-        await Metric.upload(msg_event_tick=1, adapter_name=self.platform_meta.name)
+        asyncio.create_task(
+            Metric.upload(msg_event_tick=1, adapter_name=self.platform_meta.name)
+        )
         self._has_send_oper = True
 
     async def send_streaming(self, generator, use_fallback: bool = False):
@@ -1000,7 +1002,9 @@ async def _consume_rest_and_fallback(gen, initial_text: str) -> None:
             if buffer:
                 buffer.squash_plain()
                 await self.send(buffer)
-            await Metric.upload(msg_event_tick=1, adapter_name=self.platform_meta.name)
+            asyncio.create_task(
+                Metric.upload(msg_event_tick=1, adapter_name=self.platform_meta.name)
+            )
             self._has_send_oper = True
 
         async def _flush_and_close_card() -> None:
@@ -1075,14 +1079,18 @@ async def _flush_and_close_card() -> None:
         # If no text was produced at all, no card was created
         if card_id is None:
             if not fallback_used:
-                await Metric.upload(
-                    msg_event_tick=1, adapter_name=self.platform_meta.name
+                asyncio.create_task(
+                    Metric.upload(
+                        msg_event_tick=1, adapter_name=self.platform_meta.name
+                    )
                 )
                 self._has_send_oper = True
             return
 
         await _flush_and_close_card()
 
         # 内联父类 send_streaming 的副作用
-        await Metric.upload(msg_event_tick=1, adapter_name=self.platform_meta.name)
+        asyncio.create_task(
+            Metric.upload(msg_event_tick=1, adapter_name=self.platform_meta.name)
+        )
         self._has_send_oper = True

astrbot/core/platform/sources/wecom/wecom_adapter.py

@@ -4,7 +4,9 @@
 import time
 import uuid
 from collections.abc import Awaitable, Callable
+from pathlib import Path
 from typing import Any, cast
+from urllib.parse import unquote
 
 import quart
 from requests import Response
@@ -15,7 +17,7 @@
 from wechatpy.messages import BaseMessage
 
 from astrbot.api.event import MessageChain
-from astrbot.api.message_components import Image, Plain, Record
+from astrbot.api.message_components import File, Image, Plain, Record
 from astrbot.api.platform import (
     AstrBotMessage,
     MessageMember,
@@ -40,6 +42,27 @@
     from typing_extensions import override
 
 
+def _extract_wecom_media_filename(disposition: str | None) -> str | None:
+    if not disposition:
+        return None
+
+    for part in disposition.split(";"):
+        token = part.strip()
+        token_lower = token.lower()
+        if token_lower.startswith("filename*="):
+            value = token.split("=", 1)[1].strip().strip('"')
+            if value.lower().startswith("utf-8''"):
+                value = value[7:]
+            filename = Path(unquote(value).replace("\\", "/")).name
+            return filename or None
+        if token_lower.startswith("filename="):
+            value = token.split("=", 1)[1].strip().strip('"')
+            filename = Path(value.replace("\\", "/")).name
+            return filename or None
+
+    return None
+
+
 class WecomServer:
     def __init__(self, event_queue: asyncio.Queue, config: dict) -> None:
         self.server = quart.Quart(__name__)
@@ -459,6 +482,29 @@ async def convert_wechat_kf_message(self, msg: dict) -> AstrBotMessage | None:
                 return
 
             abm.message = [Record(file=path_wav, url=path_wav)]
+        elif msgtype == "file":
+            media_id = msg.get("file", {}).get("media_id", "")
+            if not media_id:
+                logger.warning(f"微信客服文件消息缺少 media_id: {msg}")
+                return
+
+            resp: Response = await asyncio.get_running_loop().run_in_executor(
+                None,
+                self.client.media.download,
+                media_id,
+            )
+
+            file_name = (
+                _extract_wecom_media_filename(
+                    resp.headers.get("Content-Disposition"),
+                )
+                or f"weixinkefu_{media_id}.bin"
+            )
+            temp_dir = Path(get_astrbot_temp_path())
+            file_path = temp_dir / f"weixinkefu_{uuid.uuid4().hex}_{file_name}"
+            file_path.write_bytes(resp.content)
+
+            abm.message = [File(name=file_name, file=str(file_path))]
         else:
             logger.warning(f"未实现的微信客服消息事件: {msg}")
             return

astrbot/core/provider/func_tool_manager.py

@@ -311,7 +311,7 @@ def add_func(
                 handler=handler,
             ),
         )
-        logger.info(f"添加函数调用工具: {name}")
+        logger.info(f"Added llm tool: {name}")
 
     def remove_func(self, name: str) -> None:
         """删除一个函数调用工具。"""

astrbot/core/provider/sources/anthropic_source.py

@@ -1,7 +1,7 @@
 import base64
 import json
 from collections.abc import AsyncGenerator
-from typing import Literal
+from typing import Any, Literal
 
 import anthropic
 import httpx
@@ -104,15 +104,35 @@ def _init_api_key(self, provider_config: dict) -> None:
             api_key=self.chosen_api_key,
             timeout=self.timeout,
             base_url=self.base_url,
+            default_headers=self.custom_headers,
             http_client=self._create_http_client(provider_config),
         )
 
-    def _create_http_client(self, provider_config: dict) -> httpx.AsyncClient:
-        """创建带代理的 HTTP 客户端，使用系统 SSL 证书"""
+    def _create_http_client(self, provider_config: dict) -> httpx.AsyncClient | None:
+        """Create an HTTP client with optional proxy and system SSL trust store.
+
+        The Anthropic SDK validates ``http_client`` with
+        ``isinstance(..., httpx.AsyncClient)`` against its own ``httpx`` import.
+        When multiple ``httpx`` installations are present on ``sys.path``
+        (e.g. bundled Python + system Python), constructing the client from a
+        different ``httpx`` module makes that check fail. We therefore prefer
+        the SDK's own ``httpx`` module when available.
+        """
+        proxy = provider_config.get("proxy", "")
+        if not proxy:
+            return None
+        httpx_module: Any = httpx
+        try:
+            from anthropic import _base_client as anthropic_base_client
+
+            httpx_module = getattr(anthropic_base_client, "httpx", httpx)
+        except ImportError:
+            pass
         return create_proxy_client(
             "Anthropic",
-            provider_config.get("proxy", ""),
+            proxy,
             headers=self.custom_headers,
+            httpx_module=httpx_module,
         )
 
     def _apply_thinking_config(self, payloads: dict) -> None:
@@ -591,7 +611,11 @@ async def text_chat(
 
         # Anthropic has a different way of handling system prompts
         if system_prompt:
-            payloads["system"] = system_prompt
+            payloads["system"] = (
+                [{"type": "text", "text": system_prompt}]
+                if isinstance(system_prompt, str)
+                else system_prompt
+            )
 
         llm_response = None
         try:
@@ -654,7 +678,11 @@ async def text_chat_stream(
 
         # Anthropic has a different way of handling system prompts
         if system_prompt:
-            payloads["system"] = system_prompt
+            payloads["system"] = (
+                [{"type": "text", "text": system_prompt}]
+                if isinstance(system_prompt, str)
+                else system_prompt
+            )
 
         async for llm_response in self._query_stream(payloads, func_tool):
             yield llm_response