feat: implement retry mechanism for model requests in anthropic and openai providers

.github/workflows/code-format.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
-        python-version: '3.12'
+        python-version: '3.10'
         
     - name: Install UV
       run: pip install uv

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.17.3"
+__version__ = "4.17.2"

astrbot/core/computer/tools/python.py

@@ -5,9 +5,8 @@ import mcp
 from astrbot.api import FunctionTool
 from astrbot.core.agent.run_context import ContextWrapper
 from astrbot.core.agent.tool import ToolExecResult
-from astrbot.core.astr_agent_context import AstrAgentContext, AstrMessageEvent
+from astrbot.core.astr_agent_context import AstrAgentContext
 from astrbot.core.computer.computer_client import get_booter, get_local_booter
-from astrbot.core.message.message_event_result import MessageChain
 
 param_schema = {
     "type": "object",
@@ -26,7 +25,7 @@ param_schema = {
 }
 
 
-async def handle_result(result: dict, event: AstrMessageEvent) -> ToolExecResult:
+def handle_result(result: dict) -> ToolExecResult:
     data = result.get("data", {})
     output = data.get("output", {})
     error = data.get("error", "")
@@ -45,9 +44,6 @@ async def handle_result(result: dict, event: AstrMessageEvent) -> ToolExecResult
                     type="image", data=img["image/png"], mimeType="image/png"
                 )
             )
-
-            if event.get_platform_name() == "webchat":
-                await event.send(message=MessageChain().base64_image(img["image/png"]))
     if text:
         resp.content.append(mcp.types.TextContent(type="text", text=text))
 
@@ -72,7 +68,7 @@ class PythonTool(FunctionTool):
         )
         try:
             result = await sb.python.exec(code, silent=silent)
-            return await handle_result(result, context.context.event)
+            return handle_result(result)
         except Exception as e:
             return f"Error executing code: {str(e)}"
 
@@ -88,14 +84,11 @@ class LocalPythonTool(FunctionTool):
         self, context: ContextWrapper[AstrAgentContext], code: str, silent: bool = False
     ) -> ToolExecResult:
         if context.context.event.role != "admin":
-            return (
-                "error: Permission denied. Local Python execution is only allowed for admin users. "
-                "Tell user to set admins in AstrBot WebUI by adding their user ID to the admins list if they need this feature."
-                f"User's ID is: {context.context.event.get_sender_id()}. User's ID can be found by using /sid command."
-            )
+            return "error: Permission denied. Local Python execution is only allowed for admin users. Tell user to set admins in AstrBot WebUI."
+
         sb = get_local_booter()
         try:
             result = await sb.python.exec(code, silent=silent)
-            return await handle_result(result, context.context.event)
+            return handle_result(result)
         except Exception as e:
             return f"Error executing code: {str(e)}"

astrbot/core/computer/tools/shell.py

@@ -47,11 +47,7 @@ class ExecuteShellTool(FunctionTool):
         env: dict = {},
     ) -> ToolExecResult:
         if context.context.event.role != "admin":
-            return (
-                "error: Permission denied. Local shell execution is only allowed for admin users. "
-                "Tell user to set admins in AstrBot WebUI by adding their user ID to the admins list if they need this feature."
-                f"User's ID is: {context.context.event.get_sender_id()}. User's ID can be found by using /sid command."
-            )
+            return "error: Permission denied. Shell execution is only allowed for admin users. Tell user to Set admins in AstrBot WebUI."
 
         if self.is_local:
             sb = get_local_booter()

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.17.3"
+VERSION = "4.17.2"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [
@@ -1029,18 +1029,6 @@ CONFIG_METADATA_2 = {
                         "proxy": "",
                         "custom_headers": {},
                     },
-                    "NVIDIA": {
-                        "id": "nvidia",
-                        "provider": "nvidia",
-                        "type": "openai_chat_completion",
-                        "provider_type": "chat_completion",
-                        "enable": True,
-                        "key": [],
-                        "api_base": "https://integrate.api.nvidia.com/v1",
-                        "timeout": 120,
-                        "proxy": "",
-                        "custom_headers": {},
-                    },
                     "Azure OpenAI": {
                         "id": "azure_openai",
                         "provider": "azure",

astrbot/core/message/components.py

@@ -25,14 +25,10 @@ import asyncio
 import base64
 import json
 import os
-import sys
 import uuid
 from enum import Enum
 
-if sys.version_info >= (3, 14):
-    from pydantic import BaseModel
-else:
-    from pydantic.v1 import BaseModel
+from pydantic.v1 import BaseModel
 
 from astrbot.core import astrbot_config, file_token_service, logger
 from astrbot.core.utils.astrbot_path import get_astrbot_temp_path
@@ -89,7 +85,7 @@ class BaseMessageComponent(BaseModel):
 
 
 class Plain(BaseMessageComponent):
-    type: ComponentType = ComponentType.Plain
+    type = ComponentType.Plain
     text: str
     convert: bool | None = True
 
@@ -104,7 +100,7 @@ class Plain(BaseMessageComponent):
 
 
 class Face(BaseMessageComponent):
-    type: ComponentType = ComponentType.Face
+    type = ComponentType.Face
     id: int
 
     def __init__(self, **_) -> None:
@@ -112,7 +108,7 @@ class Face(BaseMessageComponent):
 
 
 class Record(BaseMessageComponent):
-    type: ComponentType = ComponentType.Record
+    type = ComponentType.Record
     file: str | None = ""
     magic: bool | None = False
     url: str | None = ""
@@ -219,7 +215,7 @@ class Record(BaseMessageComponent):
 
 
 class Video(BaseMessageComponent):
-    type: ComponentType = ComponentType.Video
+    type = ComponentType.Video
     file: str
     cover: str | None = ""
     c: int | None = 2
@@ -305,7 +301,7 @@ class Video(BaseMessageComponent):
 
 
 class At(BaseMessageComponent):
-    type: ComponentType = ComponentType.At
+    type = ComponentType.At
     qq: int | str  # 此处str为all时代表所有人
     name: str | None = ""
 
@@ -327,28 +323,28 @@ class AtAll(At):
 
 
 class RPS(BaseMessageComponent):  # TODO
-    type: ComponentType = ComponentType.RPS
+    type = ComponentType.RPS
 
     def __init__(self, **_) -> None:
         super().__init__(**_)
 
 
 class Dice(BaseMessageComponent):  # TODO
-    type: ComponentType = ComponentType.Dice
+    type = ComponentType.Dice
 
     def __init__(self, **_) -> None:
         super().__init__(**_)
 
 
 class Shake(BaseMessageComponent):  # TODO
-    type: ComponentType = ComponentType.Shake
+    type = ComponentType.Shake
 
     def __init__(self, **_) -> None:
         super().__init__(**_)
 
 
 class Share(BaseMessageComponent):
-    type: ComponentType = ComponentType.Share
+    type = ComponentType.Share
     url: str
     title: str
     content: str | None = ""
@@ -359,7 +355,7 @@ class Share(BaseMessageComponent):
 
 
 class Contact(BaseMessageComponent):  # TODO
-    type: ComponentType = ComponentType.Contact
+    type = ComponentType.Contact
     _type: str  # type 字段冲突
     id: int | None = 0
 
@@ -368,7 +364,7 @@ class Contact(BaseMessageComponent):  # TODO
 
 
 class Location(BaseMessageComponent):  # TODO
-    type: ComponentType = ComponentType.Location
+    type = ComponentType.Location
     lat: float
     lon: float
     title: str | None = ""
@@ -379,7 +375,7 @@ class Location(BaseMessageComponent):  # TODO
 
 
 class Music(BaseMessageComponent):
-    type: ComponentType = ComponentType.Music
+    type = ComponentType.Music
     _type: str
     id: int | None = 0
     url: str | None = ""
@@ -396,7 +392,7 @@ class Music(BaseMessageComponent):
 
 
 class Image(BaseMessageComponent):
-    type: ComponentType = ComponentType.Image
+    type = ComponentType.Image
     file: str | None = ""
     _type: str | None = ""
     subType: int | None = 0
@@ -511,7 +507,7 @@ class Image(BaseMessageComponent):
 
 
 class Reply(BaseMessageComponent):
-    type: ComponentType = ComponentType.Reply
+    type = ComponentType.Reply
     id: str | int
     """所引用的消息 ID"""
     chain: list["BaseMessageComponent"] | None = []
@@ -547,7 +543,7 @@ class Poke(BaseMessageComponent):
 
 
 class Forward(BaseMessageComponent):
-    type: ComponentType = ComponentType.Forward
+    type = ComponentType.Forward
     id: str
 
     def __init__(self, **_) -> None:
@@ -557,7 +553,7 @@ class Forward(BaseMessageComponent):
 class Node(BaseMessageComponent):
     """群合并转发消息"""
 
-    type: ComponentType = ComponentType.Node
+    type = ComponentType.Node
     id: int | None = 0  # 忽略
     name: str | None = ""  # qq昵称
     uin: str | None = "0"  # qq号
@@ -609,7 +605,7 @@ class Node(BaseMessageComponent):
 
 
 class Nodes(BaseMessageComponent):
-    type: ComponentType = ComponentType.Nodes
+    type = ComponentType.Nodes
     nodes: list[Node]
 
     def __init__(self, nodes: list[Node], **_) -> None:
@@ -635,7 +631,7 @@ class Nodes(BaseMessageComponent):
 
 
 class Json(BaseMessageComponent):
-    type: ComponentType = ComponentType.Json
+    type = ComponentType.Json
     data: dict
 
     def __init__(self, data: str | dict, **_) -> None:
@@ -645,14 +641,14 @@ class Json(BaseMessageComponent):
 
 
 class Unknown(BaseMessageComponent):
-    type: ComponentType = ComponentType.Unknown
+    type = ComponentType.Unknown
     text: str
 
 
 class File(BaseMessageComponent):
     """文件消息段"""
 
-    type: ComponentType = ComponentType.File
+    type = ComponentType.File
     name: str | None = ""  # 名字
     file_: str | None = ""  # 本地路径
     url: str | None = ""  # url
@@ -787,7 +783,7 @@ class File(BaseMessageComponent):
 
 
 class WechatEmoji(BaseMessageComponent):
-    type: ComponentType = ComponentType.WechatEmoji
+    type = ComponentType.WechatEmoji
     md5: str | None = ""
     md5_len: int | None = 0
     cdnurl: str | None = ""

astrbot/core/provider/sources/anthropic_source.py

@@ -22,6 +22,7 @@ from astrbot.core.utils.network_utils import (
 )
 
 from ..register import register_provider_adapter
+from .default import with_model_request_retry
 
 
 @register_provider_adapter(
@@ -204,6 +205,7 @@ class ProviderAnthropic(Provider):
         if usage.output_tokens is not None:
             token_usage.output = usage.output_tokens
 
+    @with_model_request_retry()
     async def _query(self, payloads: dict, tools: ToolSet | None) -> LLMResponse:
         if tools:
             if tool_list := tools.get_func_desc_anthropic_style():
@@ -265,6 +267,10 @@ class ProviderAnthropic(Provider):
 
         return llm_response
 
+    @with_model_request_retry()
+    async def _create_message_stream(self, payloads: dict, extra_body: dict):
+        return self.client.messages.stream(**payloads, extra_body=extra_body)
+
     async def _query_stream(
         self,
         payloads: dict,
@@ -293,9 +299,8 @@ class ProviderAnthropic(Provider):
                 "type": "enabled",
             }
 
-        async with self.client.messages.stream(
-            **payloads, extra_body=extra_body
-        ) as stream:
+        stream_ctx = await self._create_message_stream(payloads, extra_body)
+        async with stream_ctx as stream:
             assert isinstance(stream, anthropic.AsyncMessageStream)
             async for event in stream:
                 if event.type == "message_start":

astrbot/core/provider/sources/default.py

@@ -0,0 +1,38 @@
+from tenacity import (
+    AsyncRetrying,
+    retry,
+    retry_if_exception_type,
+    stop_after_attempt,
+    wait_exponential,
+)
+
+MODEL_REQUEST_RETRY_ATTEMPTS = 5
+MODEL_REQUEST_RETRY_WAIT_MAX_SECONDS = 15
+MODEL_REQUEST_RETRY_WAIT_MIN_SECONDS = 1
+MODEL_REQUEST_RETRY_WAIT_MULTIPLIER = 1
+
+
+def with_model_request_retry():
+    return retry(
+        retry=retry_if_exception_type(Exception),
+        stop=stop_after_attempt(MODEL_REQUEST_RETRY_ATTEMPTS),
+        wait=wait_exponential(
+            multiplier=MODEL_REQUEST_RETRY_WAIT_MULTIPLIER,
+            min=MODEL_REQUEST_RETRY_WAIT_MIN_SECONDS,
+            max=MODEL_REQUEST_RETRY_WAIT_MAX_SECONDS,
+        ),
+        reraise=True,
+    )
+
+
+def get_model_request_async_retrying() -> AsyncRetrying:
+    return AsyncRetrying(
+        retry=retry_if_exception_type(Exception),
+        stop=stop_after_attempt(MODEL_REQUEST_RETRY_ATTEMPTS),
+        wait=wait_exponential(
+            multiplier=MODEL_REQUEST_RETRY_WAIT_MULTIPLIER,
+            min=MODEL_REQUEST_RETRY_WAIT_MIN_SECONDS,
+            max=MODEL_REQUEST_RETRY_WAIT_MAX_SECONDS,
+        ),
+        reraise=True,
+    )

astrbot/core/provider/sources/gemini_source.py

@@ -21,6 +21,7 @@ from astrbot.core.utils.io import download_image_by_url
 from astrbot.core.utils.network_utils import is_connection_error, log_connection_failure
 
 from ..register import register_provider_adapter
+from .default import get_model_request_async_retrying, with_model_request_retry
 
 
 class SuppressNonTextPartsWarning(logging.Filter):
@@ -513,6 +514,7 @@ class ProviderGoogleGenAI(Provider):
                 llm_response.reasoning_signature = base64.b64encode(ts).decode("utf-8")
         return MessageChain(chain=chain)
 
+    @with_model_request_retry()
     async def _query(self, payloads: dict, tools: ToolSet | None) -> LLMResponse:
         """非流式请求 Gemini API"""
         system_instruction = next(
@@ -601,6 +603,17 @@ class ProviderGoogleGenAI(Provider):
         self,
         payloads: dict,
         tools: ToolSet | None,
+    ) -> AsyncGenerator[LLMResponse, None]:
+        async for attempt in get_model_request_async_retrying():
+            with attempt:
+                async for response in self._query_stream_once(payloads, tools):
+                    yield response
+                return
+
+    async def _query_stream_once(
+        self,
+        payloads: dict,
+        tools: ToolSet | None,
     ) -> AsyncGenerator[LLMResponse, None]:
         """流式请求 Gemini API"""
         system_instruction = next(
@@ -759,18 +772,7 @@ class ProviderGoogleGenAI(Provider):
 
         payloads = {"messages": context_query, "model": model}
 
-        retry = 10
-        keys = self.api_keys.copy()
-
-        for _ in range(retry):
-            try:
-                return await self._query(payloads, func_tool)
-            except APIError as e:
-                if await self._handle_api_error(e, keys):
-                    continue
-                break
-
-        raise Exception("请求失败。")
+        return await self._query(payloads, func_tool)
 
     async def text_chat_stream(
         self,
@@ -814,18 +816,8 @@ class ProviderGoogleGenAI(Provider):
 
         payloads = {"messages": context_query, "model": model}
 
-        retry = 10
-        keys = self.api_keys.copy()
-
-        for _ in range(retry):
-            try:
-                async for response in self._query_stream(payloads, func_tool):
-                    yield response
-                break
-            except APIError as e:
-                if await self._handle_api_error(e, keys):
-                    continue
-                break
+        async for response in self._query_stream(payloads, func_tool):
+            yield response
 
     async def get_models(self):
         try:

astrbot/core/provider/sources/openai_source.py

@@ -31,6 +31,7 @@ from astrbot.core.utils.network_utils import (
 from astrbot.core.utils.string_utils import normalize_and_dedupe_strings
 
 from ..register import register_provider_adapter
+from .default import get_model_request_async_retrying, with_model_request_retry
 
 
 @register_provider_adapter(
@@ -221,6 +222,7 @@ class ProviderOpenAIOfficial(Provider):
         except NotFoundError as e:
             raise Exception(f"获取模型列表失败：{e}")
 
+    @with_model_request_retry()
     async def _query(self, payloads: dict, tools: ToolSet | None) -> LLMResponse:
         if tools:
             model = payloads.get("model", "").lower()
@@ -246,8 +248,6 @@ class ProviderOpenAIOfficial(Provider):
         if isinstance(custom_extra_body, dict):
             extra_body.update(custom_extra_body)
 
-        model = payloads.get("model", "").lower()
-
         completion = await self.client.chat.completions.create(
             **payloads,
             stream=False,
@@ -269,6 +269,17 @@ class ProviderOpenAIOfficial(Provider):
         self,
         payloads: dict,
         tools: ToolSet | None,
+    ) -> AsyncGenerator[LLMResponse, None]:
+        async for attempt in get_model_request_async_retrying():
+            with attempt:
+                async for response in self._query_stream_once(payloads, tools):
+                    yield response
+                return
+
+    async def _query_stream_once(
+        self,
+        payloads: dict,
+        tools: ToolSet | None,
     ) -> AsyncGenerator[LLMResponse, None]:
         """流式查询API，逐步返回结果"""
         if tools:
@@ -716,7 +727,7 @@ class ProviderOpenAIOfficial(Provider):
         extra_user_content_parts=None,
         **kwargs,
     ) -> LLMResponse:
-        payloads, context_query = await self._prepare_chat_payload(
+        payloads, _ = await self._prepare_chat_payload(
             prompt,
             image_urls,
             contexts,
@@ -728,47 +739,9 @@ class ProviderOpenAIOfficial(Provider):
         )
 
         llm_response = None
-        max_retries = 10
-        available_api_keys = self.api_keys.copy()
-        chosen_key = random.choice(available_api_keys)
-        image_fallback_used = False
-
-        last_exception = None
-        retry_cnt = 0
-        for retry_cnt in range(max_retries):
-            try:
-                self.client.api_key = chosen_key
-                llm_response = await self._query(payloads, func_tool)
-                break
-            except Exception as e:
-                last_exception = e
-                (
-                    success,
-                    chosen_key,
-                    available_api_keys,
-                    payloads,
-                    context_query,
-                    func_tool,
-                    image_fallback_used,
-                ) = await self._handle_api_error(
-                    e,
-                    payloads,
-                    context_query,
-                    func_tool,
-                    chosen_key,
-                    available_api_keys,
-                    retry_cnt,
-                    max_retries,
-                    image_fallback_used=image_fallback_used,
-                )
-                if success:
-                    break
-
-        if retry_cnt == max_retries - 1 or llm_response is None:
-            logger.error(f"API 调用失败，重试 {max_retries} 次仍然失败。")
-            if last_exception is None:
-                raise Exception("未知错误")
-            raise last_exception
+        if self.api_keys:
+            self.client.api_key = random.choice(self.api_keys)
+        llm_response = await self._query(payloads, func_tool)
         return llm_response
 
     async def text_chat_stream(
@@ -784,7 +757,7 @@ class ProviderOpenAIOfficial(Provider):
         **kwargs,
     ) -> AsyncGenerator[LLMResponse, None]:
         """流式对话，与服务商交互并逐步返回结果"""
-        payloads, context_query = await self._prepare_chat_payload(
+        payloads, _ = await self._prepare_chat_payload(
             prompt,
             image_urls,
             contexts,
@@ -794,48 +767,10 @@ class ProviderOpenAIOfficial(Provider):
             **kwargs,
         )
 
-        max_retries = 10
-        available_api_keys = self.api_keys.copy()
-        chosen_key = random.choice(available_api_keys)
-        image_fallback_used = False
-
-        last_exception = None
-        retry_cnt = 0
-        for retry_cnt in range(max_retries):
-            try:
-                self.client.api_key = chosen_key
-                async for response in self._query_stream(payloads, func_tool):
-                    yield response
-                break
-            except Exception as e:
-                last_exception = e
-                (
-                    success,
-                    chosen_key,
-                    available_api_keys,
-                    payloads,
-                    context_query,
-                    func_tool,
-                    image_fallback_used,
-                ) = await self._handle_api_error(
-                    e,
-                    payloads,
-                    context_query,
-                    func_tool,
-                    chosen_key,
-                    available_api_keys,
-                    retry_cnt,
-                    max_retries,
-                    image_fallback_used=image_fallback_used,
-                )
-                if success:
-                    break
-
-        if retry_cnt == max_retries - 1:
-            logger.error(f"API 调用失败，重试 {max_retries} 次仍然失败。")
-            if last_exception is None:
-                raise Exception("未知错误")
-            raise last_exception
+        if self.api_keys:
+            self.client.api_key = random.choice(self.api_keys)
+        async for response in self._query_stream(payloads, func_tool):
+            yield response
 
     async def _remove_image_from_context(self, contexts: list):
         """从上下文中删除所有带有 image 的记录"""

astrbot/core/star/star_manager.py

@@ -513,16 +513,6 @@ class PluginManager:
                         )
                     logger.info(metadata)
                     metadata.config = plugin_config
-                    p_name = (metadata.name or "unknown").lower().replace("/", "_")
-                    p_author = (metadata.author or "unknown").lower().replace("/", "_")
-                    plugin_id = f"{p_author}/{p_name}"
-
-                    # 在实例化前注入类属性，保证插件 __init__ 可读取这些值
-                    if metadata.star_cls_type:
-                        setattr(metadata.star_cls_type, "name", p_name)
-                        setattr(metadata.star_cls_type, "author", p_author)
-                        setattr(metadata.star_cls_type, "plugin_id", plugin_id)
-
                     if path not in inactivated_plugins:
                         # 只有没有禁用插件时才实例化插件类
                         if plugin_config and metadata.star_cls_type:
@@ -540,10 +530,17 @@ class PluginManager:
                                 context=self.context,
                             )
 
-                        if metadata.star_cls:
-                            setattr(metadata.star_cls, "name", p_name)
-                            setattr(metadata.star_cls, "author", p_author)
-                            setattr(metadata.star_cls, "plugin_id", plugin_id)
+                        p_name = (metadata.name or "unknown").lower().replace("/", "_")
+                        p_author = (
+                            (metadata.author or "unknown").lower().replace("/", "_")
+                        )
+                        setattr(metadata.star_cls, "name", p_name)
+                        setattr(metadata.star_cls, "author", p_author)
+                        setattr(
+                            metadata.star_cls,
+                            "plugin_id",
+                            f"{p_author}/{p_name}",
+                        )
                     else:
                         logger.info(f"插件 {metadata.name} 已被禁用。")
 

astrbot/core/updator.py

@@ -148,8 +148,8 @@ class AstrBotUpdator(RepoZipUpdator):
         update_data = await self.fetch_release_info(self.ASTRBOT_RELEASE_API, latest)
         file_url = None
 
-        if os.environ.get("ASTRBOT_CLI") or os.environ.get("ASTRBOT_LAUNCHER"):
-            raise Exception("不支持更新此方式启动的AstrBot")  # 避免版本管理混乱
+        if os.environ.get("ASTRBOT_CLI"):
+            raise Exception("不支持更新CLI启动的AstrBot")  # 避免版本管理混乱
 
         if latest:
             latest_version = update_data[0]["tag_name"]

changelogs/v4.17.3.md

@@ -1,27 +0,0 @@
-## What's Changed
-
-### 修复
-- ‼️ 修复 Python 3.14 环境下 `'Plain' object has no attribute 'text'` 报错问题 ([#5154](https://github.com/AstrBotDevs/AstrBot/issues/5154))。
-- ‼️ 修复插件元数据处理流程：在实例化前注入必要属性，避免初始化阶段元数据缺失 ([#5155](https://github.com/AstrBotDevs/AstrBot/issues/5155))。
-- 修复桌面端后端构建中 AstrBot 内置插件运行时依赖未打包的问题 ([#5146](https://github.com/AstrBotDevs/AstrBot/issues/5146))。
-- 修复通过 AstrBot Launcher 启动时仍被检测并触发更新的问题。
-
-### 优化
-
-- Webchat 下，使用 `astrbot_execute_ipython` 工具如果返回了图片，会自动将图片发送到聊天中。
-
-### 其他
-- 执行 `ruff format` 代码格式整理。
-
-## What's Changed (EN)
-
-### Fixes
-- ‼️ Fixed plugin metadata handling by injecting required attributes before instantiation to avoid missing metadata during initialization ([#5155](https://github.com/AstrBotDevs/AstrBot/issues/5155)).
-- ‼️ Fixed `'Plain' object has no attribute 'text'` error when using Python 3.14 ([#5154](https://github.com/AstrBotDevs/AstrBot/issues/5154)).
-- Fixed missing runtime dependencies for built-in plugins in desktop backend builds ([#5146](https://github.com/AstrBotDevs/AstrBot/issues/5146)).
-- Fixed update checks being triggered when AstrBot is launched via AstrBot Launcher.
-
-### Improvements
-- In Webchat, when using the `astrbot_execute_ipython` tool, if an image is returned, it will automatically be sent to the chat.
-### Others
-- Applied `ruff format` code formatting.

dashboard/src/components/folder/BaseFolderItemSelector.vue

@@ -14,13 +14,8 @@
         </div>
 
         <!-- 选择对话框 -->
-        <v-dialog
-            v-model="dialog"
-            :max-width="$vuetify.display.smAndDown ? undefined : '1000px'"
-            :min-width="$vuetify.display.smAndDown ? undefined : '800px'"
-            scrollable
-        >
-            <v-card class="selector-dialog-card" :class="{ 'selector-dialog-card-mobile': $vuetify.display.smAndDown }">
+        <v-dialog v-model="dialog" max-width="1000px" min-width="800px">
+            <v-card class="selector-dialog-card">
                 <v-card-title class="dialog-title d-flex align-center py-4 px-5">
                     <v-icon class="mr-3" color="primary">mdi-account-circle</v-icon>
                     <span>{{ labels.dialogTitle || '选择项目' }}</span>
@@ -28,7 +23,7 @@
 
                 <v-divider />
 
-                <v-card-text class="selector-dialog-content pa-0">
+                <v-card-text class="pa-0" style="height: 600px; max-height: 80vh; overflow: hidden;">
                     <div class="selector-layout">
                         <!-- 左侧文件夹树 -->
                         <div class="folder-sidebar">
@@ -151,7 +146,7 @@
                     </div>
                 </v-card-text>
 
-                <v-card-actions class="selector-dialog-actions pa-4">
+                <v-card-actions class="pa-4">
                     <v-btn v-if="showCreateButton" variant="text" color="primary" prepend-icon="mdi-plus"
                         @click="$emit('create')">
                         {{ labels.createButton || '新建' }}
@@ -411,12 +406,6 @@ export default defineComponent({
     overflow: hidden;
 }
 
-.selector-dialog-content {
-    height: 600px;
-    max-height: 80vh;
-    overflow: hidden;
-}
-
 .dialog-title {
     font-size: 1.25rem;
     font-weight: 500;
@@ -529,44 +518,21 @@ export default defineComponent({
 }
 
 @media (max-width: 600px) {
-    .selector-dialog-card-mobile {
-        border-radius: 0;
-    }
-
-    .selector-dialog-content {
-        height: calc(100vh - 132px);
-        max-height: none;
-    }
-
-    .dialog-title {
-        font-size: 1.05rem;
-        padding: 12px 16px !important;
-    }
-
-    .selector-dialog-actions {
-        padding: 12px 16px !important;
-        gap: 8px;
-    }
-
-    .selector-dialog-actions .v-btn {
-        min-width: 0;
-    }
-
     .selector-layout {
         flex-direction: column;
-        height: 100%;
-        max-height: none;
+        height: auto;
+        max-height: 500px;
     }
 
     .folder-sidebar {
         width: 100%;
         border-right: none;
         border-bottom: 1px solid rgba(var(--v-border-color), var(--v-border-opacity));
-        max-height: 35vh;
+        max-height: 150px;
     }
 
     .items-list {
-        max-height: none;
+        max-height: 300px;
     }
 }
 </style>

dashboard/src/components/provider/ProviderSourcesPanel.vue

@@ -4,7 +4,7 @@
       <div class="d-flex align-center ga-2">
         <h3 class="mb-0">{{ tm('providerSources.title') }}</h3>
       </div>
-      <StyledMenu>
+      <v-menu>
         <template #activator="{ props }">
           <v-btn
             v-bind="props"
@@ -17,61 +17,19 @@
             {{ tm('providerSources.add') }}
           </v-btn>
         </template>
-        <v-list-item
-          v-for="sourceType in availableSourceTypes"
-          :key="sourceType.value"
-          class="styled-menu-item"
-          @click="emitAddSource(sourceType.value)"
-        >
-          <template #prepend>
-            <v-avatar size="18" rounded="0" class="me-2">
-              <v-img v-if="sourceType.icon" :src="sourceType.icon" alt="provider icon" cover></v-img>
-              <v-icon v-else size="16">mdi-shape-outline</v-icon>
-            </v-avatar>
-          </template>
-          <v-list-item-title>{{ sourceType.label }}</v-list-item-title>
-        </v-list-item>
-      </StyledMenu>
+        <v-list density="compact">
+          <v-list-item
+            v-for="sourceType in availableSourceTypes"
+            :key="sourceType.value"
+            @click="emitAddSource(sourceType.value)"
+          >
+            <v-list-item-title>{{ sourceType.label }}</v-list-item-title>
+          </v-list-item>
+        </v-list>
+      </v-menu>
     </div>
 
-    <div v-if="isMobile && displayedProviderSources.length > 0" class="px-4 pb-3">
-      <div class="d-flex align-center ga-2">
-        <v-select
-          :model-value="selectedId"
-          :items="mobileSourceItems"
-          item-title="label"
-          item-value="value"
-          :label="tm('providerSources.selectCreated')"
-          variant="solo-filled"
-          density="comfortable"
-          flat
-          hide-details
-          class="mobile-source-select"
-          @update:model-value="onMobileSourceChange"
-        >
-          <template #item="{ props: itemProps, item }">
-            <v-list-item v-bind="itemProps">
-              <template #prepend>
-                <v-avatar size="18" rounded="0" class="me-2">
-                  <v-img v-if="item.raw.icon" :src="item.raw.icon" alt="provider icon" cover></v-img>
-                  <v-icon v-else size="16">mdi-shape-outline</v-icon>
-                </v-avatar>
-              </template>
-            </v-list-item>
-          </template>
-        </v-select>
-        <v-btn
-          v-if="selectedProviderSource"
-          icon="mdi-delete"
-          variant="text"
-          size="small"
-          color="error"
-          @click.stop="emitDeleteSource(selectedProviderSource)"
-        ></v-btn>
-      </div>
-    </div>
-
-    <div v-else-if="displayedProviderSources.length > 0">
+    <div v-if="displayedProviderSources.length > 0">
       <v-list class="provider-source-list" nav density="compact" lines="two">
         <v-list-item
           v-for="source in displayedProviderSources"
@@ -88,7 +46,7 @@
               <v-icon v-else size="32">mdi-creation</v-icon>
             </v-avatar>
           </template>
-          <v-list-item-title class="font-weight-bold mb-1" style="font-family: Arial, Helvetica, sans-serif; font-size: 16px;">{{ getSourceDisplayName(source) }}</v-list-item-title>
+          <v-list-item-title class="font-weight-bold">{{ getSourceDisplayName(source) }}</v-list-item-title>
           <v-list-item-subtitle class="text-truncate">{{ source.api_base || 'N/A' }}</v-list-item-subtitle>
           <template #append>
             <div class="d-flex align-center ga-1">
@@ -114,8 +72,6 @@
 
 <script setup>
 import { computed } from 'vue'
-import { useDisplay } from 'vuetify'
-import StyledMenu from '@/components/shared/StyledMenu.vue'
 
 const props = defineProps({
   displayedProviderSources: {
@@ -150,30 +106,13 @@ const emit = defineEmits([
   'delete-provider-source'
 ])
 
-const { smAndDown } = useDisplay()
 const selectedId = computed(() => props.selectedProviderSource?.id || null)
-const isMobile = computed(() => smAndDown.value)
-const mobileSourceItems = computed(() =>
-  (props.displayedProviderSources || []).map((source) => ({
-    value: source.id,
-    label: props.getSourceDisplayName(source),
-    icon: props.resolveSourceIcon(source),
-    source
-  }))
-)
 
 const isActive = (source) => {
   if (source.isPlaceholder) return false
   return selectedId.value !== null && selectedId.value === source.id
 }
 
-const onMobileSourceChange = (sourceId) => {
-  const matched = mobileSourceItems.value.find((item) => item.value === sourceId)
-  if (matched?.source) {
-    emitSelectSource(matched.source)
-  }
-}
-
 const emitAddSource = (type) => emit('add-provider-source', type)
 const emitSelectSource = (source) => emit('select-provider-source', source)
 const emitDeleteSource = (source) => emit('delete-provider-source', source)

dashboard/src/components/shared/PersonaForm.vue

@@ -1,15 +1,11 @@
 <template>
-    <v-dialog
-        v-model="showDialog"
-        :max-width="$vuetify.display.smAndDown ? undefined : '760px'"
-        scrollable
-    >
-        <v-card class="persona-form-card" :class="{ 'persona-form-card-mobile': $vuetify.display.smAndDown }">
-            <v-card-title class="persona-form-title text-h2">
+    <v-dialog v-model="showDialog" max-width="500px">
+        <v-card>
+            <v-card-title class="text-h2">
                 {{ editingPersona ? tm('dialog.edit.title') : tm('dialog.create.title') }}
             </v-card-title>
 
-            <v-card-text class="persona-form-content">
+            <v-card-text>
                 <!-- 创建位置提示 -->
                 <v-alert
                     v-if="!editingPersona"
@@ -55,7 +51,7 @@
                                     </v-radio>
                                 </v-radio-group>
 
-                                <div v-if="toolSelectValue === '1'" class="mt-3 selected-config-area">
+                                <div v-if="toolSelectValue === '1'" class="mt-3 ml-8">
 
                                     <!-- 工具搜索 -->
                                     <v-text-field v-model="toolSearch" :label="tm('form.searchTools')"
@@ -182,7 +178,7 @@
                                     <v-radio :label="tm('form.skillsSelectSpecific')" value="1"></v-radio>
                                 </v-radio-group>
 
-                                <div v-if="skillSelectValue === '1'" class="mt-3 selected-config-area">
+                                <div v-if="skillSelectValue === '1'" class="mt-3 ml-8">
                                     <v-text-field v-model="skillSearch" :label="tm('form.searchSkills')"
                                         prepend-inner-icon="mdi-magnify" variant="outlined" density="compact"
                                         hide-details clearable class="mb-3" />
@@ -292,7 +288,7 @@
                 </v-form>
             </v-card-text>
 
-            <v-card-actions class="persona-form-actions">
+            <v-card-actions>
                 <v-btn v-if="editingPersona" color="error" variant="text" @click="deletePersona">
                     {{ tm('buttons.delete') }}
                 </v-btn>
@@ -803,32 +799,6 @@ export default {
 </script>
 
 <style scoped>
-.persona-form-card {
-    border-radius: 12px;
-    overflow: hidden;
-}
-
-.persona-form-content {
-    max-height: min(78vh, 760px);
-    overflow-y: auto;
-}
-
-.persona-form-title {
-    line-height: 1.3;
-}
-
-.persona-form-actions {
-    position: sticky;
-    bottom: 0;
-    z-index: 2;
-    background: rgb(var(--v-theme-surface));
-    border-top: 1px solid rgba(var(--v-border-color), var(--v-border-opacity));
-}
-
-.selected-config-area {
-    margin-left: 32px;
-}
-
 .tools-selection {
     max-height: 300px;
     overflow-y: auto;
@@ -842,38 +812,4 @@ export default {
 .v-virtual-scroll {
     padding-bottom: 16px;
 }
-
-@media (max-width: 600px) {
-    .persona-form-card-mobile {
-        border-radius: 0;
-    }
-
-    .persona-form-content {
-        max-height: calc(100vh - 128px);
-        padding: 16px !important;
-    }
-
-    .persona-form-title {
-        font-size: 1.15rem !important;
-        padding: 12px 16px !important;
-    }
-
-    .selected-config-area {
-        margin-left: 0;
-    }
-
-    .tools-selection,
-    .skills-selection {
-        max-height: 38vh;
-    }
-
-    .persona-form-actions {
-        padding: 12px 16px !important;
-        gap: 8px;
-    }
-
-    .persona-form-actions .v-btn {
-        min-width: 0;
-    }
-}
 </style>

dashboard/src/composables/useProviderSources.ts

@@ -81,14 +81,10 @@ export function useProviderSources(options: UseProviderSourcesOptions) {
       return []
     }
 
-    const types: Array<{ value: string; label: string; icon: string }> = []
+    const types: Array<{ value: string; label: string }> = []
     for (const [templateName, template] of Object.entries(providerTemplates.value)) {
       if (template.provider_type === selectedProviderType.value) {
-        types.push({
-          value: templateName,
-          label: templateName,
-          icon: getProviderIcon(template.provider)
-        })
+        types.push({ value: templateName, label: templateName })
       }
     }
 

dashboard/src/i18n/locales/en-US/features/provider.json

@@ -94,7 +94,6 @@
     "add": "Add",
     "empty": "No provider sources",
     "selectHint": "Please select a provider source",
-    "selectCreated": "Select created provider source",
     "save": "Save Configuration",
     "saveAndFetchModels": "Save and Fetch Models",
     "fetchModels": "Fetch Model List",
@@ -147,4 +146,4 @@
       "modelId": "Model ID"
     }
   }
-}
+}

dashboard/src/i18n/locales/zh-CN/features/provider.json

@@ -95,7 +95,6 @@
     "add": "新增",
     "empty": "暂无提供商源",
     "selectHint": "请选择一个提供商源",
-    "selectCreated": "选择已创建的提供商源",
     "save": "保存配置",
     "saveAndFetchModels": "保存并获取模型",
     "fetchModels": "获取模型列表",
@@ -148,4 +147,4 @@
       "modelId": "模型 ID"
     }
   }
-}
+}

dashboard/src/utils/providerUtils.js

@@ -18,7 +18,6 @@ export function getProviderIcon(type) {
     'deepseek': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/deepseek.svg',
     'modelscope': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/modelscope.svg',
     'zhipu': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/zhipu.svg',
-    'nvidia': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/nvidia-color.svg',
     'siliconflow': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/siliconcloud.svg',
     'moonshot': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/kimi.svg',
     'ppio': 'https://registry.npmmirror.com/@lobehub/icons-static-svg/latest/files/icons/ppio.svg',

desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astrbot-desktop",
-  "version": "4.17.3",
+  "version": "4.17.2",
   "description": "AstrBot desktop wrapper",
   "private": true,
   "main": "main.js",

desktop/scripts/build-backend.mjs

@@ -35,16 +35,6 @@ const args = [
   'aiosqlite',
   '--collect-all',
   'pip',
-  '--collect-all',
-  'bs4',
-  '--collect-all',
-  'readability',
-  '--collect-all',
-  'lxml',
-  '--collect-all',
-  'lxml_html_clean',
-  '--collect-all',
-  'rfc3987_syntax',
   '--collect-submodules',
   'astrbot.api',
   '--collect-submodules',

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "AstrBot"
-version = "4.17.3"
+version = "4.17.2"
 description = "Easy-to-use multi-platform LLM chatbot and development framework"
 readme = "README.md"
 requires-python = ">=3.12"