From b2b0a02b60a7855406c8b63768734b61b186de3c Mon Sep 17 00:00:00 2001 From: yupix Date: Tue, 5 Dec 2023 15:53:26 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20import=E3=81=AE=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mipac/abstract/action.py | 3 +-- mipac/actions/channel.py | 5 +++-- mipac/actions/drive/files.py | 2 +- mipac/actions/drive/folders.py | 2 +- mipac/actions/federation.py | 2 +- mipac/actions/user.py | 14 ++------------ mipac/manager/drive/files.py | 2 +- mipac/manager/drive/folders.py | 6 +++++- mipac/manager/invite.py | 2 +- mipac/models/admin.py | 2 +- mipac/models/channel.py | 4 ++-- mipac/models/drive.py | 2 +- mipac/models/lite/role.py | 1 + mipac/models/lite/user.py | 2 +- mipac/models/mute.py | 2 +- mipac/models/roles.py | 2 +- mipac/models/user.py | 20 ++++++++++---------- mipac/types/announcement.py | 2 +- mipac/types/channel.py | 1 - mipac/utils/cache.py | 5 ++--- 20 files changed, 37 insertions(+), 44 deletions(-) diff --git a/mipac/abstract/action.py b/mipac/abstract/action.py index 5531fba..2800784 100644 --- a/mipac/abstract/action.py +++ b/mipac/abstract/action.py @@ -3,10 +3,9 @@ from __future__ import annotations 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",) diff --git a/mipac/actions/channel.py b/mipac/actions/channel.py index 5ce60b0..c97cd0f 100644 --- a/mipac/actions/channel.py +++ b/mipac/actions/channel.py @@ -1,6 +1,7 @@ from __future__ import annotations from typing import TYPE_CHECKING, AsyncGenerator, Literal + from typing_extensions import override from mipac.abstract.action import AbstractAction @@ -8,14 +9,14 @@ 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 diff --git a/mipac/actions/drive/files.py b/mipac/actions/drive/files.py index 3a6d0f9..35acf96 100644 --- a/mipac/actions/drive/files.py +++ b/mipac/actions/drive/files.py @@ -6,7 +6,7 @@ from mipac.abstract.action import AbstractAction 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 diff --git a/mipac/actions/drive/folders.py b/mipac/actions/drive/folders.py index 1aa9a5e..391f186 100644 --- a/mipac/actions/drive/folders.py +++ b/mipac/actions/drive/folders.py @@ -2,8 +2,8 @@ from __future__ import annotations 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 diff --git a/mipac/actions/federation.py b/mipac/actions/federation.py index 53d5d9b..91bd06e 100644 --- a/mipac/actions/federation.py +++ b/mipac/actions/federation.py @@ -6,7 +6,7 @@ from mipac.abstract.action import AbstractAction 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 diff --git a/mipac/actions/user.py b/mipac/actions/user.py index 1c8172a..ece6ddd 100644 --- a/mipac/actions/user.py +++ b/mipac/actions/user.py @@ -2,25 +2,15 @@ from __future__ import annotations 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 diff --git a/mipac/manager/drive/files.py b/mipac/manager/drive/files.py index 3732656..7c23285 100644 --- a/mipac/manager/drive/files.py +++ b/mipac/manager/drive/files.py @@ -3,7 +3,7 @@ from __future__ import annotations 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: diff --git a/mipac/manager/drive/folders.py b/mipac/manager/drive/folders.py index 31e7094..decab5a 100644 --- a/mipac/manager/drive/folders.py +++ b/mipac/manager/drive/folders.py @@ -3,7 +3,11 @@ from __future__ import annotations 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: diff --git a/mipac/manager/invite.py b/mipac/manager/invite.py index 34a8ee0..884f657 100644 --- a/mipac/manager/invite.py +++ b/mipac/manager/invite.py @@ -3,7 +3,7 @@ from __future__ import annotations 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: diff --git a/mipac/models/admin.py b/mipac/models/admin.py index eecaab6..3037f94 100644 --- a/mipac/models/admin.py +++ b/mipac/models/admin.py @@ -4,7 +4,7 @@ from datetime import datetime 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, diff --git a/mipac/models/channel.py b/mipac/models/channel.py index 8af1281..b80108e 100644 --- a/mipac/models/channel.py +++ b/mipac/models/channel.py @@ -1,6 +1,6 @@ from __future__ import annotations -from datetime import datetime +from datetime import datetime from typing import TYPE_CHECKING from mipac.models.note import Note @@ -8,8 +8,8 @@ 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: diff --git a/mipac/models/drive.py b/mipac/models/drive.py index ca667fc..41e6660 100644 --- a/mipac/models/drive.py +++ b/mipac/models/drive.py @@ -9,8 +9,8 @@ from mipac.types.drive import IDriveStatus 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"] diff --git a/mipac/models/lite/role.py b/mipac/models/lite/role.py index 936921f..1b82bc1 100644 --- a/mipac/models/lite/role.py +++ b/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: diff --git a/mipac/models/lite/user.py b/mipac/models/lite/user.py index 541bf41..c119146 100644 --- a/mipac/models/lite/user.py +++ b/mipac/models/lite/user.py @@ -3,7 +3,7 @@ from __future__ import annotations 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: diff --git a/mipac/models/mute.py b/mipac/models/mute.py index 628c95f..a7f8e6c 100644 --- a/mipac/models/mute.py +++ b/mipac/models/mute.py @@ -3,7 +3,7 @@ from __future__ import annotations 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: diff --git a/mipac/models/roles.py b/mipac/models/roles.py index 3a07cff..c9283d8 100644 --- a/mipac/models/roles.py +++ b/mipac/models/roles.py @@ -5,7 +5,7 @@ from typing import TYPE_CHECKING 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 diff --git a/mipac/models/user.py b/mipac/models/user.py index 5960540..8185059 100644 --- a/mipac/models/user.py +++ b/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 diff --git a/mipac/types/announcement.py b/mipac/types/announcement.py index b509c82..e88493f 100644 --- a/mipac/types/announcement.py +++ b/mipac/types/announcement.py @@ -1,4 +1,4 @@ -from typing import TypedDict, NotRequired +from typing import NotRequired, TypedDict class IAnnouncement(TypedDict): diff --git a/mipac/types/channel.py b/mipac/types/channel.py index c8a044b..f6f11e6 100644 --- a/mipac/types/channel.py +++ b/mipac/types/channel.py @@ -1,6 +1,5 @@ from typing import NotRequired, TypedDict - from mipac.types.note import INote diff --git a/mipac/utils/cache.py b/mipac/utils/cache.py index ad45c48..863d3b2 100644 --- a/mipac/utils/cache.py +++ b/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)