chore: ruff check --fix --select ALL

Author: LIghtJUNction

astrbot/api/event/filter/__init__.py

@@ -55,14 +55,14 @@
     "on_decorating_result",
     "on_llm_request",
     "on_llm_response",
+    "on_llm_tool_respond",
+    "on_platform_loaded",
     "on_plugin_error",
     "on_plugin_loaded",
     "on_plugin_unloaded",
-    "on_platform_loaded",
+    "on_using_llm_tool",
     "on_waiting_llm_request",
     "permission_type",
     "platform_adapter_type",
     "regex",
-    "on_using_llm_tool",
-    "on_llm_tool_respond",
 ]

astrbot/builtin_stars/astrbot/long_term_memory.py

@@ -32,10 +32,10 @@ def cfg(self, event: AstrMessageEvent):
             max_cnt = 300
         image_caption_prompt = cfg["provider_settings"]["image_caption_prompt"]
         image_caption_provider_id = cfg["provider_ltm_settings"].get(
-            "image_caption_provider_id"
+            "image_caption_provider_id",
         )
         image_caption = cfg["provider_ltm_settings"]["image_caption"] and bool(
-            image_caption_provider_id
+            image_caption_provider_id,
         )
         active_reply = cfg["provider_ltm_settings"]["active_reply"]
         enable_active_reply = active_reply.get("enable", False)
@@ -126,7 +126,7 @@ async def handle_message(self, event: AstrMessageEvent) -> None:
                 elif isinstance(comp, Image):
                     if cfg["image_caption"]:
                         try:
-                            url = comp.url if comp.url else comp.file
+                            url = comp.url or comp.file
                             if not url:
                                 raise Exception("图片 URL 为空")
                             caption = await self.get_image_caption(
@@ -172,15 +172,15 @@ async def on_req_llm(self, event: AstrMessageEvent, req: ProviderRequest) -> Non
             req.system_prompt += chats_str
 
     async def after_req_llm(
-        self, event: AstrMessageEvent, llm_resp: LLMResponse
+        self, event: AstrMessageEvent, llm_resp: LLMResponse,
     ) -> None:
         if event.unified_msg_origin not in self.session_chats:
             return
 
         if llm_resp.completion_text:
             final_message = f"[You/{datetime.datetime.now().strftime('%H:%M:%S')}]: {llm_resp.completion_text}"
             logger.debug(
-                f"Recorded AI response: {event.unified_msg_origin} | {final_message}"
+                f"Recorded AI response: {event.unified_msg_origin} | {final_message}",
             )
             self.session_chats[event.unified_msg_origin].append(final_message)
             cfg = self.cfg(event)

astrbot/builtin_stars/astrbot/main.py

@@ -86,7 +86,7 @@ async def on_message(self, event: AstrMessageEvent):
 
     @filter.on_llm_request()
     async def decorate_llm_req(
-        self, event: AstrMessageEvent, req: ProviderRequest
+        self, event: AstrMessageEvent, req: ProviderRequest,
     ) -> None:
         """在请求 LLM 前注入人格信息、Identifier、时间、回复内容等 System Prompt"""
         if self.ltm and self.ltm_enabled(event):
@@ -97,7 +97,7 @@ async def decorate_llm_req(
 
     @filter.on_llm_response()
     async def record_llm_resp_to_ltm(
-        self, event: AstrMessageEvent, resp: LLMResponse
+        self, event: AstrMessageEvent, resp: LLMResponse,
     ) -> None:
         """在 LLM 响应后记录对话"""
         if self.ltm and self.ltm_enabled(event):

astrbot/builtin_stars/builtin_commands/commands/conversation.py

@@ -124,8 +124,8 @@ async def stop(self, message: AstrMessageEvent) -> None:
         if stopped_count > 0:
             message.set_result(
                 MessageEventResult().message(
-                    f"已请求停止 {stopped_count} 个运行中的任务。"
-                )
+                    f"已请求停止 {stopped_count} 个运行中的任务。",
+                ),
             )
             return
 
@@ -207,7 +207,7 @@ async def convs(self, message: AstrMessageEvent, page: int = 1) -> None:
         """生成所有对话的标题字典"""
         _titles = {}
         for conv in conversations_all:
-            title = conv.title if conv.title else "新对话"
+            title = conv.title or "新对话"
             _titles[conv.cid] = title
 
         """遍历分页后的对话生成列表显示"""
@@ -237,7 +237,7 @@ async def convs(self, message: AstrMessageEvent, page: int = 1) -> None:
 
             title = _titles.get(conv.cid, "新对话")
             parts.append(
-                f"{global_index}. {title}({conv.cid[:4]})\n  人格情景: {persona_name}\n  上次更新: {datetime.datetime.fromtimestamp(conv.updated_at).strftime('%m-%d %H:%M')}\n"
+                f"{global_index}. {title}({conv.cid[:4]})\n  人格情景: {persona_name}\n  上次更新: {datetime.datetime.fromtimestamp(conv.updated_at).strftime('%m-%d %H:%M')}\n",
             )
             global_index += 1
 
@@ -349,7 +349,7 @@ async def switch_conv(
             )
         else:
             conversation = conversations[index - 1]
-            title = conversation.title if conversation.title else "新对话"
+            title = conversation.title or "新对话"
             await self.context.conversation_manager.switch_conversation(
                 message.unified_msg_origin,
                 conversation.cid,

astrbot/builtin_stars/builtin_commands/commands/help.py

@@ -23,8 +23,7 @@ async def _query_astrbot_notice(self):
             return ""
 
     async def _build_reserved_command_lines(self) -> list[str]:
-        """
-        使用实时指令配置生成内置指令清单，确保重命名/禁用后与实际生效状态保持一致。
+        """使用实时指令配置生成内置指令清单，确保重命名/禁用后与实际生效状态保持一致。
         """
         try:
             commands = await command_management.list_commands()

astrbot/builtin_stars/builtin_commands/commands/persona.py

@@ -45,7 +45,7 @@ def _build_tree_output(
                         children,
                         all_personas,
                         depth + 1,
-                    )
+                    ),
                 )
 
         return lines
@@ -100,7 +100,7 @@ async def persona(self, message: AstrMessageEvent) -> None:
             if force_applied_persona_id:
                 curr_persona_name = f"{curr_persona_name} (自定义规则)"
 
-            curr_cid_title = conv.title if conv.title else "新对话"
+            curr_cid_title = conv.title or "新对话"
             curr_cid_title += f"({cid[:4]})"
 
         if len(l) == 1:

astrbot/builtin_stars/builtin_commands/commands/provider.py

@@ -48,7 +48,7 @@ def get(self, provider_id: str, umo: str | None, ttl: float) -> list[str] | None
         return models
 
     def set(
-        self, provider_id: str, umo: str | None, models: list[str], ttl: float
+        self, provider_id: str, umo: str | None, models: list[str], ttl: float,
     ) -> None:
         if ttl <= 0:
             return
@@ -67,7 +67,7 @@ def _evict_if_needed(self) -> None:
             self._store.pop(key, None)
 
     def invalidate(
-        self, provider_id: str | None = None, *, umo: str | None = None
+        self, provider_id: str | None = None, *, umo: str | None = None,
     ) -> None:
         if provider_id is None:
             self._store.clear()
@@ -106,7 +106,7 @@ def _register_provider_change_hook(self) -> None:
             register_change_hook(self._on_provider_manager_changed)
 
     def invalidate_provider_models_cache(
-        self, provider_id: str | None = None, *, umo: str | None = None
+        self, provider_id: str | None = None, *, umo: str | None = None,
     ) -> None:
         """Public hook for cache invalidation on external provider config changes."""
         self._model_cache.invalidate(provider_id, umo=umo)
@@ -198,14 +198,14 @@ def _resolve_model_name(
         for candidate in models:
             cand_norm = candidate.casefold()
             if cand_norm.endswith(f"/{requested_norm}") or cand_norm.endswith(
-                f":{requested_norm}"
+                f":{requested_norm}",
             ):
                 return candidate
 
         return None
 
     def _apply_model(
-        self, prov: Provider, model_name: str, *, umo: str | None = None
+        self, prov: Provider, model_name: str, *, umo: str | None = None,
     ) -> str:
         prov.set_model(model_name)
         self.invalidate_provider_models_cache(prov.meta().id, umo=umo)
@@ -287,7 +287,7 @@ async def _test_provider_capability(self, provider):
             err_code = "TEST_FAILED"
             err_reason = safe_error("", e)
             self._log_reachability_failure(
-                provider, provider_capability_type, err_code, err_reason
+                provider, provider_capability_type, err_code, err_reason,
             )
             return False, err_code, err_reason
 
@@ -339,7 +339,7 @@ async def fetch_models(
                     return provider, None, err
 
         results = await asyncio.gather(
-            *(fetch_models(provider) for provider in all_providers)
+            *(fetch_models(provider) for provider in all_providers),
         )
         failed_provider_errors: list[tuple[str, str]] = []
         for provider, models, err in results:
@@ -405,8 +405,8 @@ async def provider(
                 if all_providers:
                     await event.send(
                         MessageEventResult().message(
-                            "正在进行提供商可达性测试，请稍候..."
-                        )
+                            "正在进行提供商可达性测试，请稍候...",
+                        ),
                     )
                 check_results = await asyncio.gather(
                     *[self._test_provider_capability(p) for p, _ in all_providers],
@@ -463,7 +463,7 @@ async def provider(
                         "info": info,
                         "mark": mark,
                         "provider": p,
-                    }
+                    },
                 )
 
             # 分组输出
@@ -558,7 +558,7 @@ async def provider(
             event.set_result(MessageEventResult().message("无效的参数。"))
 
     async def _switch_model_by_name(
-        self, message: AstrMessageEvent, model_name: str, prov: Provider
+        self, message: AstrMessageEvent, model_name: str, prov: Provider,
     ) -> None:
         model_name = model_name.strip()
         if not model_name:
@@ -583,7 +583,7 @@ async def _switch_model_by_name(
         if matched_model_name is not None:
             message.set_result(
                 MessageEventResult().message(
-                    self._apply_model(prov, matched_model_name, umo=umo)
+                    self._apply_model(prov, matched_model_name, umo=umo),
                 ),
             )
             return
@@ -620,7 +620,7 @@ async def _switch_model_by_name(
         except Exception as e:
             message.set_result(
                 MessageEventResult().message(
-                    safe_error("跨提供商切换并设置模型失败: ", e)
+                    safe_error("跨提供商切换并设置模型失败: ", e),
                 ),
             )
 
@@ -655,7 +655,7 @@ async def model_ls(
             curr_model = prov.get_model() or "无"
             parts.append(f"\n当前模型: [{curr_model}]")
             parts.append(
-                "\nTips: 使用 /model <模型名/编号> 切换模型。输入模型名时可自动跨提供商查找并切换；跨提供商也可使用 /provider 切换。"
+                "\nTips: 使用 /model <模型名/编号> 切换模型。输入模型名时可自动跨提供商查找并切换；跨提供商也可使用 /provider 切换。",
             )
 
             ret = "".join(parts)
@@ -680,13 +680,13 @@ async def model_ls(
                                 prov,
                                 new_model,
                                 umo=message.unified_msg_origin,
-                            )
+                            ),
                         ),
                     )
                 except Exception as e:
                     message.set_result(
                         MessageEventResult().message(
-                            safe_error("切换模型未知错误: ", e)
+                            safe_error("切换模型未知错误: ", e),
                         ),
                     )
                     return
@@ -730,7 +730,7 @@ async def key(self, message: AstrMessageEvent, index: int | None = None) -> None
                 except Exception as e:
                     message.set_result(
                         MessageEventResult().message(
-                            safe_error("切换 Key 未知错误: ", e)
+                            safe_error("切换 Key 未知错误: ", e),
                         ),
                     )
                     return

astrbot/builtin_stars/builtin_commands/main.py

@@ -170,7 +170,7 @@ async def groupnew_conv(self, message: AstrMessageEvent, sid: str) -> None:
 
     @filter.command("switch")
     async def switch_conv(
-        self, message: AstrMessageEvent, index: int | None = None
+        self, message: AstrMessageEvent, index: int | None = None,
     ) -> None:
         """通过 /ls 前面的序号切换对话"""
         await self.conversation_c.switch_conv(message, index)

astrbot/cli/commands/cmd_conf.py

@@ -50,7 +50,7 @@ def _validate_timezone(value: str) -> str:
         zoneinfo.ZoneInfo(value)
     except Exception:
         raise click.ClickException(
-            f"Invalid timezone: {value}. Please use a valid IANA timezone name"
+            f"Invalid timezone: {value}. Please use a valid IANA timezone name",
         )
     return value
 
@@ -59,7 +59,7 @@ def _validate_callback_api_base(value: str) -> str:
     """Validate callback API base URL"""
     if not value.startswith("http://") and not value.startswith("https://"):
         raise click.ClickException(
-            "Callback API base must start with http:// or https://"
+            "Callback API base must start with http:// or https://",
         )
     return value
 

astrbot/cli/commands/cmd_init.py

@@ -48,7 +48,7 @@ def init() -> None:
             click.echo("Done! You can now run 'astrbot run' to start AstrBot")
     except Timeout:
         raise click.ClickException(
-            "Cannot acquire lock file. Please check if another instance is running"
+            "Cannot acquire lock file. Please check if another instance is running",
         )
 
     except Exception as e: