refactor: miscellaneous updates across modules

Author: LIghtJUNction

astrbot/cli/commands/cmd_init.py

@@ -229,9 +229,9 @@ def init(
             click.echo("首次使用前请先设置管理员密码：")
             click.echo("  astrbot conf admin")
             click.echo()
-    except Timeout:
+    except Timeout as err:
         raise click.ClickException(
             "Cannot acquire lock file. Please check if another instance is running",
-        )
+        ) from err
     except Exception as e:
-        raise click.ClickException(f"Initialization failed: {e!s}")
+        raise click.ClickException(f"Initialization failed: {e!s}") from e

astrbot/cli/commands/cmd_plug.py

@@ -184,7 +184,7 @@ def remove(name: str) -> None:
     except Exception as e:
         raise click.ClickException(
             t("plugin_uninstall_failed_ex", name=name, error=str(e)),
-        )
+        ) from e
 
 
 @plug.command()

astrbot/cli/commands/cmd_run.py

@@ -361,7 +361,7 @@ async def stream_logs() -> None:
                                     nl=False,
                                 )
                                 click.echo(f" {message}")
-                        except asyncio.TimeoutError:
+                        except TimeoutError:
                             continue
                         except asyncio.CancelledError:
                             break

astrbot/cli/utils/plugin.py

@@ -254,4 +254,4 @@ def manage_plugin(
             shutil.move(backup_path, target_path)
         raise click.ClickException(
             f"Error {'updating' if is_update else 'installing'} plugin {plugin_name}: {e}",
-        )
+        ) from e

astrbot/core/agent/mcp_client.py

@@ -156,7 +156,7 @@ async def _quick_test_mcp_connection(config: dict) -> tuple[bool, str]:
                         return True, ""
                     return False, f"HTTP {response.status}: {response.reason}"
 
-    except asyncio.TimeoutError:
+    except TimeoutError:
         return False, f"Connection timeout: {timeout} seconds"
     except Exception as e:
         return False, f"{e!s}"

astrbot/core/agent/message.py

@@ -1,7 +1,7 @@
 # Inspired by MoonshotAI/kosong, credits to MoonshotAI/kosong authors for the original implementation.
 # License: Apache License 2.0
 
-from typing import Any, ClassVar, Literal, TypeVar, cast
+from typing import Any, ClassVar, Literal, Self, TypeVar, cast
 
 from pydantic import (
     BaseModel,
@@ -12,7 +12,6 @@
     model_validator,
 )
 from pydantic_core import core_schema
-from typing_extensions import Self
 
 ContentPartT = TypeVar("ContentPartT", bound="ContentPart")
 

astrbot/core/agent/runners/coze/coze_agent_runner.py

@@ -1,12 +1,12 @@
 import base64
 import json
-import sys
-from typing import Any
+from typing import Any, override
 
 import astrbot.core.message.components as Comp
 from astrbot import logger
 from astrbot.core import sp
 from astrbot.core.agent.hooks import BaseAgentRunHooks
+from astrbot.core.agent.message import is_checkpoint_message
 from astrbot.core.agent.response import AgentResponse, AgentResponseData
 from astrbot.core.agent.run_context import ContextWrapper, TContext
 from astrbot.core.agent.runners.base import AgentState, BaseAgentRunner
@@ -18,18 +18,8 @@
 )
 from astrbot.core.provider.provider import Provider
 
-from ...hooks import BaseAgentRunHooks
-from ...message import is_checkpoint_message
-from ...response import AgentResponseData
-from ...run_context import ContextWrapper, TContext
-from ..base import AgentResponse, AgentState, BaseAgentRunner
 from .coze_api_client import CozeAPIClient
 
-if sys.version_info >= (3, 12):
-    from typing import override
-else:
-    from typing_extensions import override
-
 
 class CozeAgentRunner(BaseAgentRunner[TContext]):
     """Coze Agent Runner"""
@@ -375,7 +365,7 @@ async def _download_and_upload_image(
 
         except Exception as e:
             logger.error(f"处理图片失败 {image_url}: {e!s}")
-            raise Exception(f"处理图片失败: {e!s}")
+            raise Exception(f"处理图片失败: {e!s}") from e
 
     @override
     def done(self) -> bool:

astrbot/core/agent/runners/coze/coze_api_client.py

@@ -81,7 +81,7 @@ async def upload_file(
                 try:
                     result = await response.json()
                 except json.JSONDecodeError:
-                    raise Exception(f"文件上传响应解析失败: {response_text}")
+                    raise Exception(f"文件上传响应解析失败: {response_text}") from None
 
                 if result.get("code") != 0:
                     raise Exception(f"文件上传失败: {result.get('msg', '未知错误')}")
@@ -90,12 +90,12 @@ async def upload_file(
                 logger.debug(f"[Coze] 图片上传成功,file_id: {file_id}")
                 return file_id
 
-        except asyncio.TimeoutError:
+        except TimeoutError:
             logger.error("文件上传超时")
-            raise Exception("文件上传超时")
+            raise Exception("文件上传超时") from None
         except Exception as e:
             logger.error(f"文件上传失败: {e!s}")
-            raise Exception(f"文件上传失败: {e!s}")
+            raise Exception(f"文件上传失败: {e!s}") from e
 
     async def download_image(self, image_url: str) -> bytes:
         """下载图片并返回字节数据
@@ -118,7 +118,7 @@ async def download_image(self, image_url: str) -> bytes:
 
         except Exception as e:
             logger.error(f"下载图片失败 {image_url}: {e!s}")
-            raise Exception(f"下载图片失败: {e!s}")
+            raise Exception(f"下载图片失败: {e!s}") from e
 
     async def chat_messages(
         self,
@@ -203,10 +203,10 @@ async def chat_messages(
                                     except json.JSONDecodeError:
                                         event_data = {"content": data_str}
 
-        except asyncio.TimeoutError:
-            raise Exception(f"Coze API 流式请求超时 ({timeout}秒)")
+        except TimeoutError:
+            raise Exception(f"Coze API 流式请求超时 ({timeout}秒)") from None
         except Exception as e:
-            raise Exception(f"Coze API 流式请求失败: {e!s}")
+            raise Exception(f"Coze API 流式请求失败: {e!s}") from e
 
     async def clear_context(self, conversation_id: str):
         """清空会话上下文
@@ -234,12 +234,12 @@ async def clear_context(self, conversation_id: str):
                 try:
                     return json.loads(response_text)
                 except json.JSONDecodeError:
-                    raise Exception("Coze API 返回非JSON格式")
+                    raise Exception("Coze API 返回非JSON格式") from None
 
-        except asyncio.TimeoutError:
-            raise Exception("Coze API 请求超时")
+        except TimeoutError:
+            raise Exception("Coze API 请求超时") from None
         except aiohttp.ClientError as e:
-            raise Exception(f"Coze API 请求失败: {e!s}")
+            raise Exception(f"Coze API 请求失败: {e!s}") from e
 
     async def get_message_list(
         self,
@@ -275,7 +275,7 @@ async def get_message_list(
 
         except Exception as e:
             logger.error(f"获取Coze消息列表失败: {e!s}")
-            raise Exception(f"获取Coze消息列表失败: {e!s}")
+            raise Exception(f"获取Coze消息列表失败: {e!s}") from e
 
     async def close(self) -> None:
         """关闭会话"""
@@ -299,7 +299,7 @@ async def test_coze_api_client() -> None:
             async with await anyio.open_file("README.md", "rb") as f:
                 file_data = await f.read()
             file_id = await client.upload_file(file_data)
-            async for event in client.chat_messages(
+            async for _event in client.chat_messages(
                 bot_id=bot_id,
                 user_id="test_user",
                 additional_messages=[

astrbot/core/agent/runners/dashscope/dashscope_agent_runner.py

@@ -2,10 +2,9 @@
 import functools
 import queue
 import re
-import sys
 import threading
 from collections.abc import AsyncGenerator
-from typing import Any
+from typing import Any, override
 
 from dashscope import Application
 from dashscope.app.application_response import ApplicationResponse
@@ -24,11 +23,6 @@
 )
 from astrbot.core.provider.provider import Provider
 
-if sys.version_info >= (3, 12):
-    from typing import override
-else:
-    from typing_extensions import override
-
 
 class DashscopeAgentRunner(BaseAgentRunner[TContext]):
     """Dashscope Agent Runner"""

astrbot/core/agent/runners/deerflow/deerflow_agent_runner.py

@@ -1,11 +1,10 @@
 import asyncio
 import hashlib
 import json
-import sys
 import typing as T
 from collections import deque
 from dataclasses import dataclass, field
-from typing import Any
+from typing import Any, override
 from uuid import uuid4
 
 import astrbot.core.message.components as Comp
@@ -43,11 +42,6 @@
     get_message_id,
 )
 
-if sys.version_info >= (3, 12):
-    from typing import override
-else:
-    from typing_extensions import override
-
 
 class DeerFlowAgentRunner(BaseAgentRunner[TContext]):
     """DeerFlow Agent Runner via LangGraph HTTP API."""
@@ -687,7 +681,7 @@ async def _execute_deerflow_request(self):
 
                 if event_type == "end":
                     break
-        except (asyncio.TimeoutError, TimeoutError):
+        except TimeoutError:
             logger.warning(
                 "DeerFlow stream timed out after %ss for thread_id=%s; returning partial result.",
                 self.timeout,