chore: importの整理

mipac/abstract/action.py

@@ -3,10 +3,9 @@
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING
 
-
 if TYPE_CHECKING:
-    from mipac.manager.client import ClientManager
     from mipac.http import HTTPClient
+    from mipac.manager.client import ClientManager
 
 
 __all__ = ("AbstractAction",)

mipac/actions/channel.py

@@ -1,21 +1,22 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, AsyncGenerator, Literal
+
 from typing_extensions import override
 
 from mipac.abstract.action import AbstractAction
 from mipac.file import MiFile
 from mipac.http import HTTPClient, Route
 from mipac.models.channel import Channel
 from mipac.models.drive import File
+from mipac.models.note import Note
 from mipac.models.poll import MiPoll
 from mipac.types.channel import IChannel
 from mipac.types.note import INote, INoteVisibility
 from mipac.types.reaction import IReactionAcceptance
 from mipac.utils.format import remove_dict_missing
-from mipac.utils.util import MISSING, credentials_required
-from mipac.models.note import Note
 from mipac.utils.pagination import Pagination
+from mipac.utils.util import MISSING, credentials_required
 
 if TYPE_CHECKING:
     from mipac.client import ClientManager

mipac/actions/drive/files.py

@@ -6,7 +6,7 @@
 from mipac.http import HTTPClient, Route
 from mipac.models.drive import File
 from mipac.models.note import Note
-from mipac.types.drive import IFile, IDriveSort
+from mipac.types.drive import IDriveSort, IFile
 from mipac.types.note import INote
 from mipac.utils.format import bool_to_string, remove_dict_missing
 from mipac.utils.util import MISSING, credentials_required

mipac/actions/drive/folders.py

@@ -2,8 +2,8 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.http import HTTPClient, Route
 from mipac.abstract.action import AbstractAction
+from mipac.http import HTTPClient, Route
 from mipac.models.drive import File, Folder
 from mipac.types.drive import IFolder
 from mipac.utils.format import remove_dict_missing

mipac/actions/federation.py

@@ -6,7 +6,7 @@
 from mipac.errors.base import ParameterError
 from mipac.http import HTTPClient, Route
 from mipac.models.instance import FederationInstance
-from mipac.models.user import UserDetailedNotMe, MeDetailed, packed_user
+from mipac.models.user import MeDetailed, UserDetailedNotMe, packed_user
 from mipac.types.follow import IFederationFollower, IFederationFollowing
 from mipac.types.instance import IFederationInstance, IFederationInstanceStat
 from mipac.types.user import IUserDetailed

mipac/actions/user.py

@@ -2,25 +2,15 @@
 
 from typing import TYPE_CHECKING, AsyncGenerator, Literal, Optional, overload
 
-from mipac.config import config
 from mipac.errors.base import NotExistRequiredData, ParameterError
 from mipac.http import HTTPClient, Route
 from mipac.models.clip import Clip
 from mipac.models.lite.user import PartialUser
 from mipac.models.note import Note
-from mipac.models.user import (
-    Achievement,
-    MeDetailed,
-    UserDetailedNotMe,
-    packed_user,
-)
+from mipac.models.user import Achievement, MeDetailed, UserDetailedNotMe, packed_user
 from mipac.types.clip import IClip
 from mipac.types.note import INote
-from mipac.types.user import (
-    IMeDetailedSchema,
-    IUser,
-    is_partial_user,
-)
+from mipac.types.user import IMeDetailedSchema, IUser, is_partial_user
 from mipac.utils.cache import cache
 from mipac.utils.format import remove_dict_empty
 from mipac.utils.pagination import Pagination

mipac/manager/drive/files.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 from mipac.abstract.manager import AbstractManager
-from mipac.actions.drive.files import FileActions, ClientFileActions
+from mipac.actions.drive.files import ClientFileActions, FileActions
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:

mipac/manager/drive/folders.py

@@ -3,7 +3,11 @@
 from typing import TYPE_CHECKING
 
 from mipac.abstract.manager import AbstractManager
-from mipac.actions.drive.folders import ClientFileActionsInFolder, FolderActions, ClientFolderActions
+from mipac.actions.drive.folders import (
+    ClientFileActionsInFolder,
+    ClientFolderActions,
+    FolderActions,
+)
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:

mipac/manager/invite.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 from mipac.abstract.manager import AbstractManager
-from mipac.actions.invite import InviteActions, ClientInviteActions
+from mipac.actions.invite import ClientInviteActions, InviteActions
 from mipac.http import HTTPClient
 
 if TYPE_CHECKING:

mipac/models/admin.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 
 from mipac.abstract.model import AbstractModel
-from mipac.models.user import UserDetailedNotMe, MeDetailed, packed_user
+from mipac.models.user import MeDetailed, UserDetailedNotMe, packed_user
 from mipac.types.admin import (
     IIndexStat,
     IModerationLog,

mipac/models/channel.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
-from datetime import datetime
 
+from datetime import datetime
 from typing import TYPE_CHECKING
 
 from mipac.models.note import Note
 from mipac.types.channel import IChannel
 from mipac.utils.format import str_to_datetime
 
 if TYPE_CHECKING:
-    from mipac.manager.channel import ClientChannelManager
     from mipac.manager import ClientManager
+    from mipac.manager.channel import ClientChannelManager
 
 
 class Channel:

mipac/models/drive.py

@@ -9,8 +9,8 @@
 if TYPE_CHECKING:
     from mipac.manager.client import ClientManager
     from mipac.manager.drive.files import ClientFileManager
-    from mipac.types import IFolder, IFile, IFileProperties
     from mipac.manager.drive.folders import ClientFolderManager
+    from mipac.types import IFile, IFileProperties, IFolder
 
 
 __all__ = ["FileProperties", "File", "Folder"]

mipac/models/lite/role.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from typing import TYPE_CHECKING, Generic, TypeVar
+
 from mipac.types.roles import IPartialRole
 
 if TYPE_CHECKING:

mipac/models/lite/user.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING, Generic, TypeVar
 
 from mipac.models.lite.instance import LiteInstance
-from mipac.types.user import IBadgeRole, IPartialUser, IUserOnlineStatus, IAvatarDecoration
+from mipac.types.user import IAvatarDecoration, IBadgeRole, IPartialUser, IUserOnlineStatus
 from mipac.utils.util import deprecated
 
 if TYPE_CHECKING:

mipac/models/mute.py

@@ -3,7 +3,7 @@
 from typing import TYPE_CHECKING
 
 from mipac.abstract.model import AbstractModel
-from mipac.models.user import UserDetailedNotMe, MeDetailed, packed_user
+from mipac.models.user import MeDetailed, UserDetailedNotMe, packed_user
 from mipac.types.mute import IMuteUser
 
 if TYPE_CHECKING:

mipac/models/roles.py

@@ -5,7 +5,7 @@
 
 from mipac.abstract.model import AbstractModel
 from mipac.models.lite.role import PartialRole
-from mipac.models.user import MeDetailed, UserDetailedNotMe, MeDetailed, packed_user
+from mipac.models.user import MeDetailed, UserDetailedNotMe, packed_user
 from mipac.types.roles import IMeRole, IRole, IRolePolicies, IRolePolicieValue, IRoleUser
 from mipac.utils.format import str_to_datetime
 

mipac/models/user.py

@@ -1,32 +1,32 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import TYPE_CHECKING, TypeVar, Generic
+from typing import TYPE_CHECKING, Generic, TypeVar
 
-from mipac.types.meta import IPolicies
 from mipac.abstract.model import AbstractModel
 from mipac.models.announcement import Announcement
 from mipac.models.lite.role import PartialRole
 from mipac.models.lite.user import BadgeRole, PartialUser
 from mipac.models.note import Note
+from mipac.types.meta import IPolicies
 from mipac.types.page import IPage
 from mipac.types.user import (
+    EmailNotificationTypes,
     IAchievement,
     IBlockingUser,
     IFfVisibility,
+    IMeDetailedOnlySchema,
+    IMeDetailedSchema,
+    ITwoFactorBackupCodesStock,
     IUser,
+    IUserDetailedNotMeOnlySchema,
+    IUserDetailedNotMeSchema,
     IUserField,
     IUserNotify,
     IUserRole,
-    is_me_detailed,
-    IUserDetailedNotMeSchema,
-    IMeDetailedOnlySchema,
-    ITwoFactorBackupCodesStock,
-    NotificationRecieveConfig,
-    EmailNotificationTypes,
     IUserSecurityKey,
-    IMeDetailedSchema,
-    IUserDetailedNotMeOnlySchema,
+    NotificationRecieveConfig,
+    is_me_detailed,
     is_user_detailed_not_me,
 )
 from mipac.utils.format import str_to_datetime

mipac/types/announcement.py

@@ -1,4 +1,4 @@
-from typing import TypedDict, NotRequired
+from typing import NotRequired, TypedDict
 
 
 class IAnnouncement(TypedDict):

mipac/types/channel.py

@@ -1,6 +1,5 @@
 from typing import NotRequired, TypedDict
 
-
 from mipac.types.note import INote
 
 

mipac/utils/cache.py

@@ -1,5 +1,4 @@
-from functools import lru_cache
-import functools
+from functools import lru_cache, wraps
 from typing import Any
 
 DEFAULT_CACHE: dict[str, list[str]] = {}
@@ -19,7 +18,7 @@ def set_cache(group: str, key: str, value: Any):
 
 def cache(group: str = "default", override: bool = False):
     def decorator(func):
-        @functools.wraps(func)
+        @wraps(func)
         async def wrapper(self, *args, **kwargs):
             key = cache_key_builder(func, self, *args, **kwargs)
             hit_item = DEFAULT_CACHE_VALUE.get(key)