python: use dataclasses to reduce boilerplate

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 ### Changes
+- deltachat-rpc-client: use `dataclass` for `Account`, `Chat`, `Contact` and `Message` #4042
 
 ### Fixes
 - deltachat-rpc-server: do not block stdin while processing the request. #4041

deltachat-rpc-client/src/deltachat_rpc_client/account.py

@@ -1,4 +1,5 @@
 from typing import TYPE_CHECKING, List, Optional, Tuple, Union
+from dataclasses import dataclass
 
 from ._utils import AttrDict
 from .chat import Chat
@@ -11,28 +12,17 @@ if TYPE_CHECKING:
     from .deltachat import DeltaChat
 
 
+@dataclass
 class Account:
     """Delta Chat account."""
 
-    def __init__(self, manager: "DeltaChat", account_id: int) -> None:
+    manager: "DeltaChat"
-        self.manager = manager
+    id: int
-        self.id = account_id
 
     @property
     def _rpc(self) -> Rpc:
         return self.manager.rpc
 
-    def __eq__(self, other) -> bool:
-        if not isinstance(other, Account):
-            return False
-        return self.id == other.id and self.manager == other.manager
-
-    def __ne__(self, other) -> bool:
-        return not self == other
-
-    def __repr__(self) -> str:
-        return f"<Account id={self.id}>"
-
     async def wait_for_event(self) -> AttrDict:
         """Wait until the next event and return it."""
         return AttrDict(await self._rpc.wait_for_event(self.id))

deltachat-rpc-client/src/deltachat_rpc_client/chat.py

@@ -1,6 +1,7 @@
 import calendar
 from datetime import datetime
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union
+from dataclasses import dataclass
 
 from ._utils import AttrDict
 from .const import ChatVisibility
@@ -12,28 +13,17 @@ if TYPE_CHECKING:
     from .account import Account
 
 
+@dataclass
 class Chat:
     """Chat object which manages members and through which you can send and retrieve messages."""
 
-    def __init__(self, account: "Account", chat_id: int) -> None:
+    account: "Account"
-        self.account = account
+    id: int
-        self.id = chat_id
 
     @property
     def _rpc(self) -> Rpc:
         return self.account._rpc
 
-    def __eq__(self, other) -> bool:
-        if not isinstance(other, Chat):
-            return False
-        return self.id == other.id and self.account == other.account
-
-    def __ne__(self, other) -> bool:
-        return not self == other
-
-    def __repr__(self) -> str:
-        return f"<Chat id={self.id} account={self.account.id}>"
-
     async def delete(self) -> None:
         """Delete this chat and all its messages.
 

deltachat-rpc-client/src/deltachat_rpc_client/contact.py

@@ -1,4 +1,5 @@
 from typing import TYPE_CHECKING
+from dataclasses import dataclass
 
 from ._utils import AttrDict
 from .rpc import Rpc
@@ -8,6 +9,7 @@ if TYPE_CHECKING:
     from .chat import Chat
 
 
+@dataclass
 class Contact:
     """
     Contact API.
@@ -15,20 +17,8 @@ class Contact:
     Essentially a wrapper for RPC, account ID and a contact ID.
     """
 
-    def __init__(self, account: "Account", contact_id: int) -> None:
+    account: "Account"
-        self.account = account
+    id: int
-        self.id = contact_id
-
-    def __eq__(self, other) -> bool:
-        if not isinstance(other, Contact):
-            return False
-        return self.id == other.id and self.account == other.account
-
-    def __ne__(self, other) -> bool:
-        return not self == other
-
-    def __repr__(self) -> str:
-        return f"<Contact id={self.id} account={self.account.id}>"
 
     @property
     def _rpc(self) -> Rpc:

deltachat-rpc-client/src/deltachat_rpc_client/message.py

@@ -1,5 +1,6 @@
 import json
 from typing import TYPE_CHECKING, Union
+from dataclasses import dataclass
 
 from ._utils import AttrDict
 from .contact import Contact
@@ -9,23 +10,12 @@ if TYPE_CHECKING:
     from .account import Account
 
 
+@dataclass
 class Message:
     """Delta Chat Message object."""
 
-    def __init__(self, account: "Account", msg_id: int) -> None:
+    account: "Account"
-        self.account = account
+    id: int
-        self.id = msg_id
-
-    def __eq__(self, other) -> bool:
-        if not isinstance(other, Message):
-            return False
-        return self.id == other.id and self.account == other.account
-
-    def __ne__(self, other) -> bool:
-        return not self == other
-
-    def __repr__(self) -> str:
-        return f"<Message id={self.id} account={self.account.id}>"
 
     @property
     def _rpc(self) -> Rpc: