Develop: 完全使用 ruff 替代 isort 与 black (#1757)

* 🚨 完全使用 ruff 替代 isort 与 black

* 🚨 ruff lint&format

zhenxun/builtin_plugins/web_ui/api/logs/log_manager.py

@@ -1,6 +1,6 @@
 import asyncio
+from collections.abc import Awaitable, Callable
 from typing import Generic, TypeVar
-from collections.abc import Callable, Awaitable
 
 _T = TypeVar("_T")
 LogListener = Callable[[_T], Awaitable[None]]

zhenxun/builtin_plugins/web_ui/api/logs/logs.py

@@ -1,7 +1,7 @@
-from loguru import logger
 from fastapi import APIRouter
+from loguru import logger
 from nonebot.utils import escape_tag
-from starlette.websockets import WebSocket, WebSocketState, WebSocketDisconnect
+from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState
 
 from .log_manager import LOG_STORAGE
 

zhenxun/builtin_plugins/web_ui/api/tabs/__init__.py

@@ -1,5 +1,5 @@
-from .database import *
-from .main import *
-from .manage import *
-from .plugin_manage import *
-from .system import *
+from .database import *  # noqa: F403
+from .main import *  # noqa: F403
+from .manage import *  # noqa: F403
+from .plugin_manage import *  # noqa: F403
+from .system import *  # noqa: F403

zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/__init__.py

@@ -1,21 +1,21 @@
 from datetime import datetime, timedelta
 
+from fastapi import APIRouter
+from fastapi.responses import JSONResponse
 import nonebot
 from nonebot import require
-from fastapi import APIRouter
 from nonebot.config import Config
-from tortoise.functions import Count
 from tortoise.expressions import RawSQL
-from fastapi.responses import JSONResponse
+from tortoise.functions import Count
 
-from zhenxun.models.statistics import Statistics
-from zhenxun.models.chat_history import ChatHistory
+from builtin_plugins.web_ui.base_model import BaseResultModel, QueryModel, Result
+from builtin_plugins.web_ui.utils import authentication
 from zhenxun.models.bot_connect_log import BotConnectLog
+from zhenxun.models.chat_history import ChatHistory
+from zhenxun.models.statistics import Statistics
 
 from .data_source import BotManage
-from ....utils import authentication
-from ....base_model import Result, QueryModel, BaseResultModel
-from .model import BotInfo, ChatCallMonthCount, QueryChatCallCount, AllChatAndCallCount
+from .model import AllChatAndCallCount, BotInfo, ChatCallMonthCount, QueryChatCallCount
 
 require("plugin_store")
 

zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py

@@ -1,16 +1,16 @@
-import time
 from datetime import datetime, timedelta
+import time
 
 import nonebot
 from nonebot.adapters import Bot
 from nonebot.drivers import Driver
 
+from builtin_plugins.web_ui.api.tabs.main.data_source import bot_live
+from zhenxun.models.chat_history import ChatHistory
 from zhenxun.models.statistics import Statistics
 from zhenxun.utils.platform import PlatformUtils
-from zhenxun.models.chat_history import ChatHistory
 
 from .model import BotInfo
-from ..main.data_source import bot_live
 
 driver: Driver = nonebot.get_driver()
 

zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py

@@ -1,18 +1,18 @@
-import nonebot
-from tortoise import Tortoise
-from nonebot.drivers import Driver
-from fastapi import Request, APIRouter
+from fastapi import APIRouter, Request
 from fastapi.responses import JSONResponse
+import nonebot
+from nonebot.drivers import Driver
+from tortoise import Tortoise
 from tortoise.exceptions import OperationalError
 
+from builtin_plugins.web_ui.base_model import BaseResultModel, QueryModel, Result
+from builtin_plugins.web_ui.utils import authentication
 from zhenxun.configs.config import BotConfig
-from zhenxun.models.task_info import TaskInfo
 from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.models.task_info import TaskInfo
 
+from .models.model import Column, SqlModel, SqlText
 from .models.sql_log import SqlLog
-from ....utils import authentication
-from .models.model import Column, SqlText, SqlModel
-from ....base_model import Result, QueryModel, BaseResultModel
 
 router = APIRouter(prefix="/database")
 

zhenxun/builtin_plugins/web_ui/api/tabs/main/__init__.py

@@ -1,35 +1,35 @@
-import time
 import asyncio
 import contextlib
-from pathlib import Path
 from datetime import datetime, timedelta
+from pathlib import Path
+import time
 
-import nonebot
 from fastapi import APIRouter
-from nonebot.config import Config
-from tortoise.functions import Count
 from fastapi.responses import JSONResponse
-from websockets.exceptions import ConnectionClosedOK, ConnectionClosedError
-from starlette.websockets import WebSocket, WebSocketState, WebSocketDisconnect
+import nonebot
+from nonebot.config import Config
+from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState
+from tortoise.functions import Count
+from websockets.exceptions import ConnectionClosedError, ConnectionClosedOK
 
-from zhenxun.services.log import logger
-from zhenxun.models.statistics import Statistics
-from zhenxun.utils.platform import PlatformUtils
-from zhenxun.models.plugin_info import PluginInfo
+from builtin_plugins.web_ui.base_model import Result
+from builtin_plugins.web_ui.config import AVA_URL, GROUP_AVA_URL, QueryDateType
+from builtin_plugins.web_ui.utils import authentication, get_system_status
+from zhenxun.models.bot_connect_log import BotConnectLog
 from zhenxun.models.chat_history import ChatHistory
 from zhenxun.models.group_console import GroupConsole
-from zhenxun.models.bot_connect_log import BotConnectLog
+from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.models.statistics import Statistics
+from zhenxun.services.log import logger
+from zhenxun.utils.platform import PlatformUtils
 
-from ....base_model import Result
 from .data_source import bot_live
-from ....utils import authentication, get_system_status
-from ....config import AVA_URL, GROUP_AVA_URL, QueryDateType
 from .model import (
+    ActiveGroup,
     BaseInfo,
     HotPlugin,
-    QueryCount,
-    ActiveGroup,
     NonebotData,
+    QueryCount,
     TemplateBaseInfo,
 )
 

zhenxun/builtin_plugins/web_ui/api/tabs/main/data_source.py

@@ -1,8 +1,8 @@
 import time
 
 import nonebot
-from nonebot.drivers import Driver
 from nonebot.adapters.onebot.v11 import Bot
+from nonebot.drivers import Driver
 
 driver: Driver = nonebot.get_driver()
 

zhenxun/builtin_plugins/web_ui/api/tabs/main/model.py

@@ -1,6 +1,6 @@
-from pydantic import BaseModel
 from nonebot.adapters import Bot
 from nonebot.config import Config
+from pydantic import BaseModel
 
 
 class SystemStatus(BaseModel):

zhenxun/builtin_plugins/web_ui/api/tabs/manage/__init__.py

@@ -1,41 +1,41 @@
-import nonebot
 from fastapi import APIRouter
-from tortoise.functions import Count
 from fastapi.responses import JSONResponse
+import nonebot
 from nonebot.adapters.onebot.v11 import ActionFailed
+from tortoise.functions import Count
 
-from zhenxun.services.log import logger
+from builtin_plugins.web_ui.base_model import Result
+from builtin_plugins.web_ui.config import AVA_URL, GROUP_AVA_URL
+from builtin_plugins.web_ui.utils import authentication
 from zhenxun.configs.config import BotConfig
-from zhenxun.models.task_info import TaskInfo
-from zhenxun.models.fg_request import FgRequest
-from zhenxun.models.statistics import Statistics
-from zhenxun.utils.platform import PlatformUtils
 from zhenxun.models.ban_console import BanConsole
-from zhenxun.models.plugin_info import PluginInfo
-from zhenxun.utils.exception import NotFoundError
 from zhenxun.models.chat_history import ChatHistory
+from zhenxun.models.fg_request import FgRequest
 from zhenxun.models.group_console import GroupConsole
-from zhenxun.utils.enum import RequestType, RequestHandleType
+from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.models.statistics import Statistics
+from zhenxun.models.task_info import TaskInfo
+from zhenxun.services.log import logger
+from zhenxun.utils.enum import RequestHandleType, RequestType
+from zhenxun.utils.exception import NotFoundError
+from zhenxun.utils.platform import PlatformUtils
 
-from ....base_model import Result
-from ....utils import authentication
-from ....config import AVA_URL, GROUP_AVA_URL
 from .model import (
-    Task,
-    Friend,
-    Plugin,
-    ReqResult,
-    LeaveGroup,
-    UserDetail,
-    GroupDetail,
-    GroupResult,
-    SendMessage,
-    UpdateGroup,
     ClearRequest,
     DeleteFriend,
-    HandleRequest,
-    GroupRequestResult,
+    Friend,
     FriendRequestResult,
+    GroupDetail,
+    GroupRequestResult,
+    GroupResult,
+    HandleRequest,
+    LeaveGroup,
+    Plugin,
+    ReqResult,
+    SendMessage,
+    Task,
+    UpdateGroup,
+    UserDetail,
 )
 
 router = APIRouter(prefix="/manage")

zhenxun/builtin_plugins/web_ui/api/tabs/manage/chat.py

@@ -1,15 +1,15 @@
-import nonebot
 from fastapi import APIRouter
+import nonebot
 from nonebot import on_message
-from nonebot_plugin_session import EventSession
 from nonebot.adapters.onebot.v11 import MessageEvent
-from nonebot_plugin_alconna import At, Text, Hyper, Image, UniMsg
-from starlette.websockets import WebSocket, WebSocketState, WebSocketDisconnect
+from nonebot_plugin_alconna import At, Hyper, Image, Text, UniMsg
+from nonebot_plugin_session import EventSession
+from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState
 
-from zhenxun.utils.depends import UserName
+from builtin_plugins.web_ui.config import AVA_URL
 from zhenxun.models.group_member_info import GroupInfoUser
+from zhenxun.utils.depends import UserName
 
-from ....config import AVA_URL
 from .model import Message, MessageItem
 
 driver = nonebot.get_driver()

zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/__init__.py

@@ -1,21 +1,21 @@
 import re
 
 import cattrs
-from fastapi import Query, APIRouter
+from fastapi import APIRouter, Query
 from fastapi.responses import JSONResponse
 
-from zhenxun.services.log import logger
+from builtin_plugins.web_ui.base_model import Result
+from builtin_plugins.web_ui.utils import authentication
 from zhenxun.configs.config import Config
-from zhenxun.utils.enum import BlockType, PluginType
 from zhenxun.models.plugin_info import PluginInfo as DbPluginInfo
+from zhenxun.services.log import logger
+from zhenxun.utils.enum import BlockType, PluginType
 
-from ....base_model import Result
-from ....utils import authentication
 from .model import (
-    PluginInfo,
-    PluginCount,
     PluginConfig,
+    PluginCount,
     PluginDetail,
+    PluginInfo,
     PluginSwitch,
     UpdatePlugin,
 )

zhenxun/builtin_plugins/web_ui/api/tabs/plugin_manage/store.py

@@ -1,12 +1,12 @@
-from nonebot import require
 from fastapi import APIRouter
 from fastapi.responses import JSONResponse
+from nonebot import require
 
+from builtin_plugins.web_ui.base_model import Result
+from builtin_plugins.web_ui.utils import authentication
 from zhenxun.models.plugin_info import PluginInfo
 
 from .model import PluginIr
-from ....base_model import Result
-from ....utils import authentication
 
 router = APIRouter(prefix="/store")
 

zhenxun/builtin_plugins/web_ui/api/tabs/system/__init__.py

@@ -1,16 +1,16 @@
 import os
-import shutil
 from pathlib import Path
+import shutil
 
 import aiofiles
 from fastapi import APIRouter
 from fastapi.responses import JSONResponse
 
+from builtin_plugins.web_ui.base_model import Result, SystemFolderSize
+from builtin_plugins.web_ui.utils import authentication, get_system_disk
 from zhenxun.utils._build_image import BuildImage
 
-from ....base_model import Result, SystemFolderSize
-from ....utils import authentication, get_system_disk
-from .model import AddFile, DirFile, SaveFile, DeleteFile, RenameFile
+from .model import AddFile, DeleteFile, DirFile, RenameFile, SaveFile
 
 router = APIRouter(prefix="/system")
 

zhenxun/builtin_plugins/web_ui/api/tabs/system/model.py

@@ -1,6 +1,3 @@
-from datetime import datetime
-from typing import Literal, Optional
-
 from pydantic import BaseModel
 
 
@@ -15,7 +12,7 @@ class DirFile(BaseModel):
     """是否为图片"""
     name: str
     """文件夹或文件名称"""
-    parent: Optional[str] = None
+    parent: str | None = None
     """父级"""
 
 
@@ -33,7 +30,7 @@ class RenameFile(BaseModel):
     删除文件
     """
 
-    parent: Optional[str]
+    parent: str | None
     """父路径"""
     old_name: str
     """旧名称"""
@@ -46,7 +43,7 @@ class AddFile(BaseModel):
     新建文件
     """
 
-    parent: Optional[str]
+    parent: str | None
     """父路径"""
     name: str
     """新名称"""