chore: コードのフォーマット

mipac/manager/__init__.py

@@ -1,34 +1,16 @@
-from .ad import AdminAdvertisingManager
-from .chart import ChartManager
-from .chat import ChatManager
-from .client import ClientActions
-from .drive import DriveManager, FileManager, FolderManager
-from .emoji import AdminEmojiManager
-from .favorite import FavoriteManager
-from .file import MiFile
-from .follow import FollowManager, FollowRequestManager
-from .moderator import AdminModeratorManager
-from .note import NoteManager
-from .page import PagesManager
-from .reaction import ReactionManager
-from .user import UserManager
+# noqa: F403, F401
 
-__all__ = (
-    'AdminAdvertisingManager',
-    'ChartManager',
-    'ChatManager',
-    'ClientActions',
-    'FolderManager',
-    'FileManager',
-    'DriveManager',
-    'AdminEmojiManager',
-    'FavoriteManager',
-    'MiFile',
-    'FollowManager',
-    'FollowRequestManager',
-    'AdminModeratorManager',
-    'NoteManager',
-    'PagesManager',
-    'ReactionManager',
-    'UserManager',
-)
+from .ad import *
+from .chart import *
+from .chat import *
+from .client import *
+from .drive import *
+from .emoji import *
+from .favorite import *
+from .file import *
+from .follow import *
+from .moderator import *
+from .note import *
+from .page import *
+from .reaction import *
+from .user import *

mipac/manager/ad.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from mipac import AbstractManager
+from mipac.abc.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:

mipac/manager/admin/user.py

@@ -112,7 +112,7 @@ class AdminUserManager:
 
         user_id = user_id or self.__user_id
         data = {'userId': user_id}
-        res = await self.__session.request(
+        res: bool = await self.__session.request(
             Route('POST', '/api/admin/unsuspend-user'),
             json=data,
             auth=True,

mipac/manager/chart.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from mipac import AbstractManager
+from mipac.abc.manager import AbstractManager
 from mipac.core.models.chart import RawActiveUsersChart, RawDriveChart
 from mipac.http import HTTPClient, Route
 

mipac/manager/chat.py

@@ -9,6 +9,7 @@ from mipac.util import check_multi_arg
 
 if TYPE_CHECKING:
     from mipac.manager.client import ClientActions
+    from mipac.types.chat import IChatMessage
 
 __all__ = ('ChatManager',)
 
@@ -47,7 +48,7 @@ class ChatManager:
             raise ParameterError('limit must be greater than 100')
 
         args = {'limit': limit, 'group': group}
-        data = await self.__session.request(
+        data: list[IChatMessage] = await self.__session.request(
             Route('POST', '/api/messaging/history'), json=args, auth=True
         )
         return [ChatMessage(d, client=self.__client) for d in data]

mipac/manager/client.py

@@ -7,7 +7,6 @@ from mipac.http import HTTPClient
 from mipac.manager.chart import ChartManager
 from mipac.manager.chat import ChatManager
 from mipac.manager.drive import DriveManager
-from mipac.manager.modeler import Modeler
 from mipac.manager.note import NoteManager
 from mipac.manager.reaction import ReactionManager
 from mipac.manager.user import UserManager
@@ -32,7 +31,6 @@ class ClientActions:
         )
         self.chart: ChartManager = ChartManager(session=session, client=self)
         self._config: Config = config
-        self._modeler: Modeler = Modeler(self)
 
     def _create_user_instance(self, user: UserDetailed) -> UserManager:
         return UserManager(session=self.__session, client=self, user=user)

mipac/manager/drive.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac import AbstractManager
+from mipac.abc.manager import AbstractManager
 from mipac.actions.drive import DriveActions, FileActions, FolderActions
 from mipac.http import HTTPClient
 

mipac/manager/emoji.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac import AbstractManager
+from mipac.abc.manager import AbstractManager
 from mipac.exception import NotExistRequiredData
 from mipac.http import HTTPClient, Route
 from mipac.util import check_multi_arg

mipac/manager/favorite.py

@@ -2,14 +2,12 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac import AbstractManager
+from mipac.abc.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:
     from mipac.client import ClientActions
 
-__all__ = 'FavoriteManager'
-
 
 class FavoriteManager(AbstractManager):
     def __init__(

mipac/manager/file.py

@@ -1,7 +1,5 @@
 from typing import Optional
 
-__all__ = 'MiFile'
-
 
 class MiFile:
     __slots__ = (

mipac/manager/follow.py

@@ -2,12 +2,13 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac import AbstractManager
+from mipac.abc.manager import AbstractManager
 from mipac.http import HTTPClient, Route
+from mipac.models.user import FollowRequest, UserDetailed
+from mipac.types.user import IFollowRequest
 
 if TYPE_CHECKING:
     from mipac.client import ClientActions
-    from mipac.models.user import FollowRequest, UserDetailed
 
 __all__ = ('FollowManager', 'FollowRequestManager')
 
@@ -91,14 +92,12 @@ class FollowRequestManager(AbstractManager):
         未承認のフォローリクエストを取得します
         """
 
-        return [
-            self.__client._modeler.new_follow_request(i['follower'])
-            for i in await self.__session.request(
-                Route('POST', '/api/following/requests/list'),
-                auth=True,
-                lower=True,
-            )
-        ]
+        res: list[IFollowRequest] = await self.__session.request(
+            Route('POST', '/api/following/requests/list'),
+            auth=True,
+            lower=True,
+        )
+        return [FollowRequest(request=i, client=self.__client) for i in res]
 
     async def get_user(self, user_id: Optional[str] = None) -> UserDetailed:
         """

mipac/manager/modeler.py

@@ -1,24 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any
-
-from mipac.models.user import FollowRequest, UserDetailed
-
-if TYPE_CHECKING:
-    from mipac.core import RawUser
-    from mipac.manager.client import ClientActions
-
-
-class Modeler:
-    """
-    モデルを循環インポート無しでインスタンス化するためのクラスです
-    """
-
-    def __init__(self, client: ClientActions) -> None:
-        self._client = client
-
-    def create_user_instance(self, raw_user: RawUser) -> UserDetailed:
-        return UserDetailed(raw_user, client=self._client)
-
-    def new_follow_request(self, raw_follow_request: Any) -> FollowRequest:
-        return FollowRequest(raw_follow_request)

mipac/manager/moderator.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac import AbstractManager
+from mipac.abc.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:

mipac/manager/note.py

@@ -2,15 +2,13 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac import AbstractManager
+from mipac.abc.manager import AbstractManager
 from mipac.actions.note import NoteActions
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:
     from mipac.manager.client import ClientActions
 
-__all__ = 'NoteManager'
-
 
 class NoteManager(AbstractManager):
     """User behavior for notes"""

mipac/manager/page.py

@@ -2,14 +2,12 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac import AbstractManager
+from mipac.abc.manager import AbstractManager
 from mipac.http import HTTPClient, Route
 
 if TYPE_CHECKING:
     from mipac.client import ClientActions
 
-__all__ = 'PagesManager'
-
 
 class PagesManager(AbstractManager):
     def __init__(self, *, session: HTTPClient, client: ClientActions):

mipac/manager/reaction.py

@@ -13,8 +13,6 @@ if TYPE_CHECKING:
     from mipac.client import ClientActions
     from mipac.models.note import NoteReaction
 
-__all__ = 'ReactionManager'
-
 
 class ReactionManager(AbstractManager):
     def __init__(

mipac/manager/user.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Optional
 
-from mipac import AbstractManager
+from mipac.abc.manager import AbstractManager
 from mipac.actions.user import UserActions
 from mipac.http import HTTPClient
 

mipac/models/__init__.py

@@ -1,7 +1,7 @@
 from .drive import File, FileProperties, Folder
 from .note import Follow, Header, Note, NoteReaction, Poll
 from .notification import Reaction
-from .user import Followee, FollowRequest, UserDetailed
+from .user import FollowRequest, UserDetailed
 
 __all__ = (
     'FileProperties',
@@ -9,7 +9,6 @@ __all__ = (
     'Folder',
     'UserDetailed',
     'FollowRequest',
-    'Followee',
     'Note',
     'Poll',
     'Reaction',

mipac/models/note.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Literal, Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, Literal, Optional
 
 from typing_extensions import Self
 
@@ -171,7 +171,7 @@ class Note:
 
     @property
     def visibility(
-            self,
+        self,
     ) -> Literal['public', 'home', 'followers', 'specified']:
         return self.__note['visibility']
 
@@ -245,7 +245,11 @@ class Note:
 
     @property
     def poll(self) -> Poll | None:
-        return Poll(self.__note['poll'], client=self._client) if 'poll' in self.__note else None
+        return (
+            Poll(self.__note['poll'], client=self._client)
+            if 'poll' in self.__note
+            else None
+        )
 
     @property
     def action(self) -> NoteActions:

mipac/models/poll.py

@@ -41,4 +41,6 @@ class Poll:
 
     @property
     def choices(self) -> list[PollChoice]:
-        return [PollChoice(i, client=self.__client) for i in self.__poll['choices']]
+        return [
+            PollChoice(i, client=self.__client) for i in self.__poll['choices']
+        ]

mipac/models/user.py

@@ -1,21 +1,36 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Literal, TYPE_CHECKING
+from typing import TYPE_CHECKING, Literal
 
 from mipac.models.lite.user import LiteUser
 from mipac.models.note import Note
 from mipac.types.page import IPage
-from mipac.types.user import (
-    IUserDetailed,
-    IUserDetailedField,
-)
+from mipac.types.user import IFollowRequest, IUserDetailed, IUserDetailedField
 
 if TYPE_CHECKING:
     from mipac.actions.user import UserActions
     from mipac.manager.client import ClientActions
 
-__all__ = ['UserDetailed']
+__all__ = ('UserDetailed', 'FollowRequest')
+
+
+class FollowRequest:
+    def __init__(self, request: IFollowRequest, *, client: ClientActions):
+        self.__request: IFollowRequest = request
+        self.__client: ClientActions = client
+
+    @property
+    def id(self) -> str:
+        return self.__request['id']
+
+    @property
+    def follower(self) -> LiteUser:
+        return LiteUser(self.__request['follower'])
+
+    @property
+    def followee(self) -> LiteUser:
+        return LiteUser(self.__request['followee'])
 
 
 class UserDetailed(LiteUser):

mipac/types/__init__.py

@@ -13,12 +13,7 @@ from mipac.types.instance import (
     OptionalInstance,
     OptionalMeta,
 )
-from mipac.types.note import (
-    GeoPayload,
-    INote,
-    INoteReaction,
-    INoteRequired,
-)
+from mipac.types.note import GeoPayload, INote, INoteReaction, INoteRequired
 from mipac.types.page import (
     AttachedFilePayload,
     EyeCatchingImagePayload,

mipac/types/note.py

@@ -5,13 +5,6 @@ from .emoji import ICustomEmojiLite
 from .poll import IPoll
 from .user import IUserLite
 
-__all__ = (
-    'INoteRequired',
-    'INote',
-    'GeoPayload',
-    'INoteReaction',
-)
-
 
 class GeoPayload(TypedDict):
     """
@@ -25,6 +18,7 @@ class GeoPayload(TypedDict):
     heading: Optional[int]
     speed: Optional[int]
 
+
 class INoteRequired(TypedDict):
     id: str
     created_at: str

mipac/types/user.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import List, Literal, TYPE_CHECKING, TypedDict
+from typing import TYPE_CHECKING, List, Literal, TypedDict
 
 if TYPE_CHECKING:
     from mipac.types.channel import IChannel
@@ -75,3 +75,9 @@ class IUserDetailed(IUserDetailedRequired, total=False):
     updated_at: str
     uri: str
     url: str
+
+
+class IFollowRequest(TypedDict):
+    id: str
+    follower: IUserLite
+    followee: IUserLite