refactor: 统一类型注解风格并优化代码结构
- 将裸 except 改为显式 Exception 捕获 - 用列表推导式替换冗余 for 循环 - 为类属性添加 ClassVar 注解 - 统一 Union/Optional 写法为 | - 移除未使用的导入 - 修复 SQLAlchemy 空值比较语法 - 优化字符串拼接与字典更新逻辑 - 补充缺失的 noqa 注释与异常链 BREAKING CHANGE: 所有插件基类的类级字段现要求显式 ClassVar 注解,自定义插件需同步更新
This commit is contained in:
@@ -115,7 +115,7 @@ class StreamLoopManager:
|
||||
if not force and context.stream_loop_task and not context.stream_loop_task.done():
|
||||
logger.debug(f"流 {stream_id} 循环已在运行")
|
||||
return True
|
||||
|
||||
|
||||
# 如果是强制启动且任务仍在运行,先取消旧任务
|
||||
if force and context.stream_loop_task and not context.stream_loop_task.done():
|
||||
logger.info(f"强制启动模式:先取消现有流循环任务: {stream_id}")
|
||||
@@ -438,7 +438,7 @@ class StreamLoopManager:
|
||||
|
||||
async def _update_stream_energy(self, stream_id: str, context: Any) -> None:
|
||||
"""更新流的能量值
|
||||
|
||||
|
||||
Args:
|
||||
stream_id: 流ID
|
||||
context: 流上下文 (StreamContext)
|
||||
|
||||
@@ -161,7 +161,7 @@ class GlobalNoticeManager:
|
||||
self._cleanup_expired_notices()
|
||||
|
||||
# 收集可访问的notice
|
||||
for storage_key, notices in self._notices.items():
|
||||
for notices in self._notices.values():
|
||||
for notice in notices:
|
||||
if notice.is_expired():
|
||||
continue
|
||||
|
||||
@@ -355,7 +355,7 @@ class MessageManager:
|
||||
try:
|
||||
stream_loop_task.cancel()
|
||||
logger.info(f"已发送取消信号到流循环任务: {chat_stream.stream_id}")
|
||||
|
||||
|
||||
# 等待任务真正结束(设置超时避免死锁)
|
||||
try:
|
||||
await asyncio.wait_for(stream_loop_task, timeout=2.0)
|
||||
@@ -625,7 +625,7 @@ class MessageManager:
|
||||
|
||||
def _determine_notice_scope(self, message: DatabaseMessages, stream_id: str) -> NoticeScope:
|
||||
"""确定notice的作用域
|
||||
|
||||
|
||||
作用域完全由 additional_config 中的 is_public_notice 字段决定:
|
||||
- is_public_notice=True: 公共notice,所有聊天流可见
|
||||
- is_public_notice=False 或未设置: 特定聊天流notice
|
||||
|
||||
Reference in New Issue
Block a user