perf: notice

fix: 修复某些请求不能正确应用代理的问题

README.md

@@ -126,6 +126,13 @@ _✨ 内置 Web Chat，在线与机器人交互 ✨_
 
 </div>
 
+## ⭐ Star History
+
+> [!TIP] 
+> 如果本项目对您的生活 / 工作产生了帮助，或者您关注本项目的未来发展，请给项目 Star，这是我维护这个开源项目的动力 <3
+
+[![Star History Chart](https://api.star-history.com/svg?repos=soulter/astrbot&type=Date)](https://star-history.com/#soulter/astrbot&Date)
+
 
 <!-- ## ✨ ATRI [Beta 测试]
 

astrbot/core/config/default.py

@@ -2,7 +2,7 @@
 如需修改配置，请在 `data/cmd_config.json` 中修改或者在管理面板中可视化修改。
 """
 
-VERSION = "3.4.9"
+VERSION = "3.4.11"
 DB_PATH = "data/data_v3.db"
 
 # 默认配置
@@ -285,7 +285,7 @@ CONFIG_METADATA_2 = {
                         "type": "openai_chat_completion",
                         "enable": True,
                         "key": ["ollama"],  # ollama 的 key 默认是 ollama
-                        "api_base": "http://localhost:11434",
+                        "api_base": "http://localhost:11434/v1",
                         "model_config": {
                             "model": "llama3.1-8b",
                         },
@@ -396,7 +396,8 @@ CONFIG_METADATA_2 = {
                     "api_base": {
                         "description": "API Base URL",
                         "type": "string",
-                        "hint": "API Base URL 请在在模型提供商处获得。支持 Ollama 开放的 API 地址。如果您确认填写正确但是使用时出现了 404 异常，可以尝试在地址末尾加上 `/v1`。",
+                        "hint": "API Base URL 请在在模型提供商处获得。如使用时出现了 404 报错，可以尝试在地址末尾加上 `/v1`。",
+                        "obvious_hint": True,
                     },
                     "base_model_path": {
                         "description": "基座模型路径",

astrbot/core/core_lifecycle.py

@@ -1,3 +1,4 @@
+import traceback
 import asyncio
 import time
 import threading
@@ -81,12 +82,30 @@ class AstrBotCoreLifecycle:
         for task in self.star_context._register_tasks:
             extra_tasks.append(asyncio.create_task(task, name=task.__name__))
         
-        self.curr_tasks = [event_bus_task, *platform_tasks, *extra_tasks]
+        # self.curr_tasks = [event_bus_task, *platform_tasks, *extra_tasks]
+        
+        tasks_ = [event_bus_task, *platform_tasks, *extra_tasks]
+        for task in tasks_:
+            self.curr_tasks.append(asyncio.create_task(self._task_wrapper(task), name=task.get_name()))
+        
         self.start_time = int(time.time())
+        
+    async def _task_wrapper(self, task: asyncio.Task):
+        try:
+            await task
+        except asyncio.CancelledError:
+            pass
+        except Exception as e:
+            
+            logger.error(f"------- 任务 {task.get_name()} 发生错误: {e}")
+            for line in traceback.format_exc().split("\n"):
+                logger.error(f"|    {line}")
+            logger.error("-------")
     
     async def start(self):
         self._load()
         logger.info("AstrBot 启动完成。")
+        
         await asyncio.gather(*self.curr_tasks, return_exceptions=True)
         
     async def stop(self):

astrbot/core/pipeline/process_stage/method/llm_request.py

@@ -105,5 +105,5 @@ class LLMRequestSubStage(Stage):
 
         except BaseException as e:
             logger.error(traceback.format_exc())
-            event.set_result(MessageEventResult().message("AstrBot 请求 LLM 资源失败：" + str(e)))
+            event.set_result(MessageEventResult().message(f"AstrBot 请求失败。\n错误类型: {type(e).__name__}\n错误信息: {str(e)}"))
             return

astrbot/core/platform/register.py

@@ -27,6 +27,8 @@ def register_platform_adapter(
                 default_config_tmpl['type'] = adapter_name
             if 'enable' not in default_config_tmpl:
                 default_config_tmpl['enable'] = False
+            if 'id' not in default_config_tmpl:
+                default_config_tmpl['id'] = adapter_name
 
         pm = PlatformMetadata(
             name=adapter_name,

astrbot/core/platform/sources/aiocqhttp/aiocqhttp_message_event.py

@@ -28,7 +28,9 @@ class AiocqhttpMessageEvent(AstrMessageEvent):
                 elif segment.file and segment.file.startswith("http"):
                     image_file_path = await download_image_by_url(segment.file)
                     image_base64 = file_to_base64(image_file_path)
-                d['data']['file'] = image_base64
+                d['data'] = {
+                    'file': image_base64,
+                }
             ret.append(d)
         return ret
 

astrbot/core/platform/sources/gewechat/client.py

@@ -64,7 +64,7 @@ class SimpleGewechatClient():
                 user_id = "" # 发送人 wxid
                 content = d['Content']['string'] # 消息内容
                 user_real_name = d['PushContent'].split(' : ')[0] # 真实昵称
-                user_real_name.replace('在群聊中@了你', '') # trick
+                user_real_name = user_real_name.replace('在群聊中@了你', '') # trick
                 abm.self_id = data['Wxid'] # 机器人的 wxid
                 at_me = False
                 if "@chatroom" in from_user_name:
@@ -80,7 +80,8 @@ class SimpleGewechatClient():
                     
                     # at
                     msg_source = d['MsgSource']
-                    if f'<atuserlist><![CDATA[,{abm.self_id}]]>' in msg_source:
+                    if f'<atuserlist><![CDATA[,{abm.self_id}]]>' in msg_source \
+                        or f'<atuserlist><![CDATA[{abm.self_id}]]>' in msg_source:
                         at_me = True
                     
                 else:
@@ -135,7 +136,7 @@ class SimpleGewechatClient():
                 logger.info(f"设置回调结果: {json_blob}")
                 if json_blob['ret'] != 200:
                     raise Exception(f"设置回调失败: {json_blob}")
-                logger.info(f"将在 {callback_url} 上接收 gewechat 下发的消息。")
+                logger.info(f"将在 {callback_url} 上接收 gewechat 下发的消息。如果一直没收到消息请先尝试重启 AstrBot。")
         
     async def start_polling(self):
         
@@ -166,6 +167,21 @@ class SimpleGewechatClient():
             ) as resp:
                 json_blob = await resp.json()
                 return json_blob['data']
+            
+    async def logout(self):
+        if self.appid:
+            online = await self.check_online(self.appid)
+            if online:
+                async with aiohttp.ClientSession() as session:
+                    async with session.post(
+                        f"{self.base_url}/login/logout",
+                        headers=self.headers,
+                        json={
+                            "appId": self.appid
+                        }
+                    ) as resp:
+                        json_blob = await resp.json()
+                        logger.info(f"登出结果: {json_blob}")
         
     async def login(self):
         if self.token is None:
@@ -228,7 +244,7 @@ class SimpleGewechatClient():
                         logger.warning(f"未知状态: {status}")
             await asyncio.sleep(5)
             
-        if not self.appid and appid:
+        if appid:
             sp.put(f"gewechat-appid-{nickname}", appid)
             self.appid = appid
             logger.info(f"已保存 APPID: {appid}")

astrbot/core/platform/sources/gewechat/gewechat_platform_adapter.py

@@ -68,6 +68,9 @@ class GewechatPlatformAdapter(Platform):
         
         return self._run()
     
+    async def logout(self):
+        await self.client.logout()
+    
     async def _run(self):
         await self.client.login()
         

astrbot/core/provider/register.py

@@ -28,6 +28,8 @@ def register_provider_adapter(
                 default_config_tmpl['type'] = provider_type_name
             if 'enable' not in default_config_tmpl:
                 default_config_tmpl['enable'] = False
+            if 'id' not in default_config_tmpl:
+                default_config_tmpl['id'] = provider_type_name
 
         pm = ProviderMetaData(
             type=provider_type_name,

astrbot/core/provider/sources/gemini_source.py

@@ -18,7 +18,7 @@ class SimpleGoogleGenAIClient():
             self.api_base = api_base[:-1]
         else:
             self.api_base = api_base
-        self.client = aiohttp.ClientSession()
+        self.client = aiohttp.ClientSession(trust_env=True)
         
     async def models_list(self) -> List[str]:
         request_url = f"{self.api_base}/v1beta/models?key={self.api_key}"
@@ -224,15 +224,24 @@ class ProviderGoogleGenAI(Provider):
 
         try:
             llm_response = await self._query(payloads, func_tool)
+            await self.save_history(contexts, new_record, session_id, llm_response)
+            return llm_response
         except Exception as e:
             if "maximum context length" in str(e):
-                logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。")
-                self.pop_record(session_id)
-            logger.warning(traceback.format_exc())
-            
-        await self.save_history(contexts, new_record, session_id, llm_response)
-
-        return llm_response
+                retry_cnt = 10
+                while retry_cnt > 0:
+                    logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。")
+                    try:
+                        self.pop_record(session_id)
+                        llm_response = await self._query(payloads, func_tool)
+                        break
+                    except Exception as e:
+                        if "maximum context length" in str(e):
+                            retry_cnt -= 1
+                        else:
+                            raise e
+            else:
+                raise e
     
     async def save_history(self, contexts: List, new_record: dict, session_id: str, llm_response: LLMResponse):
         if llm_response.role == "assistant" and session_id:

astrbot/core/provider/sources/openai_source.py

@@ -164,15 +164,25 @@ class ProviderOpenAIOfficial(Provider):
 
         try:
             llm_response = await self._query(payloads, func_tool)
+            await self.save_history(contexts, new_record, session_id, llm_response)
+            return llm_response
         except Exception as e:
             if "maximum context length" in str(e):
-                logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。")
-                self.pop_record(session_id)
-            logger.warning(traceback.format_exc())
-            
-        await self.save_history(contexts, new_record, session_id, llm_response)
+                retry_cnt = 10
+                while retry_cnt > 0:
+                    logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。")
+                    try:
+                        self.pop_record(session_id)
+                        llm_response = await self._query(payloads, func_tool)
+                        break
+                    except Exception as e:
+                        if "maximum context length" in str(e):
+                            retry_cnt -= 1
+                        else:
+                            raise e
+            else:
+                raise e
 
-        return llm_response
     
     async def save_history(self, contexts: List, new_record: dict, session_id: str, llm_response: LLMResponse):
         if llm_response.role == "assistant" and session_id:

astrbot/core/provider/sources/zhipu_source.py

@@ -60,15 +60,23 @@ class ProviderZhipu(ProviderOpenAIOfficial):
             "messages": context_query,
             **model_cfgs
         }
-        llm_response = None
         try:
             llm_response = await self._query(payloads, func_tool)
+            await self.save_history(contexts, new_record, session_id, llm_response)
+            return llm_response
         except Exception as e:
             if "maximum context length" in str(e):
-                logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。")
-                self.pop_record(session_id)
-            logger.warning(traceback.format_exc())
-            
-        await self.save_history(contexts, new_record, session_id, llm_response)
-
-        return llm_response
+                retry_cnt = 10
+                while retry_cnt > 0:
+                    logger.warning(f"请求失败：{e}。上下文长度超过限制。尝试弹出最早的记录然后重试。")
+                    try:
+                        self.pop_record(session_id)
+                        llm_response = await self._query(payloads, func_tool)
+                        break
+                    except Exception as e:
+                        if "maximum context length" in str(e):
+                            retry_cnt -= 1
+                        else:
+                            raise e
+            else:
+                raise e

astrbot/core/star/filter/permission.py

@@ -20,6 +20,6 @@ class PermissionTypeFilter(HandlerFilter):
         if self.permission_type == PermissionType.ADMIN:
             if not event.is_admin():
                 event.stop_event()
-                raise ValueError("您没有权限执行此操作。")
+                raise ValueError(f"您 (ID: {event.get_sender_id()}) 没有权限执行此操作。")
 
         return True

astrbot/core/star/filter/platform_adapter_type.py

@@ -8,12 +8,14 @@ class PlatformAdapterType(enum.Flag):
     AIOCQHTTP = enum.auto()
     QQOFFICIAL = enum.auto()
     VCHAT = enum.auto()
-    ALL = AIOCQHTTP | QQOFFICIAL | VCHAT
+    GEWECHAT = enum.auto()
+    ALL = AIOCQHTTP | QQOFFICIAL | VCHAT | GEWECHAT
     
 ADAPTER_NAME_2_TYPE = {
     "aiocqhttp": PlatformAdapterType.AIOCQHTTP,
     "qq_official": PlatformAdapterType.QQOFFICIAL,
-    "vchat": PlatformAdapterType.VCHAT
+    "vchat": PlatformAdapterType.VCHAT,
+    "gewechat": PlatformAdapterType.GEWECHAT
 }
 
 class PlatformAdapterTypeFilter(HandlerFilter):

astrbot/core/updator.py

@@ -11,7 +11,7 @@ class AstrBotUpdator(RepoZipUpdator):
     def __init__(self, repo_mirror: str = "") -> None:
         super().__init__(repo_mirror)
         self.MAIN_PATH = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "../../"))
-        self.ASTRBOT_RELEASE_API = "https://api.github.com/repos/Soulter/AstrBot/releases"
+        self.ASTRBOT_RELEASE_API = "https://api.soulter.top/releases"
 
     def terminate_child_processes(self):
         try:

astrbot/core/utils/io.py

@@ -70,7 +70,7 @@ async def download_image_by_url(url: str, post: bool = False, post_data: dict =
     下载图片, 返回 path
     '''
     try:
-        async with aiohttp.ClientSession() as session:
+        async with aiohttp.ClientSession(trust_env=True) as session:
             if post:
                 async with session.post(url, json=post_data) as resp:
                     if not path:
@@ -91,7 +91,7 @@ async def download_image_by_url(url: str, post: bool = False, post_data: dict =
         # 关闭SSL验证
         ssl_context = ssl.create_default_context()
         ssl_context.set_ciphers('DEFAULT')
-        async with aiohttp.ClientSession(trust_env=False) as session:
+        async with aiohttp.ClientSession() as session:
             if post:
                 async with session.get(url, ssl=ssl_context) as resp:
                     return save_temp_img(await resp.read())
@@ -106,8 +106,8 @@ async def download_file(url: str, path: str, show_progress: bool = False):
     从指定 url 下载文件到指定路径 path
     '''
     try:
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url, timeout=300) as resp:
+        async with aiohttp.ClientSession(trust_env=True) as session:
+            async with session.get(url, timeout=120) as resp:
                 if resp.status != 200:
                     raise Exception(f"下载文件失败: {resp.status}")
                 total_size = int(resp.headers.get('content-length', 0))
@@ -130,8 +130,8 @@ async def download_file(url: str, path: str, show_progress: bool = False):
         # 关闭SSL验证
         ssl_context = ssl.create_default_context()
         ssl_context.set_ciphers('DEFAULT')
-        async with aiohttp.ClientSession(trust_env=False) as session:
-            async with session.get(url, ssl=ssl_context, timeout=300) as resp:
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url, ssl=ssl_context, timeout=120) as resp:
                 total_size = int(resp.headers.get('content-length', 0))
                 downloaded_size = 0
                 start_time = time.time()
@@ -170,6 +170,14 @@ def get_local_ip_addresses():
         s.close()
     return ip
 
+async def get_dashboard_version():
+    if os.path.exists("data/dist"):
+        if os.path.exists("data/dist/assets/version"):
+            with open("data/dist/assets/version", "r") as f:
+                v = f.read().strip()
+                return v
+    return None
+
 async def download_dashboard():
     '''下载管理面板文件'''
     dashboard_release_url = "https://astrbot-registry.soulter.top/download/astrbot-dashboard/latest/dist.zip"

astrbot/core/utils/metrics.py

@@ -30,7 +30,7 @@ class Metric():
             pass
         
         try:
-            async with aiohttp.ClientSession() as session:
+            async with aiohttp.ClientSession(trust_env=True) as session:
                 async with session.post(base_url, json=payload, timeout=3) as response:
                     if response.status != 200:
                         pass

astrbot/core/utils/t2i/local_strategy.py

@@ -83,7 +83,7 @@ class LocalRenderStrategy(RenderStrategy):
                 try:
                     image_url = re.findall(IMAGE_REGEX, line)[0]
                     print(image_url)
-                    async with aiohttp.ClientSession() as session:
+                    async with aiohttp.ClientSession(trust_env=True) as session:
                         async with session.get(image_url) as resp:
                             image_res = Image.open(BytesIO(await resp.read()))
                     images[i] = image_res

astrbot/core/utils/t2i/network_strategy.py

@@ -33,7 +33,7 @@ class NetworkRenderStrategy(RenderStrategy):
             }
         }
         if return_url:
-            async with aiohttp.ClientSession() as session:
+            async with aiohttp.ClientSession(trust_env=True) as session:
                 async with session.post(f"{self.BASE_RENDER_URL}/generate", json=post_data) as resp:
                     ret = await resp.json()
                     return f"{self.BASE_RENDER_URL}/{ret['data']['id']}"

astrbot/core/zip_updator.py

@@ -29,7 +29,7 @@ class RepoZipUpdator():
         返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
         '''
         try:
-            async with aiohttp.ClientSession() as session:
+            async with aiohttp.ClientSession(trust_env=True) as session:
                 async with session.get(url) as response:
                     result = await response.json()
             if not result: 
@@ -111,7 +111,7 @@ class RepoZipUpdator():
         releases = await self.fetch_release_info(url=release_url)
         if not releases:
             # download from the default branch directly. 
-            logger.warning(f"未在仓库 {author}/{repo} 中找到任何发布版本，正在从默认分支下载。")
+            logger.info(f"未在仓库 {author}/{repo} 中找到任何发布版本，正在从默认分支下载。")
             release_url = f"https://github.com/{author}/{repo}/archive/refs/heads/master.zip"
         else:
             release_url = releases[0]['zipball_url']

astrbot/dashboard/routes/plugin.py

@@ -27,7 +27,7 @@ class PluginRoute(Route):
     async def get_online_plugins(self):
         url = "https://soulter.github.io/AstrBot_Plugins_Collection/plugins.json"
         try:
-            async with aiohttp.ClientSession() as session:
+            async with aiohttp.ClientSession(trust_env=True) as session:
                 async with session.get(url) as response:
                     result = await response.json()
             return Response().ok(result).__dict__

astrbot/dashboard/routes/stat.py

@@ -15,7 +15,6 @@ class StatRoute(Route):
         self.routes = {
             '/stat/get': ('GET', self.get_stat),
             '/stat/version': ('GET', self.get_version),
-            '/stat/dashboard-version': ('GET', self.get_dashboard_version),
             '/stat/start-time': ('GET', self.get_start_time),
             '/stat/restart-core': ('GET', self.restart_core)
         }
@@ -37,16 +36,6 @@ class StatRoute(Route):
             "version": VERSION
         }).__dict__
         
-    async def get_dashboard_version(self):
-        async with aiohttp.ClientSession() as session:
-            async with session.get('https://api.github.com/repos/Soulter/Astrbot-dashboard/actions/artifacts') as resp:
-                data = await resp.json()
-                return Response().ok({
-                    "data": data,
-                    "mark": "unimplemented feature"
-                }).__dict__
-        
-        
     async def get_start_time(self):
         return Response().ok({
             "start_time": self.core_lifecycle.start_time

astrbot/dashboard/routes/update.py

@@ -1,31 +1,47 @@
-import threading
 import traceback
 from .route import Route, Response, RouteContext
 from quart import request
+from astrbot.core.core_lifecycle import AstrBotCoreLifecycle
 from astrbot.core.updator import AstrBotUpdator
 from astrbot.core import logger, pip_installer
+from astrbot.core.utils.io import download_dashboard, get_dashboard_version
+from astrbot.core.config.default import VERSION
 
 class UpdateRoute(Route):
-    def __init__(self, context: RouteContext, astrbot_updator: AstrBotUpdator) -> None:
+    def __init__(self, context: RouteContext, astrbot_updator: AstrBotUpdator, core_lifecycle: AstrBotCoreLifecycle) -> None:
         super().__init__(context)
         self.routes = {
             '/update/check': ('GET', self.check_update),
             '/update/do': ('POST', self.update_project),
+            '/update/dashboard': ('POST', self.update_dashboard),
             '/update/pip-install': ('POST', self.install_pip_package)
         }
         self.astrbot_updator = astrbot_updator
+        self.core_lifecycle = core_lifecycle
         self.register_routes()
     
     async def check_update(self):
+        type_ = request.args.get('type', None)
+        
         try:
-            ret = await self.astrbot_updator.check_update(None, None)
-            return Response(
-                status="success",
-                message=str(ret) if ret is not None else "已经是最新版本了。",
-                data={
-                    "has_new_version": ret is not None
-                }
-            ).__dict__
+            dv = await get_dashboard_version()
+            if type_ == 'dashboard':
+                return Response().ok({
+                    "has_new_version": dv != f"v{VERSION}",
+                    "current_version": dv
+                }).__dict__
+            else:
+                ret = await self.astrbot_updator.check_update(None, None)
+                return Response(
+                    status="success",
+                    message=str(ret) if ret is not None else "已经是最新版本了。",
+                    data={
+                        "version": f"v{VERSION}",
+                        "has_new_version": ret is not None,
+                        "dashboard_version": dv,
+                        "dashboard_has_new_version": dv != f"v{VERSION}"
+                    }
+                ).__dict__
         except Exception as e:
             logger.error(traceback.format_exc())
             return Response().error(e.__str__()).__dict__
@@ -41,8 +57,16 @@ class UpdateRoute(Route):
             latest = False
         try:
             await self.astrbot_updator.update(latest=latest, version=version)
+            
+            if latest:
+                try:
+                    await download_dashboard()
+                except Exception as e:
+                    logger.error(f"下载管理面板文件失败: {e}。")
+            
             if reboot:
-                threading.Thread(target=self.astrbot_updator._reboot, args=(2, )).start()
+                # threading.Thread(target=self.astrbot_updator._reboot, args=(2, )).start()
+                self.core_lifecycle.restart()
                 return Response().ok(None, "更新成功，AstrBot 将在 2 秒内全量重启以应用新的代码。").__dict__
             else:
                 return Response().ok(None, "更新成功，AstrBot 将在下次启动时应用新的代码。").__dict__
@@ -50,6 +74,18 @@ class UpdateRoute(Route):
             logger.error(f"/api/update_project: {traceback.format_exc()}")
             return Response().error(e.__str__()).__dict__
         
+    async def update_dashboard(self):
+        try:
+            try:
+                await download_dashboard()
+            except Exception as e:
+                logger.error(f"下载管理面板文件失败: {e}。")
+                return Response().error(f"下载管理面板文件失败: {e}").__dict__
+            return Response().ok(None, "更新成功。刷新页面即可应用新版本面板。").__dict__
+        except Exception as e:
+            logger.error(f"/api/update_dashboard: {traceback.format_exc()}")
+            return Response().error(e.__str__()).__dict__
+        
     async def install_pip_package(self):
         data = await request.json
         package = data.get('package', '')

astrbot/dashboard/server.py

@@ -24,7 +24,7 @@ class AstrBotDashboard():
         # token 用于验证请求
         logging.getLogger(self.app.name).removeHandler(default_handler)
         self.context = RouteContext(self.config, self.app)
-        self.ur = UpdateRoute(self.context, core_lifecycle.astrbot_updator)
+        self.ur = UpdateRoute(self.context, core_lifecycle.astrbot_updator, core_lifecycle)
         self.sr = StatRoute(self.context, db, core_lifecycle)
         self.pr = PluginRoute(self.context, core_lifecycle, core_lifecycle.plugin_manager)
         self.cr = ConfigRoute(self.context, core_lifecycle)

changelogs/v3.4.10.md

@@ -0,0 +1,12 @@
+# What's Changed
+
+- 修复 LLM 请求报错信息被覆盖的问题，增强 LLM 请求错误处理 #243
+- 修复 Napcat 接口更新导致 QQ 图片发送失败的问题 #246
+- 修复某些请求不能正确应用代理的问题
+- 针对 api_base 的明显提示，修改 ollama 模板的 api_base #247
+- 支持登出 gewechat，在webchat等地方使用 `/gewe_logout` 指令，这在微信上显示账号下线但是 gewe 仍显示设备在线时很好用
+- 添加gewechat适配器过滤器
+- help显示AstrBot和webui版本
+- 优化webui和主程序更新的协调
+- 下载管理面板时显示提示、下载进度和下载速度
+- 管理面板前端更新功能入口移入右上角更新按钮，以便统一管理 #245

changelogs/v3.4.11.md

@@ -0,0 +1,6 @@
+# What's Changed
+
+- 为平台和提供商适配器添加默认 ID 配置 #248
+- 修复appid保存的问题和部分群聊at失效的问题和群聊@的sender username显示异常的问题
+- 优化更新项目时重启可能会导致Address already in use的问题
+- 各类异步任务报错后的优雅报错输出，而不是只有在退出程序的时候才输出异常日志。

dashboard/src/layouts/full/vertical-header/VerticalHeader.vue

@@ -15,6 +15,9 @@ let newUsername = ref('');
 let status = ref('');
 let updateStatus = ref('')
 let hasNewVersion = ref(false);
+let botCurrVersion = ref('');
+let dashboardHasNewVersion = ref(false);
+let dashboardCurrentVersion = ref('');
 let version = ref('');
 
 const open = (link: string) => {
@@ -64,6 +67,9 @@ function checkUpdate() {
     .then((res) => {
       hasNewVersion.value = res.data.data.has_new_version;
       updateStatus.value = res.data.message;
+      botCurrVersion.value = res.data.data.version;
+      dashboardCurrentVersion.value = res.data.data.dashboard_version;
+      dashboardHasNewVersion.value = res.data.data.dashboard_has_new_version;
     })
     .catch((err) => {
       if (err.response.status == 401) {
@@ -84,7 +90,24 @@ function switchVersion(version: string) {
   })
     .then((res) => {
       updateStatus.value = res.data.message;
-      if (res.data.status == 'success') {
+      if (res.data.status == 'ok') {
+        setTimeout(() => {
+          window.location.reload();
+        }, 1000);
+      }
+    })
+    .catch((err) => {
+      console.log(err);
+      updateStatus.value = err
+    });
+}
+
+function updateDashboard() {
+  updateStatus.value = '正在更新...';
+  axios.post('/api/update/dashboard')
+    .then((res) => {
+      updateStatus.value = res.data.message;
+      if (res.data.status == 'ok') {
         setTimeout(() => {
           window.location.reload();
         }, 1000);
@@ -106,8 +129,8 @@ commonStore.getStartTime();
 <template>
   <v-app-bar elevation="0" height="70">
 
-    <v-btn style="margin-left: 22px;" class="hidden-md-and-down text-secondary" color="lightsecondary" icon rounded="sm" variant="flat"
-      @click.stop="customizer.SET_MINI_SIDEBAR(!customizer.mini_sidebar)" size="small">
+    <v-btn style="margin-left: 22px;" class="hidden-md-and-down text-secondary" color="lightsecondary" icon rounded="sm"
+      variant="flat" @click.stop="customizer.SET_MINI_SIDEBAR(!customizer.mini_sidebar)" size="small">
       <v-icon>mdi-menu</v-icon>
     </v-btn>
     <v-btn class="hidden-lg-and-up text-secondary ms-3" color="lightsecondary" icon rounded="sm" variant="flat"
@@ -136,11 +159,16 @@ commonStore.getStartTime();
       </template>
       <v-card>
         <v-card-title>
-          <span class="text-h5">更新项目</span>
+          <span class="text-h5">更新 AstrBot</span>
         </v-card-title>
         <v-card-text>
           <v-container>
-            <h3 class="mb-4">升级到最新版本</h3>
+            <h3 class="mb-4">升级到项目最新版本</h3>
+            <small>当前版本 {{ botCurrVersion }}</small>
+            <div class="mb-4">
+              <small>会同时尝试更新机器人主程序和管理面板。如果您正在使用 Docker 部署，也可以重新拉取镜像或者使用 <a
+                  href="https://containrrr.dev/watchtower/usage-overview/">watchtower</a> 来自动监控拉取。</small>
+            </div>
             <p>{{ updateStatus }}</p>
             <v-btn class="mt-4 mb-4" @click="switchVersion('latest')" color="primary" style="border-radius: 10px;"
               :disabled="!hasNewVersion">
@@ -148,7 +176,11 @@ commonStore.getStartTime();
             </v-btn>
             <v-divider></v-divider>
             <div style="margin-top: 16px;">
-              <h3 class="mb-4">切换到指定版本或指定提交</h3>
+              <h3 class="mb-4">切换到项目指定版本或指定提交</h3>
+              <div class="mb-4">
+                <small>跳到旧版本不会重新下载管理面板文件，这可能会造成部分数据显示错误。您可在 <a href="https://github.com/Soulter/AstrBot/releases">此处</a>
+                  找到对应的面板文件 dist.zip，解压后替换 data/dist 文件夹即可。</small>
+              </div>
               <v-text-field label="输入版本号或 master 分支下的 commit hash。" v-model="version" required
                 variant="outlined"></v-text-field>
               <div class="mb-4">
@@ -160,7 +192,29 @@ commonStore.getStartTime();
               <v-btn color="error" style="border-radius: 10px;" @click="switchVersion(version)">
                 确定切换
               </v-btn>
+            </div>
 
+            <v-divider></v-divider>
+            <div style="margin-top: 16px;">
+              <h3 class="mb-4">更新管理面板到最新版本</h3>
+              <div class="mb-4">
+                <small>当前版本 {{ dashboardCurrentVersion }}</small>
+                <br>
+
+              </div>
+
+              <div class="mb-4">
+                <p v-if="dashboardHasNewVersion">
+                  有新版本！
+                </p>
+                <p v-else="dashboardHasNewVersion">
+                  已经是最新版本了。
+                </p>
+              </div>
+
+              <v-btn color="primary" style="border-radius: 10px;" @click="updateDashboard()">
+                下载并更新
+              </v-btn>
             </div>
           </v-container>
         </v-card-text>
@@ -190,8 +244,7 @@ commonStore.getStartTime();
                 <v-text-field label="原密码*" type="password" v-model="password" required
                   variant="outlined"></v-text-field>
 
-                <v-text-field label="新用户名" v-model="newUsername" required
-                  variant="outlined"></v-text-field>
+                <v-text-field label="新用户名" v-model="newUsername" required variant="outlined"></v-text-field>
 
                 <v-text-field label="新密码" type="password" v-model="newPassword" required
                   variant="outlined"></v-text-field>

dashboard/src/layouts/full/vertical-sidebar/VerticalSidebar.vue

@@ -27,10 +27,10 @@ const sidebarMenu = shallowRef(sidebarItems);
         </v-btn>
       </v-list-item>
       <small style="display: block;" v-if="buildVer">构建: {{ buildVer }}</small>
-      <small style="display: block;" v-else="buildVer">构建: embedded</small>
+      <small style="display: block;" v-else>构建: embedded</small>
       <v-tooltip text="使用 /dashbord_update 指令更新管理面板">
         <template v-slot:activator="{ props }">
-          <small v-bind="props" v-if="buildVer != version" style="display: block; margin-top: 4px;">面板有更新</small>
+          <small v-bind="props" v-if="hasWebUIUpdate" style="display: block; margin-top: 4px;">面板有更新</small>
         </template>
       </v-tooltip>
 
@@ -50,19 +50,12 @@ export default {
   },
   data: () => ({
     version: "",
-    buildVer: ""
+    buildVer: "",
+    hasWebUIUpdate: false,
   }),
   mounted() {
     this.get_version()
-    fetch('/assets/version').then((res) => {
-      return res.text()
-    }).then((res) => {
-      if (res.length > 10) {
-        // 不是版本，不显示 😎
-        return
-      }
-      this.buildVer = res.replace(/\s+/g, '')
-    })
+    this.check_webui_update()
   },
   methods: {
     get_version() {
@@ -73,6 +66,16 @@ export default {
         .catch((err) => {
           console.log(err);
         });
+    },
+    check_webui_update() {
+      axios.get('/api/update/check?type=dashboard')
+        .then((res) => {
+          this.hasWebUIUpdate = res.data.data.has_new_version;
+          this.buildVer = res.data.data.current_version;
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     }
   },
 };

dashboard/src/views/dashboards/default/DefaultDashboard.vue

@@ -1,4 +1,13 @@
 <template>
+  <v-row style="margin: 2px;">
+    <v-alert
+      :type="noticeType"
+      :text="noticeContent"
+      :title="noticeTitle"
+      v-if="noticeTitle && noticeContent"
+      closable
+    ></v-alert>
+  </v-row>
   <v-row>
     <v-col cols="12" md="4">
       <TotalMessage :stat="stat" />
@@ -38,13 +47,25 @@ export default {
   },
   data: () => ({
     stat: {},
+    noticeTitle: '',
+    noticeContent: '',
+    noticeType: '',
   }),
 
   mounted() {
     axios.get('/api/stat/get').then((res) => {
       this.stat = res.data.data;
     });
-  }
+
+    axios.get('https://api.soulter.top/astrbot-announcement').then((res) => {
+      let data = res.data.data;
+      // 如果 dashboard-notice 在其中
+      if (data['dashboard-notice']) {
+        this.noticeTitle = data['dashboard-notice'].title;
+        this.noticeContent = data['dashboard-notice'].content;
+      }
+    });
+  },
 };
 
 </script>

main.py

@@ -6,7 +6,7 @@ from astrbot.dashboard import AstrBotDashBoardLifecycle
 from astrbot.core import db_helper
 from astrbot.core import logger, LogManager, LogBroker
 from astrbot.core.config.default import VERSION
-from astrbot.core.utils.io import download_dashboard
+from astrbot.core.utils.io import download_dashboard, get_dashboard_version
 
 # add parent path to sys.path
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
@@ -37,14 +37,14 @@ def check_env():
     
 async def check_dashboard_files():
     '''下载管理面板文件'''
-    if os.path.exists("data/dist"):
-        if os.path.exists("data/dist/assets/version"):
-            with open("data/dist/assets/version", "r") as f:
-                v = f.read().strip()
-                if v != f"v{VERSION}":
-                    logger.warning("检测到管理面板有更新。可以使用 /dashboard_update 命令更新。")
-                else:
-                    logger.info("管理面板文件已是最新。")
+
+    v = await get_dashboard_version()
+    if v is not None:
+        # has file
+        if v == f"v{VERSION}":
+            logger.info("管理面板文件已是最新。")
+        else:
+            logger.warning("检测到管理面板有更新。可以使用 /dashboard_update 命令更新。")
         return
     
     logger.info("开始下载管理面板文件...高峰期（晚上）可能导致较慢的速度。如多次下载失败，请前往 https://github.com/Soulter/AstrBot/releases/latest 下载 dist.zip，并将其中的 dist 文件夹解压至 data 目录下。")

packages/astrbot/main.py

@@ -6,7 +6,8 @@ import astrbot.api.event.filter as filter
 from astrbot.api.event import AstrMessageEvent, MessageEventResult
 from astrbot.api import sp
 from astrbot.api.provider import Personality, ProviderRequest
-from astrbot.core.utils.io import download_dashboard
+from astrbot.core.utils.io import download_dashboard, get_dashboard_version
+from astrbot.core.config.default import VERSION
 
 from typing import Union
 
@@ -23,7 +24,7 @@ class Main(star.Star):
     
     async def _query_astrbot_notice(self):
         try:
-            async with aiohttp.ClientSession() as session:
+            async with aiohttp.ClientSession(trust_env=True) as session:
                 async with session.get("https://astrbot.soulter.top/notice.json", timeout=2) as resp:
                     return (await resp.json())["notice"]
         except BaseException:
@@ -36,9 +37,12 @@ class Main(star.Star):
             notice = await self._query_astrbot_notice()
         except BaseException:
             pass
+        
+        dashboard_version = await get_dashboard_version()
 
-        msg = "已注册的 AstrBot 内置指令:\n"
-        msg += f"""[System]
+        msg = f"""AstrBot v{VERSION}(WebUI: {dashboard_version})
+已注册的 AstrBot 内置指令:
+[System]
 /plugin: 查看注册的插件、插件帮助
 /t2i: 开启/关闭文本转图片模式
 /sid: 获取当前会话的 ID
@@ -414,6 +418,16 @@ UID: {user_id} 此 ID 可用于设置管理员。/op <UID> 授权管理员, /deo
             del session_var[key]
             sp.put("session_variables", session_vars)
             yield event.plain_result(f"会话 {session_id} 变量 {key} 移除成功。")
+            
+    @filter.command("gewe_logout")
+    async def gewe_logout(self, event: AstrMessageEvent):
+        platforms = self.context.platform_manager.platform_insts
+        for platform in platforms:
+            if platform.meta().name == "gewechat":
+                yield event.plain_result("正在登出 gewechat")
+                await platform.logout()
+                yield event.plain_result("已登出 gewechat")
+                return
                 
     @filter.command_group("kdb")
     def kdb(self):

packages/python_interpreter/main.py

@@ -127,7 +127,7 @@ class Main(star.Star):
         
         s3_file_url = f"{S3_URL}/{uuid.uuid4().hex}{ext}"
 
-        async with aiohttp.ClientSession(headers = {"Accept": "application/json"}) as session:
+        async with aiohttp.ClientSession(headers = {"Accept": "application/json"}, trust_env=True) as session:
             async with session.put(s3_file_url, data=file) as resp:
                 if resp.status != 200:
                     raise Exception(f"Failed to upload image: {resp.status}")
@@ -159,7 +159,7 @@ class Main(star.Star):
     
     async def download_image(self, image_url: str, workplace_path: str, filename: str) -> str:
         '''Download image from url to workplace_path'''
-        async with aiohttp.ClientSession() as session:
+        async with aiohttp.ClientSession(trust_env=True) as session:
             async with session.get(image_url) as resp:
                 if resp.status != 200:
                     return ""

packages/web_searcher/main.py

@@ -39,7 +39,7 @@ class Main(star.Star):
         '''获取网页内容'''
         header = HEADERS
         header.update({'User-Agent': random.choice(USER_AGENTS)})
-        async with aiohttp.ClientSession() as session:
+        async with aiohttp.ClientSession(trust_env=True) as session:
             async with session.get(url, headers=header, timeout=6) as response:
                 html = await response.text(encoding="utf-8")
                 doc = Document(html)