diff --git a/aiogram/bot/bot.py b/aiogram/bot/bot.py index 41f30af1..eb32d7f9 100644 --- a/aiogram/bot/bot.py +++ b/aiogram/bot/bot.py @@ -503,7 +503,7 @@ class Bot(BaseBot, DataMixin, ContextInstanceMixin): :param height: Animation height :type height: :obj:`typing.Union[base.Integer, None]` :param thumb: Thumbnail of the file sent. The thumbnail should be in JPEG format and less than 200 kB in size. - A thumbnail‘s width and height should not exceed 90. + A thumbnail‘s width and height should not exceed 320. :type thumb: :obj:`typing.Union[typing.Union[base.InputFile, base.String], None]` :param caption: Animation caption (may also be used when resending animation by file_id), 0-1024 characters :type caption: :obj:`typing.Union[base.String, None]` diff --git a/aiogram/contrib/fsm_storage/mongo.py b/aiogram/contrib/fsm_storage/mongo.py index 9ec18090..8d2a8cea 100644 --- a/aiogram/contrib/fsm_storage/mongo.py +++ b/aiogram/contrib/fsm_storage/mongo.py @@ -1,200 +1 @@ -""" -This module has mongo storage for finite-state machine - based on `aiomongo AioMongoClient: - if isinstance(self._mongo, AioMongoClient): - return self._mongo - - uri = 'mongodb://' - - # set username + password - if self._username and self._password: - uri += f'{self._username}:{self._password}@' - - # set host and port (optional) - uri += f'{self._host}:{self._port}' if self._host else f'localhost:{self._port}' - - # define and return client - self._mongo = await aiomongo.create_client(uri) - return self._mongo - - async def get_db(self) -> Database: - """ - Get Mongo db - - This property is awaitable. - """ - if isinstance(self._db, Database): - return self._db - - mongo = await self.get_client() - self._db = mongo.get_database(self._db_name) - - if self._index: - await self.apply_index(self._db) - return self._db - - @staticmethod - async def apply_index(db): - for collection in COLLECTIONS: - await db[collection].create_index(keys=[('chat', 1), ('user', 1)], - name="chat_user_idx", unique=True, background=True) - - async def close(self): - if self._mongo: - self._mongo.close() - - async def wait_closed(self): - if self._mongo: - return await self._mongo.wait_closed() - return True - - async def set_state(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, - state: Optional[AnyStr] = None): - chat, user = self.check_address(chat=chat, user=user) - db = await self.get_db() - - if state is None: - await db[STATE].delete_one(filter={'chat': chat, 'user': user}) - else: - await db[STATE].update_one(filter={'chat': chat, 'user': user}, - update={'$set': {'state': state}}, upsert=True) - - async def get_state(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, - default: Optional[str] = None) -> Optional[str]: - chat, user = self.check_address(chat=chat, user=user) - db = await self.get_db() - result = await db[STATE].find_one(filter={'chat': chat, 'user': user}) - - return result.get('state') if result else default - - async def set_data(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, - data: Dict = None): - chat, user = self.check_address(chat=chat, user=user) - db = await self.get_db() - - await db[DATA].update_one(filter={'chat': chat, 'user': user}, - update={'$set': {'data': data}}, upsert=True) - - async def get_data(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, - default: Optional[dict] = None) -> Dict: - chat, user = self.check_address(chat=chat, user=user) - db = await self.get_db() - result = await db[DATA].find_one(filter={'chat': chat, 'user': user}) - - return result.get('data') if result else default or {} - - async def update_data(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, - data: Dict = None, **kwargs): - if data is None: - data = {} - temp_data = await self.get_data(chat=chat, user=user, default={}) - temp_data.update(data, **kwargs) - await self.set_data(chat=chat, user=user, data=temp_data) - - def has_bucket(self): - return True - - async def get_bucket(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, - default: Optional[dict] = None) -> Dict: - chat, user = self.check_address(chat=chat, user=user) - db = await self.get_db() - result = await db[BUCKET].find_one(filter={'chat': chat, 'user': user}) - return result.get('bucket') if result else default or {} - - async def set_bucket(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, - bucket: Dict = None): - chat, user = self.check_address(chat=chat, user=user) - db = await self.get_db() - - await db[BUCKET].update_one(filter={'chat': chat, 'user': user}, - update={'$set': {'bucket': bucket}}, upsert=True) - - async def update_bucket(self, *, chat: Union[str, int, None] = None, - user: Union[str, int, None] = None, - bucket: Dict = None, **kwargs): - if bucket is None: - bucket = {} - temp_bucket = await self.get_bucket(chat=chat, user=user) - temp_bucket.update(bucket, **kwargs) - await self.set_bucket(chat=chat, user=user, bucket=temp_bucket) - - async def reset_all(self, full=True): - """ - Reset states in DB - - :param full: clean DB or clean only states - :return: - """ - db = await self.get_db() - - await db[STATE].drop() - - if full: - await db[DATA].drop() - await db[BUCKET].drop() - - async def get_states_list(self) -> List[Tuple[int, int]]: - """ - Get list of all stored chat's and user's - - :return: list of tuples where first element is chat id and second is user id - """ - db = await self.get_db() - result = [] - - items = await db[STATE].find().to_list() - for item in items: - result.append( - (int(item['chat']), int(item['user'])) - ) - - return result +from .mongo_aiomongo import MongoStorage diff --git a/aiogram/contrib/fsm_storage/mongo_aiomongo.py b/aiogram/contrib/fsm_storage/mongo_aiomongo.py new file mode 100644 index 00000000..c9f94ae5 --- /dev/null +++ b/aiogram/contrib/fsm_storage/mongo_aiomongo.py @@ -0,0 +1,207 @@ +""" +This module has mongo storage for finite-state machine + based on `aiomongo AioMongoClient: + if isinstance(self._mongo, AioMongoClient): + return self._mongo + + uri = 'mongodb://' + + # set username + password + if self._username and self._password: + uri += f'{self._username}:{self._password}@' + + # set host and port (optional) + uri += f'{self._host}:{self._port}' if self._host else f'localhost:{self._port}' + + # define and return client + self._mongo = await aiomongo.create_client(uri) + return self._mongo + + async def get_db(self) -> Database: + """ + Get Mongo db + + This property is awaitable. + """ + if isinstance(self._db, Database): + return self._db + + mongo = await self.get_client() + self._db = mongo.get_database(self._db_name) + + if self._index: + await self.apply_index(self._db) + return self._db + + @staticmethod + async def apply_index(db): + for collection in COLLECTIONS: + await db[collection].create_index(keys=[('chat', 1), ('user', 1)], + name="chat_user_idx", unique=True, background=True) + + async def close(self): + if self._mongo: + self._mongo.close() + + async def wait_closed(self): + if self._mongo: + return await self._mongo.wait_closed() + return True + + async def set_state(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + state: Optional[AnyStr] = None): + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + + if state is None: + await db[STATE].delete_one(filter={'chat': chat, 'user': user}) + else: + await db[STATE].update_one(filter={'chat': chat, 'user': user}, + update={'$set': {'state': state}}, upsert=True) + + async def get_state(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + default: Optional[str] = None) -> Optional[str]: + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + result = await db[STATE].find_one(filter={'chat': chat, 'user': user}) + + return result.get('state') if result else default + + async def set_data(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + data: Dict = None): + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + + await db[DATA].update_one(filter={'chat': chat, 'user': user}, + update={'$set': {'data': data}}, upsert=True) + + async def get_data(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + default: Optional[dict] = None) -> Dict: + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + result = await db[DATA].find_one(filter={'chat': chat, 'user': user}) + + return result.get('data') if result else default or {} + + async def update_data(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + data: Dict = None, **kwargs): + if data is None: + data = {} + temp_data = await self.get_data(chat=chat, user=user, default={}) + temp_data.update(data, **kwargs) + await self.set_data(chat=chat, user=user, data=temp_data) + + def has_bucket(self): + return True + + async def get_bucket(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + default: Optional[dict] = None) -> Dict: + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + result = await db[BUCKET].find_one(filter={'chat': chat, 'user': user}) + return result.get('bucket') if result else default or {} + + async def set_bucket(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + bucket: Dict = None): + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + + await db[BUCKET].update_one(filter={'chat': chat, 'user': user}, + update={'$set': {'bucket': bucket}}, upsert=True) + + async def update_bucket(self, *, chat: Union[str, int, None] = None, + user: Union[str, int, None] = None, + bucket: Dict = None, **kwargs): + if bucket is None: + bucket = {} + temp_bucket = await self.get_bucket(chat=chat, user=user) + temp_bucket.update(bucket, **kwargs) + await self.set_bucket(chat=chat, user=user, bucket=temp_bucket) + + async def reset_all(self, full=True): + """ + Reset states in DB + + :param full: clean DB or clean only states + :return: + """ + db = await self.get_db() + + await db[STATE].drop() + + if full: + await db[DATA].drop() + await db[BUCKET].drop() + + async def get_states_list(self) -> List[Tuple[int, int]]: + """ + Get list of all stored chat's and user's + + :return: list of tuples where first element is chat id and second is user id + """ + db = await self.get_db() + result = [] + + items = await db[STATE].find().to_list() + for item in items: + result.append( + (int(item['chat']), int(item['user'])) + ) + + return result diff --git a/aiogram/contrib/fsm_storage/mongo_motor.py b/aiogram/contrib/fsm_storage/mongo_motor.py new file mode 100644 index 00000000..a7601cc4 --- /dev/null +++ b/aiogram/contrib/fsm_storage/mongo_motor.py @@ -0,0 +1,217 @@ +""" +This module has mongo storage for finite-state machine + based on `motor `_ driver +""" + +from typing import Union, Dict, Optional, List, Tuple, AnyStr + +import pymongo + +try: + import motor + from motor.motor_asyncio import AsyncIOMotorClient, AsyncIOMotorDatabase +except ModuleNotFoundError as e: + import warnings + warnings.warn("Install motor with `pip install motor`") + raise e + +from ...dispatcher.storage import BaseStorage + +STATE = 'aiogram_state' +DATA = 'aiogram_data' +BUCKET = 'aiogram_bucket' +COLLECTIONS = (STATE, DATA, BUCKET) + + +class MongoStorage(BaseStorage): + """ + Mongo-based storage for FSM. + Usage: + + .. code-block:: python3 + + storage = MongoStorage(host='localhost', port=27017, db_name='aiogram_fsm') + dp = Dispatcher(bot, storage=storage) + + And need to close Mongo client connections when shutdown + + .. code-block:: python3 + + await dp.storage.close() + await dp.storage.wait_closed() + + """ + + def __init__(self, host='localhost', port=27017, db_name='aiogram_fsm', uri=None, + username=None, password=None, index=True, **kwargs): + self._host = host + self._port = port + self._db_name: str = db_name + self._uri = uri + self._username = username + self._password = password + self._kwargs = kwargs + + self._mongo: Optional[AsyncIOMotorClient] = None + self._db: Optional[AsyncIOMotorDatabase] = None + + self._index = index + + async def get_client(self) -> AsyncIOMotorClient: + if isinstance(self._mongo, AsyncIOMotorClient): + return self._mongo + + if self._uri: + try: + self._mongo = AsyncIOMotorClient(self._uri) + except pymongo.errors.ConfigurationError as e: + if "query() got an unexpected keyword argument 'lifetime'" in e.args[0]: + import logging + logger = logging.getLogger("aiogram") + logger.warning("Run `pip install dnspython==1.16.0` in order to fix ConfigurationError. More information: https://github.com/mongodb/mongo-python-driver/pull/423#issuecomment-528998245") + raise e + return self._mongo + + uri = 'mongodb://' + + # set username + password + if self._username and self._password: + uri += f'{self._username}:{self._password}@' + + # set host and port (optional) + uri += f'{self._host}:{self._port}' if self._host else f'localhost:{self._port}' + + # define and return client + self._mongo = AsyncIOMotorClient(uri) + return self._mongo + + async def get_db(self) -> AsyncIOMotorDatabase: + """ + Get Mongo db + + This property is awaitable. + """ + if isinstance(self._db, AsyncIOMotorDatabase): + return self._db + + mongo = await self.get_client() + self._db = mongo.get_database(self._db_name) + + if self._index: + await self.apply_index(self._db) + return self._db + + @staticmethod + async def apply_index(db): + for collection in COLLECTIONS: + await db[collection].create_index(keys=[('chat', 1), ('user', 1)], + name="chat_user_idx", unique=True, background=True) + + async def close(self): + if self._mongo: + self._mongo.close() + + async def wait_closed(self): + return True + + async def set_state(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + state: Optional[AnyStr] = None): + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + + if state is None: + await db[STATE].delete_one(filter={'chat': chat, 'user': user}) + else: + await db[STATE].update_one(filter={'chat': chat, 'user': user}, + update={'$set': {'state': state}}, upsert=True) + + async def get_state(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + default: Optional[str] = None) -> Optional[str]: + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + result = await db[STATE].find_one(filter={'chat': chat, 'user': user}) + + return result.get('state') if result else default + + async def set_data(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + data: Dict = None): + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + + await db[DATA].update_one(filter={'chat': chat, 'user': user}, + update={'$set': {'data': data}}, upsert=True) + + async def get_data(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + default: Optional[dict] = None) -> Dict: + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + result = await db[DATA].find_one(filter={'chat': chat, 'user': user}) + + return result.get('data') if result else default or {} + + async def update_data(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + data: Dict = None, **kwargs): + if data is None: + data = {} + temp_data = await self.get_data(chat=chat, user=user, default={}) + temp_data.update(data, **kwargs) + await self.set_data(chat=chat, user=user, data=temp_data) + + def has_bucket(self): + return True + + async def get_bucket(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + default: Optional[dict] = None) -> Dict: + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + result = await db[BUCKET].find_one(filter={'chat': chat, 'user': user}) + return result.get('bucket') if result else default or {} + + async def set_bucket(self, *, chat: Union[str, int, None] = None, user: Union[str, int, None] = None, + bucket: Dict = None): + chat, user = self.check_address(chat=chat, user=user) + db = await self.get_db() + + await db[BUCKET].update_one(filter={'chat': chat, 'user': user}, + update={'$set': {'bucket': bucket}}, upsert=True) + + async def update_bucket(self, *, chat: Union[str, int, None] = None, + user: Union[str, int, None] = None, + bucket: Dict = None, **kwargs): + if bucket is None: + bucket = {} + temp_bucket = await self.get_bucket(chat=chat, user=user) + temp_bucket.update(bucket, **kwargs) + await self.set_bucket(chat=chat, user=user, bucket=temp_bucket) + + async def reset_all(self, full=True): + """ + Reset states in DB + + :param full: clean DB or clean only states + :return: + """ + db = await self.get_db() + + await db[STATE].drop() + + if full: + await db[DATA].drop() + await db[BUCKET].drop() + + async def get_states_list(self) -> List[Tuple[int, int]]: + """ + Get list of all stored chat's and user's + + :return: list of tuples where first element is chat id and second is user id + """ + db = await self.get_db() + result = [] + + items = await db[STATE].find().to_list() + for item in items: + result.append( + (int(item['chat']), int(item['user'])) + ) + + return result diff --git a/aiogram/dispatcher/dispatcher.py b/aiogram/dispatcher/dispatcher.py index 19cffc56..d1834b2a 100644 --- a/aiogram/dispatcher/dispatcher.py +++ b/aiogram/dispatcher/dispatcher.py @@ -11,7 +11,7 @@ from aiohttp.helpers import sentinel from aiogram.utils.deprecated import renamed_argument from .filters import Command, ContentTypeFilter, ExceptionsFilter, FiltersFactory, HashTag, Regexp, \ RegexpCommandsFilter, StateFilter, Text, IDFilter, AdminFilter, IsReplyFilter, ForwardedMessageFilter, \ - IsSenderContact, ChatTypeFilter + IsSenderContact, ChatTypeFilter, AbstractFilter from .handler import Handler from .middlewares import MiddlewareManager from .storage import BaseStorage, DELTA, DisabledStorage, EXCEEDED_COUNT, FSMContext, \ @@ -1239,3 +1239,35 @@ class Dispatcher(DataMixin, ContextInstanceMixin): return wrapped return decorator + + def bind_filter(self, callback: typing.Union[typing.Callable, AbstractFilter], + validator: typing.Optional[typing.Callable] = None, + event_handlers: typing.Optional[typing.List[Handler]] = None, + exclude_event_handlers: typing.Optional[typing.Iterable[Handler]] = None): + """ + Register filter + + :param callback: callable or subclass of :obj:`AbstractFilter` + :param validator: custom validator. + :param event_handlers: list of instances of :obj:`Handler` + :param exclude_event_handlers: list of excluded event handlers (:obj:`Handler`) + """ + self.filters_factory.bind(callback=callback, validator=validator, event_handlers=event_handlers, + exclude_event_handlers=exclude_event_handlers) + + def unbind_filter(self, callback: typing.Union[typing.Callable, AbstractFilter]): + """ + Unregister filter + + :param callback: callable of subclass of :obj:`AbstractFilter` + """ + self.filters_factory.unbind(callback=callback) + + def setup_middleware(self, middleware): + """ + Setup middleware + + :param middleware: + :return: + """ + self.middleware.setup(middleware) diff --git a/aiogram/dispatcher/filters/factory.py b/aiogram/dispatcher/filters/factory.py index 13b188ff..564e7f89 100644 --- a/aiogram/dispatcher/filters/factory.py +++ b/aiogram/dispatcher/filters/factory.py @@ -30,7 +30,7 @@ class FiltersFactory: def unbind(self, callback: typing.Union[typing.Callable, AbstractFilter]): """ - Unregister callback + Unregister filter :param callback: callable of subclass of :obj:`AbstractFilter` """ diff --git a/aiogram/types/message.py b/aiogram/types/message.py index c56a143a..de53df6a 100644 --- a/aiogram/types/message.py +++ b/aiogram/types/message.py @@ -371,6 +371,7 @@ class Message(base.TelegramObject): duration: typing.Union[base.Integer, None] = None, performer: typing.Union[base.String, None] = None, title: typing.Union[base.String, None] = None, + thumb: typing.Union[typing.Union[base.InputFile, base.String], None] = None, disable_notification: typing.Union[base.Boolean, None] = None, reply_markup: typing.Union[ InlineKeyboardMarkup, @@ -402,6 +403,9 @@ class Message(base.TelegramObject): :type performer: :obj:`typing.Union[base.String, None]` :param title: Track name :type title: :obj:`typing.Union[base.String, None]` + :param thumb: Thumbnail of the file sent. The thumbnail should be in JPEG format and less than 200 kB in size. + A thumbnail‘s width and height should not exceed 320. + :type thumb: :obj:`typing.Union[typing.Union[base.InputFile, base.String], None]` :param disable_notification: Sends the message silently. Users will receive a notification with no sound. :type disable_notification: :obj:`typing.Union[base.Boolean, None]` :param reply_markup: Additional interface options. A JSON-serialized object for an inline keyboard, @@ -420,6 +424,7 @@ class Message(base.TelegramObject): duration=duration, performer=performer, title=title, + thumb=thumb, disable_notification=disable_notification, reply_to_message_id=self.message_id if reply else None, reply_markup=reply_markup, @@ -463,7 +468,7 @@ class Message(base.TelegramObject): :param height: Animation height :type height: :obj:`typing.Union[base.Integer, None]` :param thumb: Thumbnail of the file sent. The thumbnail should be in JPEG format and less than 200 kB in size. - A thumbnail‘s width and height should not exceed 90. + A thumbnail‘s width and height should not exceed 320. :type thumb: :obj:`typing.Union[typing.Union[base.InputFile, base.String], None]` :param caption: Animation caption (may also be used when resending animation by file_id), 0-1024 characters :type caption: :obj:`typing.Union[base.String, None]` @@ -497,6 +502,7 @@ class Message(base.TelegramObject): async def answer_document( self, document: typing.Union[base.InputFile, base.String], + thumb: typing.Union[typing.Union[base.InputFile, base.String], None] = None, caption: typing.Union[base.String, None] = None, parse_mode: typing.Union[base.String, None] = None, disable_notification: typing.Union[base.Boolean, None] = None, @@ -518,6 +524,9 @@ class Message(base.TelegramObject): :param document: File to send. :type document: :obj:`typing.Union[base.InputFile, base.String]` + :param thumb: Thumbnail of the file sent. The thumbnail should be in JPEG format and less than 200 kB in size. + A thumbnail‘s width and height should not exceed 320. + :type thumb: :obj:`typing.Union[typing.Union[base.InputFile, base.String], None]` :param caption: Document caption (may also be used when resending documents by file_id), 0-200 characters :type caption: :obj:`typing.Union[base.String, None]` :param parse_mode: Send Markdown or HTML, if you want Telegram apps to show bold, italic, @@ -535,6 +544,7 @@ class Message(base.TelegramObject): """ return await self.bot.send_document( chat_id=self.chat.id, + thumb=thumb, document=document, caption=caption, parse_mode=parse_mode, @@ -549,6 +559,7 @@ class Message(base.TelegramObject): duration: typing.Union[base.Integer, None] = None, width: typing.Union[base.Integer, None] = None, height: typing.Union[base.Integer, None] = None, + thumb: typing.Union[typing.Union[base.InputFile, base.String], None] = None, caption: typing.Union[base.String, None] = None, parse_mode: typing.Union[base.String, None] = None, disable_notification: typing.Union[base.Boolean, None] = None, @@ -575,6 +586,9 @@ class Message(base.TelegramObject): :type width: :obj:`typing.Union[base.Integer, None]` :param height: Video height :type height: :obj:`typing.Union[base.Integer, None]` + :param thumb: Thumbnail of the file sent. The thumbnail should be in JPEG format and less than 200 kB in size. + A thumbnail‘s width and height should not exceed 320. + :type thumb: :obj:`typing.Union[typing.Union[base.InputFile, base.String], None]` :param caption: Video caption (may also be used when resending videos by file_id), 0-200 characters :type caption: :obj:`typing.Union[base.String, None]` :param parse_mode: Send Markdown or HTML, if you want Telegram apps to show bold, italic, @@ -596,6 +610,7 @@ class Message(base.TelegramObject): duration=duration, width=width, height=height, + thumb=thumb, caption=caption, parse_mode=parse_mode, disable_notification=disable_notification, @@ -663,6 +678,7 @@ class Message(base.TelegramObject): video_note: typing.Union[base.InputFile, base.String], duration: typing.Union[base.Integer, None] = None, length: typing.Union[base.Integer, None] = None, + thumb: typing.Union[typing.Union[base.InputFile, base.String], None] = None, disable_notification: typing.Union[base.Boolean, None] = None, reply_markup: typing.Union[ InlineKeyboardMarkup, @@ -685,6 +701,9 @@ class Message(base.TelegramObject): :type duration: :obj:`typing.Union[base.Integer, None]` :param length: Video width and height :type length: :obj:`typing.Union[base.Integer, None]` + :param thumb: Thumbnail of the file sent. The thumbnail should be in JPEG format and less than 200 kB in size. + A thumbnail‘s width and height should not exceed 320. + :type thumb: :obj:`typing.Union[typing.Union[base.InputFile, base.String], None]` :param disable_notification: Sends the message silently. Users will receive a notification with no sound. :type disable_notification: :obj:`typing.Union[base.Boolean, None]` :param reply_markup: Additional interface options. A JSON-serialized object for an inline keyboard, @@ -700,6 +719,7 @@ class Message(base.TelegramObject): video_note=video_note, duration=duration, length=length, + thumb=thumb, disable_notification=disable_notification, reply_to_message_id=self.message_id if reply else None, reply_markup=reply_markup, @@ -1058,6 +1078,7 @@ class Message(base.TelegramObject): duration: typing.Union[base.Integer, None] = None, performer: typing.Union[base.String, None] = None, title: typing.Union[base.String, None] = None, + thumb: typing.Union[typing.Union[base.InputFile, base.String], None] = None, disable_notification: typing.Union[base.Boolean, None] = None, reply_markup: typing.Union[ InlineKeyboardMarkup, @@ -1089,6 +1110,9 @@ class Message(base.TelegramObject): :type performer: :obj:`typing.Union[base.String, None]` :param title: Track name :type title: :obj:`typing.Union[base.String, None]` + :param thumb: Thumbnail of the file sent. The thumbnail should be in JPEG format and less than 200 kB in size. + A thumbnail‘s width and height should not exceed 320. + :type thumb: :obj:`typing.Union[typing.Union[base.InputFile, base.String], None]` :param disable_notification: Sends the message silently. Users will receive a notification with no sound. :type disable_notification: :obj:`typing.Union[base.Boolean, None]` :param reply_markup: Additional interface options. A JSON-serialized object for an inline keyboard, @@ -1107,6 +1131,7 @@ class Message(base.TelegramObject): duration=duration, performer=performer, title=title, + thumb=thumb, disable_notification=disable_notification, reply_to_message_id=self.message_id if reply else None, reply_markup=reply_markup, @@ -1150,7 +1175,7 @@ class Message(base.TelegramObject): :param height: Animation height :type height: :obj:`typing.Union[base.Integer, None]` :param thumb: Thumbnail of the file sent. The thumbnail should be in JPEG format and less than 200 kB in size. - A thumbnail‘s width and height should not exceed 90. + A thumbnail‘s width and height should not exceed 320. :type thumb: :obj:`typing.Union[typing.Union[base.InputFile, base.String], None]` :param caption: Animation caption (may also be used when resending animation by file_id), 0-1024 characters :type caption: :obj:`typing.Union[base.String, None]` @@ -1184,6 +1209,7 @@ class Message(base.TelegramObject): async def reply_document( self, document: typing.Union[base.InputFile, base.String], + thumb: typing.Union[typing.Union[base.InputFile, base.String], None] = None, caption: typing.Union[base.String, None] = None, parse_mode: typing.Union[base.String, None] = None, disable_notification: typing.Union[base.Boolean, None] = None, @@ -1205,6 +1231,9 @@ class Message(base.TelegramObject): :param document: File to send. :type document: :obj:`typing.Union[base.InputFile, base.String]` + :param thumb: Thumbnail of the file sent. The thumbnail should be in JPEG format and less than 200 kB in size. + A thumbnail‘s width and height should not exceed 320. + :type thumb: :obj:`typing.Union[typing.Union[base.InputFile, base.String], None]` :param caption: Document caption (may also be used when resending documents by file_id), 0-200 characters :type caption: :obj:`typing.Union[base.String, None]` :param parse_mode: Send Markdown or HTML, if you want Telegram apps to show bold, italic, @@ -1223,6 +1252,7 @@ class Message(base.TelegramObject): return await self.bot.send_document( chat_id=self.chat.id, document=document, + thumb=thumb, caption=caption, parse_mode=parse_mode, disable_notification=disable_notification, @@ -1236,6 +1266,7 @@ class Message(base.TelegramObject): duration: typing.Union[base.Integer, None] = None, width: typing.Union[base.Integer, None] = None, height: typing.Union[base.Integer, None] = None, + thumb: typing.Union[typing.Union[base.InputFile, base.String], None] = None, caption: typing.Union[base.String, None] = None, parse_mode: typing.Union[base.String, None] = None, disable_notification: typing.Union[base.Boolean, None] = None, @@ -1262,6 +1293,9 @@ class Message(base.TelegramObject): :type width: :obj:`typing.Union[base.Integer, None]` :param height: Video height :type height: :obj:`typing.Union[base.Integer, None]` + :param thumb: Thumbnail of the file sent. The thumbnail should be in JPEG format and less than 200 kB in size. + A thumbnail‘s width and height should not exceed 320. + :type thumb: :obj:`typing.Union[typing.Union[base.InputFile, base.String], None]` :param caption: Video caption (may also be used when resending videos by file_id), 0-200 characters :type caption: :obj:`typing.Union[base.String, None]` :param parse_mode: Send Markdown or HTML, if you want Telegram apps to show bold, italic, @@ -1283,6 +1317,7 @@ class Message(base.TelegramObject): duration=duration, width=width, height=height, + thumb=thumb, caption=caption, parse_mode=parse_mode, disable_notification=disable_notification, @@ -1350,6 +1385,7 @@ class Message(base.TelegramObject): video_note: typing.Union[base.InputFile, base.String], duration: typing.Union[base.Integer, None] = None, length: typing.Union[base.Integer, None] = None, + thumb: typing.Union[typing.Union[base.InputFile, base.String], None] = None, disable_notification: typing.Union[base.Boolean, None] = None, reply_markup: typing.Union[ InlineKeyboardMarkup, @@ -1372,6 +1408,9 @@ class Message(base.TelegramObject): :type duration: :obj:`typing.Union[base.Integer, None]` :param length: Video width and height :type length: :obj:`typing.Union[base.Integer, None]` + :param thumb: Thumbnail of the file sent. The thumbnail should be in JPEG format and less than 200 kB in size. + A thumbnail‘s width and height should not exceed 320. + :type thumb: :obj:`typing.Union[typing.Union[base.InputFile, base.String], None]` :param disable_notification: Sends the message silently. Users will receive a notification with no sound. :type disable_notification: :obj:`typing.Union[base.Boolean, None]` :param reply_markup: Additional interface options. A JSON-serialized object for an inline keyboard, @@ -1387,6 +1426,7 @@ class Message(base.TelegramObject): video_note=video_note, duration=duration, length=length, + thumb=thumb, disable_notification=disable_notification, reply_to_message_id=self.message_id if reply else None, reply_markup=reply_markup, diff --git a/tests/contrib/fsm_storage/test_aiomongo.py b/tests/contrib/fsm_storage/test_aiomongo.py new file mode 100644 index 00000000..4940711d --- /dev/null +++ b/tests/contrib/fsm_storage/test_aiomongo.py @@ -0,0 +1,15 @@ +import importlib + +import aiogram + + +def test_file_deleted(): + try: + major, minor, _ = aiogram.__version__.split(".") + except ValueError: # raised if version is major.minor + major, minor = aiogram.__version__.split(".") + if major == "2" and int(minor) >= 11: + mongo_aiomongo = importlib.util.find_spec("aiogram.contrib.fsm_storage.mongo_aiomongo") + assert mongo_aiomongo is False, "Remove aiogram.contrib.fsm_storage.mongo_aiomongo file, and replace storage " \ + "in aiogram.contrib.fsm_storage.mongo with storage " \ + "from aiogram.contrib.fsm_storage.mongo_motor"