fix: resolve ruff violations without new ignores

Author: zouyonghe

astrbot/cli/utils/plugin.py

@@ -1,6 +1,6 @@
 import shutil
 import tempfile
-from enum import Enum
+from enum import StrEnum
 from io import BytesIO
 from pathlib import Path
 from zipfile import ZipFile
@@ -12,7 +12,7 @@
 from .version_comparator import VersionComparator
 
 
-class PluginStatus(str, Enum):
+class PluginStatus(StrEnum):
     INSTALLED = "installed"
     NEED_UPDATE = "needs-update"
     NOT_INSTALLED = "not-installed"

astrbot/core/agent/agent.py

@@ -1,13 +1,12 @@
 from dataclasses import dataclass
-from typing import Any, Generic
+from typing import Any
 
 from .hooks import BaseAgentRunHooks
-from .run_context import TContext
 from .tool import FunctionTool
 
 
 @dataclass
-class Agent(Generic[TContext]):
+class Agent[TContext]:
     name: str
     instructions: str | None = None
     tools: list[str | FunctionTool] | None = None

astrbot/core/agent/handoff.py

@@ -1,11 +1,8 @@
-from typing import Generic
-
 from .agent import Agent
-from .run_context import TContext
 from .tool import FunctionTool
 
 
-class HandoffTool(FunctionTool, Generic[TContext]):
+class HandoffTool[TContext](FunctionTool):
     """Handoff tool for delegating tasks to another agent."""
 
     def __init__(

astrbot/core/agent/hooks.py

@@ -1,14 +1,12 @@
-from typing import Generic
-
 import mcp
 
 from astrbot.core.agent.tool import FunctionTool
 from astrbot.core.provider.entities import LLMResponse
 
-from .run_context import ContextWrapper, TContext
+from .run_context import ContextWrapper
 
 
-class BaseAgentRunHooks(Generic[TContext]):
+class BaseAgentRunHooks[TContext]:
     async def on_agent_begin(self, run_context: ContextWrapper[TContext]) -> None: ...
     async def on_tool_start(
         self,

astrbot/core/agent/mcp_client.py

@@ -2,7 +2,6 @@
 import logging
 from contextlib import AsyncExitStack
 from datetime import timedelta
-from typing import Generic
 
 from tenacity import (
     before_sleep_log,
@@ -16,7 +15,6 @@
 from astrbot.core.agent.run_context import ContextWrapper
 from astrbot.core.utils.log_pipe import LogPipe
 
-from .run_context import TContext
 from .tool import FunctionTool
 
 try:
@@ -101,7 +99,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}"
@@ -360,7 +358,7 @@ async def cleanup(self) -> None:
         self.running_event.set()
 
 
-class MCPTool(FunctionTool, Generic[TContext]):
+class MCPTool[TContext](FunctionTool):
     """A function tool that calls an MCP service."""
 
     def __init__(

astrbot/core/agent/runners/base.py

@@ -7,7 +7,7 @@
 
 from ..hooks import BaseAgentRunHooks
 from ..response import AgentResponse
-from ..run_context import ContextWrapper, TContext
+from ..run_context import ContextWrapper
 
 
 class AgentState(Enum):
@@ -19,7 +19,7 @@ class AgentState(Enum):
     ERROR = auto()  # Error state
 
 
-class BaseAgentRunner(T.Generic[TContext]):
+class BaseAgentRunner[TContext]:
     @abc.abstractmethod
     async def reset(
         self,

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

@@ -1,7 +1,7 @@
 import base64
 import json
-import sys
 import typing as T
+from typing import override
 
 import astrbot.core.message.components as Comp
 from astrbot import logger
@@ -18,11 +18,6 @@
 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"""
@@ -251,7 +246,7 @@ async def _execute_coze_request(self):
             conversation_id=conversation_id,
             auto_save_history=self.auto_save_history,
             stream=True,
-            timeout=self.timeout,
+            timeout_seconds=self.timeout,
         ):
             event_type = chunk.get("event")
             data = chunk.get("data", {})

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

@@ -90,7 +90,7 @@ async def upload_file(
                 logger.debug(f"[Coze] 图片上传成功，file_id: {file_id}")
                 return file_id
 
-        except asyncio.TimeoutError:
+        except TimeoutError:
             logger.error("文件上传超时")
             raise Exception("文件上传超时")
         except Exception as e:
@@ -128,7 +128,7 @@ async def chat_messages(
         conversation_id: str | None = None,
         auto_save_history: bool = True,
         stream: bool = True,
-        timeout: float = 120,
+        timeout_seconds: float = 120,
     ) -> AsyncGenerator[dict[str, Any], None]:
         """发送聊天消息并返回流式响应
 
@@ -139,7 +139,7 @@ async def chat_messages(
             conversation_id: 会话ID
             auto_save_history: 是否自动保存历史
             stream: 是否流式响应
-            timeout: 超时时间
+            timeout_seconds: 超时时间
 
         """
         session = await self._ensure_session()
@@ -166,7 +166,7 @@ async def chat_messages(
                 url,
                 json=payload,
                 params=params,
-                timeout=aiohttp.ClientTimeout(total=timeout),
+                timeout=aiohttp.ClientTimeout(total=timeout_seconds),
             ) as response:
                 if response.status == 401:
                     raise Exception("Coze API 认证失败，请检查 API Key 是否正确")
@@ -203,8 +203,8 @@ 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_seconds}秒)")
         except Exception as e:
             raise Exception(f"Coze API 流式请求失败: {e!s}")
 
@@ -236,7 +236,7 @@ async def clear_context(self, conversation_id: str):
                 except json.JSONDecodeError:
                     raise Exception("Coze API 返回非JSON格式")
 
-        except asyncio.TimeoutError:
+        except TimeoutError:
             raise Exception("Coze API 请求超时")
         except aiohttp.ClientError as e:
             raise Exception(f"Coze API 请求失败: {e!s}")

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

@@ -2,9 +2,9 @@
 import functools
 import queue
 import re
-import sys
 import threading
 import typing as T
+from typing import override
 
 from dashscope import Application
 from dashscope.app.application_response import ApplicationResponse
@@ -22,11 +22,6 @@
 from ...run_context import ContextWrapper, TContext
 from ..base import AgentResponse, AgentState, BaseAgentRunner
 
-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,10 +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 override
 from uuid import uuid4
 
 import astrbot.core.message.components as Comp
@@ -40,11 +40,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."""
@@ -378,7 +373,9 @@ async def _ensure_thread_id(self, session_id: str) -> str:
         if thread_id:
             return thread_id
 
-        thread = await self.api_client.create_thread(timeout=min(30, self.timeout))
+        thread = await self.api_client.create_thread(
+            timeout_seconds=min(30, self.timeout)
+        )
         thread_id = thread.get("thread_id", "")
         if not thread_id:
             raise Exception(
@@ -639,7 +636,7 @@ async def _execute_deerflow_request(self):
             async for event in self.api_client.stream_run(
                 thread_id=thread_id,
                 payload=payload,
-                timeout=self.timeout,
+                timeout_seconds=self.timeout,
             ):
                 event_type = event.get("event")
                 data = event.get("data")
@@ -666,7 +663,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,