feat!: AbstractModelを廃止

mipac/abstract/__init__.py

@@ -1,3 +1,2 @@
 from .action import *
 from .manager import *
-from .model import *

mipac/models/ad.py

@@ -3,7 +3,6 @@
 from datetime import datetime
 from typing import TYPE_CHECKING, Literal
 
-from mipac.abstract.model import AbstractModel
 from mipac.types.ads import IAd
 from mipac.utils.format import str_to_datetime
 
@@ -12,7 +11,7 @@
     from mipac.manager.client import ClientManager
 
 
-class Ad(AbstractModel):
+class Ad:
     def __init__(self, ad_data: IAd, *, client: ClientManager) -> None:
         self.__ad_data: IAd = ad_data
         self.__client: ClientManager = client

mipac/models/admin.py

@@ -3,7 +3,6 @@
 from datetime import datetime
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.models.user import MeDetailed, UserDetailedNotMe, packed_user
 from mipac.types.admin import (
     IIndexStat,
@@ -21,7 +20,7 @@
     from mipac.manager.client import ClientManager
 
 
-class UserIP(AbstractModel):
+class UserIP:
     def __init__(self, user_ip: IUserIP) -> None:
         self.__user_ip: IUserIP = user_ip
 
@@ -65,7 +64,7 @@ def indexdef(self) -> str:
         return self.__index_stat["indexdef"]
 
 
-class ModerationLog(AbstractModel):
+class ModerationLog:
     def __init__(self, moderation_log: IModerationLog, *, client: ClientManager) -> None:
         self.__moderation_log: IModerationLog = moderation_log
         self.__client: ClientManager = client
@@ -101,7 +100,7 @@ def __ne__(self, __value: object) -> bool:
         return not self.__eq__(__value)
 
 
-class ServerInfoCpu(AbstractModel):
+class ServerInfoCpu:
     def __init__(self, server_info_cpu: IServerInfoCpu) -> None:
         self.__server_info_cpu = server_info_cpu
 
@@ -114,7 +113,7 @@ def cores(self) -> int:
         return self.__server_info_cpu["cores"]
 
 
-class ServerInfoMem(AbstractModel):
+class ServerInfoMem:
     def __init__(self, server_info_mem: IServerInfoMem) -> None:
         self.__server_info_mem = server_info_mem
 
@@ -123,7 +122,7 @@ def total(self) -> int:
         return self.__server_info_mem["total"]
 
 
-class ServerInfoFs(AbstractModel):
+class ServerInfoFs:
     def __init__(self, server_info_fs: IServerInfoFs) -> None:
         self.__server_info_fs = server_info_fs
 
@@ -136,7 +135,7 @@ def used(self) -> int:
         return self.__server_info_fs["used"]
 
 
-class ServerInfoNet(AbstractModel):
+class ServerInfoNet:
     def __init__(self, server_info_net: IServerInfoNet) -> None:
         self.__server_info_net = server_info_net
 
@@ -145,7 +144,7 @@ def interface(self) -> str:
         return self.__server_info_net["interface"]
 
 
-class ServerInfo(AbstractModel):
+class ServerInfo:
     def __init__(self, server_info: IServerInfo) -> None:
         self.__server_info = server_info
 

mipac/models/antenna.py

@@ -3,7 +3,6 @@
 from datetime import datetime
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.types.antenna import IAntenna, IAntennaReceiveSource
 from mipac.utils.format import str_to_datetime
 
@@ -12,7 +11,7 @@
     from mipac.manager.client import ClientManager
 
 
-class Antenna(AbstractModel):
+class Antenna:
     def __init__(self, antenna: IAntenna, *, client: ClientManager) -> None:
         self.__antenna: IAntenna = antenna
         self.__client: ClientManager = client

mipac/models/chart.py

@@ -1,8 +1,7 @@
-from mipac.abstract.model import AbstractModel
 from mipac.types.chart import IActiveUsersChart, IDriveChart, IDriveLocalChart, IDriveRemoteChart
 
 
-class ActiveUsersChart(AbstractModel):
+class ActiveUsersChart:
     __slots__ = ("__data",)
 
     def __init__(self, data: IActiveUsersChart):
@@ -45,7 +44,7 @@ def registered_outside_year(self) -> list[int]:
         return self.__data["registered_outside_year"]
 
 
-class DriveLocalChart(AbstractModel):
+class DriveLocalChart:
     __slots__ = ("__data",)
 
     def __init__(self, data: IDriveLocalChart):
@@ -76,7 +75,7 @@ def dec_size(self) -> list[int]:
         return self.__data["dec_size"]
 
 
-class DriveRemoteChart(AbstractModel):
+class DriveRemoteChart:
     __slots__ = ("__data",)
 
     def __init__(self, data: IDriveRemoteChart):
@@ -107,7 +106,7 @@ def dec_size(self) -> list[int]:
         return self.__data["dec_size"]
 
 
-class DriveChart(AbstractModel):
+class DriveChart:
     __slots__ = ("__data",)
 
     def __init__(self, data: IDriveChart):

mipac/models/clip.py

@@ -2,7 +2,6 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.models.lite.user import PartialUser
 from mipac.types.clip import IClip
 
@@ -11,7 +10,7 @@
     from mipac.manager.clip import ClientClipManager
 
 
-class Clip(AbstractModel):
+class Clip:
     def __init__(self, raw_clip: IClip, *, client: ClientManager) -> None:
         self.__clip: IClip = raw_clip
         self.__client: ClientManager = client

mipac/models/drive.py

@@ -2,7 +2,6 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.models.lite.user import PartialUser
 from mipac.types.drive import IDriveStatus
 
@@ -44,7 +43,7 @@ def usage(self) -> int:
         return self.__raw_drive_status["usage"]
 
 
-class FileProperties(AbstractModel):
+class FileProperties:
     def __init__(self, raw_properties: IFileProperties) -> None:
         self.__raw_properties: IFileProperties = raw_properties
 
@@ -65,7 +64,7 @@ def avg_color(self) -> str | None:
         return self.__raw_properties.get("avg_color")
 
 
-class Folder(AbstractModel):
+class Folder:
     def __init__(self, raw_folder: IFolder, client: ClientManager):
         self.__raw_folder: IFolder = raw_folder
         self.__client: ClientManager = client
@@ -113,7 +112,7 @@ def __ne__(self, __value: object) -> bool:
         return not self.__eq__(__value)
 
 
-class File(AbstractModel):
+class File:
     def __init__(self, raw_file: IFile, *, client: ClientManager):
         self.__raw_file: IFile = raw_file
         self.__client: ClientManager = client

mipac/models/follow.py

@@ -2,7 +2,6 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.models.lite.user import PartialUser
 from mipac.types.follow import IFollowRequest
 
@@ -11,7 +10,7 @@
     from mipac.manager.follow import FollowRequestManager
 
 
-class FollowRequest(AbstractModel):
+class FollowRequest:
     def __init__(self, follow_request: IFollowRequest, *, client: ClientManager) -> None:
         self.__follow_request = follow_request
         self.__client = client

mipac/models/instance.py

@@ -2,14 +2,13 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.types.instance import IFederationInstance
 
 if TYPE_CHECKING:
     from mipac.client import ClientManager
 
 
-class FederationInstance(AbstractModel):
+class FederationInstance:
     def __init__(self, instance: IFederationInstance, *, client: ClientManager) -> None:
         self.__instance: IFederationInstance = instance
         self.__client: ClientManager = client

mipac/models/lite/emoji.py

@@ -2,15 +2,14 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.config import config
 from mipac.types.emoji import ICustomEmojiLite
 
 if TYPE_CHECKING:
     from mipac.manager.client import ClientManager
 
 
-class PartialCustomEmoji(AbstractModel):
+class PartialCustomEmoji:
     def __init__(self, emoji: ICustomEmojiLite, *, client: ClientManager) -> None:
         self.__emoji = emoji
         self.__client: ClientManager = client

mipac/models/lite/instance.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-from mipac.abstract.model import AbstractModel
 from mipac.types.instance import IInstanceLite
 
 
-class LiteInstance(AbstractModel):
+class LiteInstance:
     def __init__(self, instance: IInstanceLite) -> None:
         self.__instance: IInstanceLite = instance
 

mipac/models/lite/meta.py

@@ -2,15 +2,14 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.models.lite.ad import PartialAd
 from mipac.types.meta import IPartialMeta, IPolicies
 
 if TYPE_CHECKING:
     from mipac.manager.client import ClientManager
 
 
-class Policies(AbstractModel):
+class Policies:
     def __init__(self, raw_policies: IPolicies) -> None:
         self.__raw_policies: IPolicies = raw_policies
 

mipac/models/meta.py

@@ -2,7 +2,6 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.models.lite.meta import PartialMeta
 from mipac.types.meta import (
     IAdminMeta,
@@ -16,7 +15,7 @@
     from mipac.manager.client import ClientManager
 
 
-class Features(AbstractModel):
+class Features:
     def __init__(self, raw_features: IFeatures) -> None:
         self.__raw_features = raw_features
 
@@ -78,7 +77,7 @@ def proxy_account_name(self) -> str:
         return self._raw_meta["proxy_account_name"]
 
 
-class AdminMeta(AbstractModel):
+class AdminMeta:
     def __init__(self, raw_meta: IAdminMeta, *, client: ClientManager) -> None:
         self.__raw_meta: IAdminMeta = raw_meta
         self.__client: ClientManager = client

mipac/models/mute.py

@@ -2,15 +2,14 @@
 
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.models.user import MeDetailed, UserDetailedNotMe, packed_user
 from mipac.types.mute import IMuteUser
 
 if TYPE_CHECKING:
     from mipac.manager.client import ClientManager
 
 
-class MuteUser(AbstractModel):
+class MuteUser:
     def __init__(self, data: IMuteUser, *, client: ClientManager) -> None:
         self.__data: IMuteUser = data
         self.__client: ClientManager = client

mipac/models/note.py

@@ -3,7 +3,6 @@
 from datetime import datetime
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.models.drive import File
 from mipac.models.lite.user import PartialUser
 from mipac.models.poll import Poll
@@ -36,7 +35,7 @@
 )
 
 
-class NoteState(AbstractModel):
+class NoteState:
     def __init__(self, data: INoteState) -> None:
         self.__data: INoteState = data
 
@@ -49,7 +48,7 @@ def is_muted_thread(self) -> bool:
         return self.__data["is_muted_thread"]
 
 
-class NoteDeleted(AbstractModel):
+class NoteDeleted:
     def __init__(self, data: INoteUpdated[INoteUpdatedDelete]) -> None:
         self.__data = data
 
@@ -74,7 +73,7 @@ def __init__(self, data):
         self.type = data.get("type")
 
 
-class NoteReaction(AbstractModel):
+class NoteReaction:
     __slots__ = ("__reaction", "__client")
 
     def __init__(self, raw_reaction: INoteReaction, *, client: ClientManager):
@@ -631,7 +630,7 @@ def __ne__(self, __value: object) -> bool:
         return not self.__eq__(__value)
 
 
-class NoteTranslateResult(AbstractModel):
+class NoteTranslateResult:
     """
     NoteTranslateResult
 

mipac/models/notification.py

@@ -3,7 +3,6 @@
 from datetime import datetime
 from typing import TYPE_CHECKING
 
-from mipac.abstract.model import AbstractModel
 from mipac.models.lite.user import PartialUser
 from mipac.models.note import Note
 
@@ -20,7 +19,7 @@
     )
 
 
-class Notification(AbstractModel):
+class Notification:
     def __init__(
         self,
         notification: INotification,