Merge branch 'AstrBotDevs:master' into master

Author: elecvoid243

astrbot/core/config/default.py

@@ -111,6 +111,7 @@
         "websearch_bocha_key": [],
         "websearch_brave_key": [],
         "websearch_baidu_app_builder_key": "",
+        "websearch_firecrawl_key": [],
         "web_search_link": False,
         "display_reasoning_text": False,
         "identifier": False,
@@ -312,6 +313,7 @@
     "kb_final_top_k": 5,  # 知识库检索最终返回结果数量
     "kb_agentic_mode": False,
     "disable_builtin_commands": False,
+    "disable_metrics": False,
 }
 
 
@@ -2945,6 +2947,11 @@
             "callback_api_base": {
                 "type": "string",
             },
+            "disable_metrics": {
+                "description": "禁用匿名使用统计",
+                "type": "bool",
+                "hint": "禁用后，AstrBot 将不再上传匿名使用统计数据。",
+            },
             "log_level": {
                 "type": "string",
                 "options": ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
@@ -3264,6 +3271,7 @@
                         "hint": "参考：https://console.bce.baidu.com/iam/#/iam/apikey/list",
                         "condition": {
                             "provider_settings.websearch_provider": "baidu_ai_search",
+                            "provider_settings.web_search": True,
                         },
                     },
                     "provider_settings.web_search_link": {

astrbot/core/persona_mgr.py

@@ -239,8 +239,8 @@ async def update_folder(
         self,
         folder_id: str,
         name: str | None = None,
-        parent_id: str | None = None,
-        description: str | None = None,
+        parent_id: str | None | object = NOT_GIVEN,
+        description: str | None | object = NOT_GIVEN,
         sort_order: int | None = None,
     ) -> PersonaFolder | None:
         """更新文件夹信息"""

astrbot/core/utils/metrics.py

@@ -23,6 +23,18 @@ class Metric:
     _lock: asyncio.Lock | None = None
     _lock_loop: asyncio.AbstractEventLoop | None = None
 
+    @staticmethod
+    def _is_disabled() -> bool:
+        """检查是否禁用指标上传（配置或环境变量）"""
+        if os.environ.get("ASTRBOT_DISABLE_METRICS", "0") == "1":
+            return True
+        try:
+            from astrbot.core import astrbot_config
+
+            return astrbot_config.get("disable_metrics", False)
+        except (ImportError, AttributeError, KeyError):
+            return False
+
     @staticmethod
     def get_installation_id():
         """获取或创建一个唯一的安装ID"""
@@ -173,7 +185,7 @@ async def flush() -> None:
 
     @staticmethod
     async def _post_metrics(metrics_data: dict[str, Any]) -> None:
-        if os.environ.get("ASTRBOT_DISABLE_METRICS", "0") == "1":
+        if Metric._is_disabled():
             return
 
         base_url = "https://tickstats.soulter.top/api/metric/90a6c2a1"
@@ -204,7 +216,7 @@ async def upload(**kwargs) -> None:
 
         Powered by TickStats.
         """
-        if os.environ.get("ASTRBOT_DISABLE_METRICS", "0") == "1":
+        if Metric._is_disabled():
             return
 
         await Metric._save_platform_stats(kwargs)

astrbot/dashboard/routes/persona.py

@@ -5,6 +5,7 @@
 from astrbot.core import logger
 from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
 from astrbot.core.db import BaseDatabase
+from astrbot.core.sentinels import NOT_GIVEN
 
 from .route import Response, Route, RouteContext
 
@@ -415,8 +416,10 @@ async def update_folder(self):
             data = await request.get_json()
             folder_id = data.get("folder_id")
             name = data.get("name")
-            parent_id = data.get("parent_id")
-            description = data.get("description")
+            parent_id = data.get("parent_id") if "parent_id" in data else NOT_GIVEN
+            description = (
+                data.get("description") if "description" in data else NOT_GIVEN
+            )
             sort_order = data.get("sort_order")
 
             if not folder_id:

dashboard/src/i18n/locales/en-US/features/config-metadata.json

@@ -1083,6 +1083,10 @@
         "description": "Externally Accessible Callback API Address",
         "hint": "External services may access AstrBot's backend through callback links generated by AstrBot (such as file download links). Since AstrBot cannot automatically determine the externally accessible host address in the deployment environment, this configuration item is needed to explicitly specify how external services should access AstrBot's address. Examples: [http://localhost:6185](http://localhost:6185), [https://example.com](https://example.com), etc."
       },
+      "disable_metrics": {
+        "description": "Disable Anonymous Usage Statistics",
+        "hint": "When disabled, AstrBot will not upload anonymous usage statistics."
+      },
       "dashboard": {
         "ssl": {
           "enable": {

dashboard/src/i18n/locales/ru-RU/features/config-metadata.json

@@ -1084,6 +1084,10 @@
                 "description": "Внешний адрес для Callback API",
                 "hint": "Используется для сервисов, требующих обратных выливов (например, в песочнице)."
             },
+            "disable_metrics": {
+                "description": "Отключить анонимную статистику",
+                "hint": "После отключения AstrBot не будет отправлять анонимные данные об использовании."
+            },
             "dashboard": {
                 "ssl": {
                     "enable": {

dashboard/src/i18n/locales/zh-CN/features/config-metadata.json

@@ -1085,6 +1085,10 @@
         "description": "对外可达的回调接口地址",
         "hint": "外部服务可能会通过 AstrBot 生成的回调链接(如文件下载链接)访问 AstrBot 后端。由于 AstrBot 无法自动判断部署环境中对外可达的主机地址(host),因此需要通过此配置项显式指定外部服务如何访问 AstrBot 的地址。如 [http://localhost:6185](http://localhost:6185),[https://example.com](https://example.com) 等。"
       },
+      "disable_metrics": {
+        "description": "禁用匿名使用统计",
+        "hint": "禁用后，AstrBot 将不再上传匿名使用统计数据。"
+      },
       "dashboard": {
         "ssl": {
           "enable": {

dashboard/src/views/ConsolePage.vue

@@ -63,7 +63,7 @@ export default {
   },
   data() {
     return {
-      autoScrollEnabled: true,
+      autoScrollEnabled: localStorage.getItem('console_auto_scroll') !== 'false',
       pipDialog: false,
       pipInstallPayload: {
         package: '',
@@ -75,6 +75,7 @@ export default {
   },
   watch: {
     autoScrollEnabled(val) {
+      localStorage.setItem('console_auto_scroll', val);
       if (this.$refs.consoleDisplayer) {
         this.$refs.consoleDisplayer.autoScroll = val;
       }