Refactoring.

aiogram/types/__init__.py

@@ -1,107 +1,75 @@
-import datetime
-import json
-import time
+from .animation import Animation
+from .audio import Audio
+from .callback_query import CallbackQuery
+from .chat import Chat
+from .chat_member import ChatMember
+from .chosen_inline_result import ChosenInlineResult
+from .contact import Contact
+from .document import Document
+from .file import File
+from .force_reply import ForceReply
+from .game import Game
+from .game_high_score import GameHighScore
+from .inline_keyboard import InlineKeyboardButton, InlineKeyboardMarkup
+from .inline_query import InlineQuery
+from .invoice import Invoice
+from .location import Location
+from .message import Message
+from .message_entity import MessageEntity
+from .order_info import OrderInfo
+from .photo_size import PhotoSize
+from .pre_checkout_query import PreCheckoutQuery
+from .reply_keyboard import KeyboardButton, ReplyKeyboardMarkup, ReplyKeyboardRemove
+from .shipping_address import ShippingAddress
+from .shipping_query import ShippingQuery
+from .sticker import Sticker
+from .successful_payment import SuccessfulPayment
+from .update import Update
+from .user import User
+from .user_profile_photos import UserProfilePhotos
+from .venue import Venue
+from .video import Video
+from .video_note import VideoNote
+from .voice import Voice
+from .webhook_info import WebhookInfo
 
-
-def deserialize(deserializable, data):
-    if data:
-        return deserializable.de_json(data)
-
-
-def deserialize_array(deserializable, array):
-    if array:
-        return [deserialize(deserializable, item) for item in array]
-
-
-class Serializable:
-    def to_json(self):
-        """
-        Returns a JSON string representation of this class.
-
-        This function must be overridden by subclasses.
-        :return: a JSON formatted string.
-        """
-        raise NotImplementedError
-
-
-class Deserializable:
-    """
-    Subclasses of this class are guaranteed to be able to be created from a json-style dict or json formatted string.
-    All subclasses of this class must override de_json.
-    """
-
-    def to_json(self):
-        result = {}
-        for name, attr in self.__dict__.items():
-            if not attr or name == '_bot':
-                continue
-            if hasattr(attr, 'to_json'):
-                attr = getattr(attr, 'to_json')()
-            elif isinstance(attr, datetime.datetime):
-                attr = int(time.mktime(attr.timetuple()))
-            result[name] = attr
-        return result
-
-    @property
-    def bot(self):
-        if not hasattr(self, '_bot'):
-            raise AttributeError(f"{self.__class__.__name__} is not configured.")
-        return getattr(self, '_bot')
-
-    @bot.setter
-    def bot(self, bot):
-        setattr(self, '_bot', bot)
-        for name, attr in self.__dict__.items():
-            if hasattr(attr, 'de_json'):
-                attr.bot = bot
-
-    @property
-    def parent(self):
-        return getattr(self, '_parent', None)
-
-    @parent.setter
-    def parent(self, value):
-        setattr(self, '_parent', value)
-        for name, attr in self.__dict__.items():
-            if name.startswith('_'):
-                continue
-            if hasattr(attr, 'de_json'):
-                attr.parent = self
-
-    @classmethod
-    def de_json(cls, raw_data):
-        """
-        Returns an instance of this class from the given json dict or string.
-
-        This function must be overridden by subclasses.
-        :return: an instance of this class created from the given json dict or string.
-        """
-        raise NotImplementedError
-
-    @staticmethod
-    def check_json(raw_data) -> dict:
-        """
-        Checks whether json_type is a dict or a string. If it is already a dict, it is returned as-is.
-        If it is not, it is converted to a dict by means of json.loads(json_type)
-        :param raw_data:
-        :return:
-        """
-
-        if isinstance(raw_data, dict):
-            return raw_data
-        elif isinstance(raw_data, str):
-            return json.loads(raw_data)
-        else:
-            raise ValueError("data should be a json dict or string.")
-
-    def __str__(self):
-        return json.dumps(self.to_json())
-
-    def __repr__(self):
-        return str(self)
-
-    @classmethod
-    def deserialize(cls, obj):
-        if isinstance(obj, list):
-            return deserialize_array(cls, obj)
-        return deserialize(cls, obj)
+__all__ = [
+    'Animation',
+    'Audio',
+    'Base',
+    'CallbackQuery',
+    'Chat',
+    'ChatMember',
+    'ChosenInlineResult',
+    'Contact',
+    'Document',
+    'File',
+    'ForceReply',
+    'Game',
+    'GameHighScore',
+    'InlineKeyboardButton',
+    'InlineKeyboardMarkup',
+    'InlineQuery',
+    'Invoice',
+    'Location',
+    'Message',
+    'MessageEntity',
+    'OrderInfo',
+    'PhotoSize',
+    'PreCheckoutQuery',
+    'KeyboardButton',
+    'ReplyKeyboardMarkup',
+    'ReplyKeyboardRemove',
+    'ShippingAddress',
+    'ShippingQuery',
+    'Sticker',
+    'SuccessfulPayment',
+    'Update',
+    'User',
+    'UserProfilePhotos',
+    'Venue',
+    'Video',
+    'VideoNote',
+    'Voice',
+    'WebhookInfo'
+]

aiogram/types/animation.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .photo_size import PhotoSize
 
 

aiogram/types/audio.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 
 
 class Audio(Deserializable):

aiogram/types/base.py

@@ -0,0 +1,107 @@
+import datetime
+import json
+import time
+
+
+def deserialize(deserializable, data):
+    if data:
+        return deserializable.de_json(data)
+
+
+def deserialize_array(deserializable, array):
+    if array:
+        return [deserialize(deserializable, item) for item in array]
+
+
+class Serializable:
+    def to_json(self):
+        """
+        Returns a JSON string representation of this class.
+
+        This function must be overridden by subclasses.
+        :return: a JSON formatted string.
+        """
+        raise NotImplementedError
+
+
+class Deserializable:
+    """
+    Subclasses of this class are guaranteed to be able to be created from a json-style dict or json formatted string.
+    All subclasses of this class must override de_json.
+    """
+
+    def to_json(self):
+        result = {}
+        for name, attr in self.__dict__.items():
+            if not attr or name == '_bot':
+                continue
+            if hasattr(attr, 'to_json'):
+                attr = getattr(attr, 'to_json')()
+            elif isinstance(attr, datetime.datetime):
+                attr = int(time.mktime(attr.timetuple()))
+            result[name] = attr
+        return result
+
+    @property
+    def bot(self):
+        if not hasattr(self, '_bot'):
+            raise AttributeError(f"{self.__class__.__name__} is not configured.")
+        return getattr(self, '_bot')
+
+    @bot.setter
+    def bot(self, bot):
+        setattr(self, '_bot', bot)
+        for name, attr in self.__dict__.items():
+            if hasattr(attr, 'de_json'):
+                attr.bot = bot
+
+    @property
+    def parent(self):
+        return getattr(self, '_parent', None)
+
+    @parent.setter
+    def parent(self, value):
+        setattr(self, '_parent', value)
+        for name, attr in self.__dict__.items():
+            if name.startswith('_'):
+                continue
+            if hasattr(attr, 'de_json'):
+                attr.parent = self
+
+    @classmethod
+    def de_json(cls, raw_data):
+        """
+        Returns an instance of this class from the given json dict or string.
+
+        This function must be overridden by subclasses.
+        :return: an instance of this class created from the given json dict or string.
+        """
+        raise NotImplementedError
+
+    @staticmethod
+    def check_json(raw_data) -> dict:
+        """
+        Checks whether json_type is a dict or a string. If it is already a dict, it is returned as-is.
+        If it is not, it is converted to a dict by means of json.loads(json_type)
+        :param raw_data:
+        :return:
+        """
+
+        if isinstance(raw_data, dict):
+            return raw_data
+        elif isinstance(raw_data, str):
+            return json.loads(raw_data)
+        else:
+            raise ValueError("data should be a json dict or string.")
+
+    def __str__(self):
+        return json.dumps(self.to_json())
+
+    def __repr__(self):
+        return str(self)
+
+    @classmethod
+    def deserialize(cls, obj):
+        if isinstance(obj, list):
+            return deserialize_array(cls, obj)
+        return deserialize(cls, obj)

aiogram/types/callback_query.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .message import Message
 from .user import User
 

aiogram/types/chat.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 
 
 class Chat(Deserializable):

aiogram/types/chat_member.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .user import User
 
 

aiogram/types/chosen_inline_result.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .location import Location
 from .user import User
 

aiogram/types/contact.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 
 
 class Contact(Deserializable):

aiogram/types/document.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .photo_size import PhotoSize
 
 

aiogram/types/file.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 
 
 class File(Deserializable):

aiogram/types/force_reply.py

@@ -1,4 +1,4 @@
-from aiogram.types import Serializable
+from .base import Serializable
 
 
 class ForceReply(Serializable):

aiogram/types/game.py

@@ -1,5 +1,5 @@
-from . import Deserializable
 from .animation import Animation
+from .base import Deserializable
 from .message_entity import MessageEntity
 from .photo_size import PhotoSize
 

aiogram/types/game_high_score.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .user import User
 
 

aiogram/types/inline_keyboard.py

@@ -1,4 +1,4 @@
-from . import Serializable
+from .base import Serializable
 
 
 class InlineKeyboardMarkup(Serializable):

aiogram/types/inline_query.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .location import Location
 from .user import User
 

aiogram/types/invoice.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 
 
 class Invoice(Deserializable):

aiogram/types/location.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 
 
 class Location(Deserializable):

aiogram/types/message.py

@@ -1,8 +1,7 @@
 import datetime
 
-from aiogram.exceptions import TelegramAPIError
-from . import Deserializable
 from .audio import Audio
+from .base import Deserializable
 from .chat import Chat
 from .contact import Contact
 from .document import Document
@@ -18,6 +17,7 @@ from .venue import Venue
 from .video import Video
 from .video_note import VideoNote
 from .voice import Voice
+from ..exceptions import TelegramAPIError
 
 
 class Message(Deserializable):

aiogram/types/message_entity.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .user import User
 
 

aiogram/types/order_info.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .shipping_address import ShippingAddress
 
 

aiogram/types/photo_size.py

@@ -1,4 +1,4 @@
-from . import Deserializable, deserialize
+from .base import deserialize, Deserializable
 
 
 class PhotoSize(Deserializable):

aiogram/types/pre_checkout_query.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .order_info import OrderInfo
 from .user import User
 

aiogram/types/reply_keyboard.py

@@ -1,4 +1,4 @@
-from . import Serializable
+from .base import Serializable
 
 
 class ReplyKeyboardMarkup(Serializable):

aiogram/types/shipping_address.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 
 
 class ShippingAddress(Deserializable):

aiogram/types/shipping_query.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .shipping_address import ShippingAddress
 from .user import User
 

aiogram/types/sticker.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .photo_size import PhotoSize
 
 

aiogram/types/successful_payment.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .order_info import OrderInfo
 
 

aiogram/types/update.py

@@ -1,10 +1,10 @@
-from aiogram.types.callback_query import CallbackQuery
-from aiogram.types.chosen_inline_result import ChosenInlineResult
-from aiogram.types.inline_query import InlineQuery
-from aiogram.types.pre_checkout_query import PreCheckoutQuery
-from aiogram.types.shipping_query import ShippingQuery
-from . import Deserializable
+from .base import Deserializable
+from .callback_query import CallbackQuery
+from .chosen_inline_result import ChosenInlineResult
+from .inline_query import InlineQuery
 from .message import Message
+from .pre_checkout_query import PreCheckoutQuery
+from .shipping_query import ShippingQuery
 
 
 class Update(Deserializable):

aiogram/types/user.py

@@ -1,6 +1,6 @@
 import babel
 
-from . import Deserializable
+from .base import Deserializable
 
 
 class User(Deserializable):

aiogram/types/user_profile_photos.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .photo_size import PhotoSize
 
 

aiogram/types/venue.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .location import Location
 
 

aiogram/types/video.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .photo_size import PhotoSize
 
 

aiogram/types/video_note.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 from .photo_size import PhotoSize
 
 

aiogram/types/voice.py

@@ -1,4 +1,4 @@
-from . import Deserializable
+from .base import Deserializable
 
 
 class Voice(Deserializable):

aiogram/types/webhook_info.py

@@ -1,10 +1,11 @@
 import datetime
 
-from . import Deserializable
+from .base import Deserializable
 
 
 class WebhookInfo(Deserializable):
-    def __init__(self, url, has_custom_certificate, pending_update_count, last_error_date, last_error_message, max_connections, allowed_updates):
+    def __init__(self, url, has_custom_certificate, pending_update_count, last_error_date, last_error_message,
+                 max_connections, allowed_updates):
         self.url: str = url
         self.has_custom_certificate: bool = has_custom_certificate
         self.pending_update_count: int = pending_update_count
@@ -29,4 +30,5 @@ class WebhookInfo(Deserializable):
         max_connections = raw_data.get('max_connections')
         allowed_updates = raw_data.get('allowed_updates')
 
-        return WebhookInfo(url, has_custom_certificate, pending_update_count, last_error_date, last_error_message, max_connections, allowed_updates)
+        return WebhookInfo(url, has_custom_certificate, pending_update_count, last_error_date, last_error_message,
+                           max_connections, allowed_updates)