Merge branch 'master' of https://github.com/PyuraMazo/AstrBot

Author: PyuraMazo

.dockerignore

@@ -17,7 +17,6 @@ ENV/
 .conda/
 dashboard/
 data/
-changelogs/
 tests/
 .ruff_cache/
 .astrbot

astrbot/builtin_stars/web_searcher/main.py

@@ -70,7 +70,7 @@ async def _get_from_url(self, url: str) -> str:
         header = HEADERS
         header.update({"User-Agent": random.choice(USER_AGENTS)})
         async with aiohttp.ClientSession(trust_env=True) as session:
-            async with session.get(url, headers=header, timeout=6) as response:
+            async with session.get(url, headers=header) as response:
                 html = await response.text(encoding="utf-8")
                 doc = Document(html)
                 ret = doc.summary(html_partial=True)
@@ -151,7 +151,6 @@ async def _web_search_tavily(
                 url,
                 json=payload,
                 headers=header,
-                timeout=6,
             ) as response:
                 if response.status != 200:
                     reason = await response.text()
@@ -183,7 +182,6 @@ async def _extract_tavily(self, cfg: AstrBotConfig, payload: dict) -> list[dict]
                 url,
                 json=payload,
                 headers=header,
-                timeout=6,
             ) as response:
                 if response.status != 200:
                     reason = await response.text()
@@ -265,7 +263,7 @@ async def ensure_baidu_ai_search_mcp(self, umo: str | None = None) -> None:
                 "transport": "sse",
                 "url": f"http://appbuilder.baidu.com/v2/ai_search/mcp/sse?api_key={key}",
                 "headers": {},
-                "timeout": 30,
+                "timeout": 600,
             },
         )
         self.baidu_initialized = True

astrbot/cli/__init__.py

@@ -1 +1 @@
-__version__ = "4.18.0"
+__version__ = "4.18.1"

astrbot/core/config/default.py

@@ -5,7 +5,7 @@
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.18.0"
+VERSION = "4.18.1"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [

astrbot/core/platform/sources/qqofficial/qqofficial_message_event.py

@@ -25,6 +25,26 @@
 from astrbot.core.utils.tencent_record_helper import wav_to_tencent_silk
 
 
+def _patch_qq_botpy_formdata() -> None:
+    """Patch qq-botpy for aiohttp>=3.12 compatibility.
+
+    qq-botpy 1.2.1 defines botpy.http._FormData._gen_form_data() and expects
+    aiohttp.FormData to have a private flag named _is_processed, which is no
+    longer present in newer aiohttp versions.
+    """
+
+    try:
+        from botpy.http import _FormData  # type: ignore
+
+        if not hasattr(_FormData, "_is_processed"):
+            setattr(_FormData, "_is_processed", False)
+    except Exception:
+        logger.debug("[QQOfficial] Skip botpy FormData patch.")
+
+
+_patch_qq_botpy_formdata()
+
+
 class QQOfficialMessageEvent(AstrMessageEvent):
     MARKDOWN_NOT_ALLOWED_ERROR = "不允许发送原生 markdown"
 

changelogs/v4.18.1.md

@@ -0,0 +1,17 @@
+## What's Changed
+
+### 修复
+- fix: 修复插件市场出现插件显示为空白的 bug；纠正已安装插件卡片的排版，统一大小 ([#5309](https://github.com/AstrBotDevs/AstrBot/issues/5309))
+
+### 新增
+- SubAgent 支持后台执行模式配置：当 `background: true` 时，子代理将在后台运行，主对话无需等待子代理完成即可继续进行。当子代理完成后，会收到通知。适用于长时间运行或用户不需要立即结果的任务。([#5081](https://github.com/AstrBotDevs/AstrBot/issues/5081))
+- 配置 Schema 新增密码渲染支持：`string` 与 `text` 类型可通过 `password: true`（或 `render_type: "password"`）在 WebUI 中按密码输入方式显示。
+
+## What's Changed (EN)
+
+### Fixes
+- fix: Fixed a bug where the plugin marketplace would show blank cards for plugins; corrected the layout of installed plugin cards for consistent sizing ([#5309](https://github.com/AstrBotDevs/AstrBot/issues/5309))
+
+### New Features
+- Added background execution mode support for sub-agents: when `background: true` is set, the sub-agent will run in the background, allowing the main conversation to continue without waiting for the sub-agent to finish. You will be notified when the sub-agent completes. This is suitable for long-running tasks or when the user does not need immediate results. ([#5081](https://github.com/AstrBotDevs/AstrBot/issues/5081))
+- Added password rendering support in config schema: `string` and `text` fields can be rendered as password inputs in WebUI with `password: true` (or `render_type: "password"`).

pyproject.toml

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