botapi-py 1.4.14__tar.gz → 1.5.1__tar.gz

{botapi_py-1.4.14 → botapi_py-1.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: botapi-py
-Version: 1.4.14
+Version: 1.5.1
 Summary: A simple and flexible Python library to conveniently build fast Telegram bots using the Bot API.
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: pydantic>=2.12.0

{botapi_py-1.4.14 → botapi_py-1.5.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "botapi-py"
-version = "1.4.14"
+version = "1.5.1"
 description = "A simple and flexible Python library to conveniently build fast Telegram bots using the Bot API."
 # readme = "README.md"
 # authors = [

botapi_py-1.5.1/src/botapi/__init__.py

@@ -0,0 +1,4 @@
+from . import enums, errors, types, dispatchers
+from .bot import Bot
+
+__all__ = ['Bot', 'types', 'enums', 'errors', 'dispatchers']

botapi_py-1.5.1/src/botapi/__init__.pyi

@@ -0,0 +1,4 @@
+from . import enums, errors, types, dispatchers
+from .bot import Bot
+
+__all__ = ['Bot', 'types', 'enums', 'errors', 'dispatchers']

botapi_py-1.4.14/src/botapi/shortcuts.py → botapi_py-1.5.1/src/botapi/bot.py

@@ -1,17 +1,19 @@
 from __future__ import annotations
 
-from typing import Optional, Union, List, cast
+from typing import Optional, Union, List
 
 from . import enums
 from . import types
-
 from . import methods
 
 
-class BotShortcuts:
+class Bot(methods.Methods):
 	'''
-	Mixin class containing shortcut bound methods for the `Bot` class.
-	These methods provide convenient wrappers around standard API methods.
+	A (very lightweight) instance of a Telegram Bot.
+	Use this to call API methods and shortcut bound methods.
+	
+	_Remember to pass an existing `httpx.AsyncClient` instance
+	to avoid significant performance degradation in production._
 	'''
 	
 	async def send_media(
@@ -20,7 +22,7 @@ class BotShortcuts:
 		media: Union[types.InputFile, str, None],
 		file_type: Optional[enums.MediaType | str],
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[types.MessageEntity]] = None,
 		show_caption_above_media: Optional[bool] = None,
 		has_spoiler: Optional[bool] = None,
@@ -35,8 +37,8 @@ class BotShortcuts:
 		disable_content_type_detection: Optional[bool] = None, # Documents only
 	) -> types.Message:
 		'''
-		Method that sends common types of media by automatically routing to the correct `send_<type>` method.
-		Also supports send_message with text only for convenience.
+		Shortcut method that sends common types of media by automatically routing to the correct `send_<type>` method.
+		Also supports `send_message` for plaintext-only messages for convenience.
 		
 		:param chat_id: Unique identifier for the target chat or username of the target channel.
 		:param media: File to send. Pass a file_id as String to send a file that exists on the Telegram servers (recommended), pass an HTTP URL as a String for Telegram to get a file from the Internet, or upload a new one using multipart/form-data.
@@ -57,7 +59,6 @@ class BotShortcuts:
 		:param disable_content_type_detection: Disables automatic server-side content type detection.
 		:return: On success, the sent Message is returned.
 		'''
-		self = cast(methods.Bot, self)
 		
 		# Plain text message
 		if not media or not file_type:
@@ -66,7 +67,7 @@ class BotShortcuts:
 				
 			return await self.send_message(
 				chat_id=chat_id,
-				# =media,
+				# media=media,
 				text=caption,
 				parse_mode=parse_mode,
 				entities=caption_entities,
@@ -237,7 +238,7 @@ class BotShortcuts:
 					# show_caption_above_media=show_caption_above_media
 				)
 				
-			case enums.MediaType.STORY, enums.MediaType.PAID_MEDIA:
+			case enums.MediaType.STORY | enums.MediaType.PAID_MEDIA:
 				raise ValueError(f'Unsupported media type: {file_type}')
 				
 			case _:

botapi_py-1.5.1/src/botapi/core.py

@@ -0,0 +1,105 @@
+from __future__ import annotations
+
+from . import errors
+from . import internals
+
+from typing import Any, Optional, Dict
+from pydantic import TypeAdapter
+
+import logging
+import httpx
+import json
+
+log = logging.getLogger(__name__)
+
+class BaseBot:
+	def __init__(
+		self,
+		token: str,
+		api_url: str = 'https://api.telegram.org',
+		session: Optional[httpx.AsyncClient] = None,
+		test_server: bool = False,
+	):
+		self.token: str = token.removeprefix('bot')
+		self.api_url: str = api_url
+		self.session: httpx.AsyncClient = session or httpx.AsyncClient(timeout=120)
+		self.test_server: bool = test_server
+		
+		if not session:
+			log.warning('No HTTP session provided, creating a new one.')
+			
+	@property
+	def bot_id(self) -> int:
+		'''
+		Returns the bot's user ID by extracting it from the token.
+		'''
+		return int(self.token.split(':')[0])
+		
+	def _compose_api_url(self, method: str) -> str:
+		url = f'{self.api_url}/bot{self.token}/'
+		if self.test_server:
+			url += 'test/'
+		url += method
+		return url
+		
+	def _compose_api_file_url(self, file_path: str) -> str:
+		'''
+		Composes the URL for file downloads from the Telegram Bot API.
+		'''
+		# https://api.telegram.org/file/bot<token>/<file_path>
+		# https://api.telegram.org/file/bot<token>/test/<file_path>
+		url = f'{self.api_url}/file/bot{self.token}/'
+		if self.test_server:
+			url += 'test/'
+		url += file_path
+		return url
+		
+	def _convert_data(self, data: dict[str, Any]) -> tuple[dict[str, Any], internals.MultipartFiles]:
+		'''
+		Converts the dictionary of class instances and raw types into a format
+		suitable to be sent to the Telegram Bot API through an HTTP request, with POST data and multipart files.
+		'''
+		files: internals.MultipartFiles = {} # (filename, file_content, mime_type)
+		
+		# We use a TypeAdapter to dump the entire dict tree.
+		# Pydantic `mode='json'` automatically converts sub-models to dicts and primitives.
+		# The `context` is passed down to every node, and it allows, for example,
+		#	the custom `InputFile` serializer to give us access to the multipart data,
+		# 	and just serialize as the appropriate `attach://attach_name` string instead of using weird hacks.
+		serialized_data: dict[str, Any] = TypeAdapter(dict[str, Any]).dump_python(
+			data,
+			mode='json', 
+			exclude_none=True,
+			context={
+				'files': files
+			}
+		)
+		
+		# Telegram requires root-level lists/dicts to be JSON encoded strings.
+		for key, value in serialized_data.items():
+			if isinstance(value, (dict, list)):
+				serialized_data[key] = json.dumps(value)
+				
+		return serialized_data, files
+		
+	async def _send_request(self, method: str, data: Dict[str, Any]) -> Any:
+		'''
+		Sends a POST request to the Telegram Bot API.
+		'''
+		converted_data, files = self._convert_data(data)
+		
+		request = await self.session.post(
+			url=self._compose_api_url(method),
+			data=converted_data,
+			files=files or None
+		)
+		result: dict[str, Any] = request.json()
+		
+		if not result['ok']:
+			raise errors.BotAPIError(
+				method=method,
+				response=result
+			)
+			
+		return result['result']
+

{botapi_py-1.4.14 → botapi_py-1.5.1}/src/botapi/dispatchers/get_updates_handler.py

@@ -20,7 +20,7 @@ class GetUpdatesAsyncDispatcher(BaseAsyncDispatcher):
 	update_handler_argcount: int
 	tasks_shutdown_timeout: float
 	tasks: set[asyncio.Task] # prevent gc from collecting tasks before they finish
-	bot: botapi.methods.Bot
+	bot: botapi.Bot
 	reconnect_delay: float
 	allowed_updates: list[botapi.enums.UpdateType]
 	offset: int
@@ -28,7 +28,7 @@ class GetUpdatesAsyncDispatcher(BaseAsyncDispatcher):
 	def __init__(
 		self,
 		update_handler: UpdateHandler,
-		bot: botapi.methods.Bot,
+		bot: botapi.Bot,
 		allowed_updates: list[botapi.enums.UpdateType],
 		reconnect_delay: float = 5,
 		shutdown_wait_timeout: float = 3
@@ -138,7 +138,7 @@ class GetUpdatesAsyncDispatcher(BaseAsyncDispatcher):
 				
 			except httpx.RequestError as e:
 				# logger.exception('Request error:')
-				logger.error('Request error, retrying soon: %s', e)
+				logger.error('Request error, retrying soon: %r', e)
 				await asyncio.sleep(delay=self.reconnect_delay)
 				
 			except asyncio.CancelledError:

{botapi_py-1.4.14 → botapi_py-1.5.1}/src/botapi/enums.py

@@ -52,13 +52,13 @@ class MediaType(enum.StrEnum):
 	ANIMATION = 'animation'
 	AUDIO = 'audio'
 	DOCUMENT = 'document'
-	PHOTO = 'photo'
+	PHOTO = 'photo' # this is a list of `PhotoSize` objects
 	STICKER = 'sticker'
 	VIDEO = 'video'
 	VIDEO_NOTE = 'video_note'
 	VOICE = 'voice'
 	STORY = 'story' # does not have `file_id`, only `id`
-	PAID_MEDIA = 'paid_media'
+	PAID_MEDIA = 'paid_media' # this contains a `photo` attribute that is a list of `PhotoSize` objects
 	
 class ServiceMessage(enum.StrEnum):
 	'''

botapi_py-1.5.1/src/botapi/internals.py

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+from typing import Optional, TypeAlias
+
+MultipartFile: TypeAlias = tuple[
+	str | None,
+	bytes,
+	Optional[str]
+] # (filename, file_content, mime_type)
+
+MultipartFiles: TypeAlias = dict[str, MultipartFile]

{botapi_py-1.4.14 → botapi_py-1.5.1}/src/botapi/methods.py

@@ -10,8 +10,6 @@ from . import core
 
 from . import enums
 
-from .shortcuts import BotShortcuts
-
 from .types import (
 	Update,
 	WebhookInfo,
@@ -321,20 +319,13 @@ from .types import (
 	BoolAdapter,
 )
 
-class Bot(core.BaseBot, BotShortcuts):
-	'''
-	Creates an instance of a new Bot API client.
-
-	_Remember to pass an existing `httpx.AsyncClient` instance
-	to avoid significant performance degradation in production._
-	'''
-
+class Methods(core.BaseBot):
 	async def get_updates(
 		self,
 		offset: Optional[int] = None,
 		limit: Optional[int] = None,
 		timeout: Optional[int] = None,
-		allowed_updates: Optional[List[enums.UpdateType]] = None,
+		allowed_updates: Optional[Union[List[str], List[enums.UpdateType]]] = None,
 	) -> List[Update]:
 		'''
         Use this method to receive incoming updates using
@@ -358,7 +349,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		certificate: Optional[InputFile] = None,
 		ip_address: Optional[str] = None,
 		max_connections: Optional[int] = None,
-		allowed_updates: Optional[List[enums.UpdateType]] = None,
+		allowed_updates: Optional[Union[List[str], List[enums.UpdateType]]] = None,
 		drop_pending_updates: Optional[bool] = None,
 		secret_token: Optional[str] = None,
 	) -> bool:
@@ -480,7 +471,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		business_connection_id: Optional[str] = None,
 		message_thread_id: Optional[int] = None,
 		direct_messages_topic_id: Optional[int] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		entities: Optional[List[MessageEntity]] = None,
 		link_preview_options: Optional[LinkPreviewOptions] = None,
 		disable_notification: Optional[bool] = None,
@@ -504,7 +495,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'message_thread_id': message_thread_id,
 			'direct_messages_topic_id': direct_messages_topic_id,
 			'text': text,
-			'parse_mode': parse_mode if not entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'entities': entities,
 			'link_preview_options': link_preview_options,
 			'disable_notification': disable_notification,
@@ -595,7 +586,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		direct_messages_topic_id: Optional[int] = None,
 		video_start_timestamp: Optional[int] = None,
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[MessageEntity]] = None,
 		show_caption_above_media: Optional[bool] = None,
 		disable_notification: Optional[bool] = None,
@@ -629,7 +620,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'message_id': message_id,
 			'video_start_timestamp': video_start_timestamp,
 			'caption': caption,
-			'parse_mode': parse_mode if not caption_entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'caption_entities': caption_entities,
 			'show_caption_above_media': show_caption_above_media,
 			'disable_notification': disable_notification,
@@ -691,7 +682,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		message_thread_id: Optional[int] = None,
 		direct_messages_topic_id: Optional[int] = None,
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[MessageEntity]] = None,
 		show_caption_above_media: Optional[bool] = None,
 		has_spoiler: Optional[bool] = None,
@@ -717,7 +708,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'direct_messages_topic_id': direct_messages_topic_id,
 			'photo': photo,
 			'caption': caption,
-			'parse_mode': parse_mode if not caption_entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'caption_entities': caption_entities,
 			'show_caption_above_media': show_caption_above_media,
 			'has_spoiler': has_spoiler,
@@ -739,7 +730,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		message_thread_id: Optional[int] = None,
 		direct_messages_topic_id: Optional[int] = None,
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[MessageEntity]] = None,
 		duration: Optional[int] = None,
 		performer: Optional[str] = None,
@@ -773,7 +764,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'direct_messages_topic_id': direct_messages_topic_id,
 			'audio': audio,
 			'caption': caption,
-			'parse_mode': parse_mode if not caption_entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'caption_entities': caption_entities,
 			'duration': duration,
 			'performer': performer,
@@ -798,7 +789,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		direct_messages_topic_id: Optional[int] = None,
 		thumbnail: Optional[Union[InputFile, str]] = None,
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[MessageEntity]] = None,
 		disable_content_type_detection: Optional[bool] = None,
 		disable_notification: Optional[bool] = None,
@@ -827,7 +818,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'document': document,
 			'thumbnail': thumbnail,
 			'caption': caption,
-			'parse_mode': parse_mode if not caption_entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'caption_entities': caption_entities,
 			'disable_content_type_detection': disable_content_type_detection,
 			'disable_notification': disable_notification,
@@ -854,7 +845,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		cover: Optional[Union[InputFile, str]] = None,
 		start_timestamp: Optional[int] = None,
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[MessageEntity]] = None,
 		show_caption_above_media: Optional[bool] = None,
 		has_spoiler: Optional[bool] = None,
@@ -891,7 +882,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'cover': cover,
 			'start_timestamp': start_timestamp,
 			'caption': caption,
-			'parse_mode': parse_mode if not caption_entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'caption_entities': caption_entities,
 			'show_caption_above_media': show_caption_above_media,
 			'has_spoiler': has_spoiler,
@@ -918,7 +909,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		height: Optional[int] = None,
 		thumbnail: Optional[Union[InputFile, str]] = None,
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[MessageEntity]] = None,
 		show_caption_above_media: Optional[bool] = None,
 		has_spoiler: Optional[bool] = None,
@@ -952,7 +943,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'height': height,
 			'thumbnail': thumbnail,
 			'caption': caption,
-			'parse_mode': parse_mode if not caption_entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'caption_entities': caption_entities,
 			'show_caption_above_media': show_caption_above_media,
 			'has_spoiler': has_spoiler,
@@ -974,7 +965,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		message_thread_id: Optional[int] = None,
 		direct_messages_topic_id: Optional[int] = None,
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[MessageEntity]] = None,
 		duration: Optional[int] = None,
 		disable_notification: Optional[bool] = None,
@@ -1008,7 +999,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'direct_messages_topic_id': direct_messages_topic_id,
 			'voice': voice,
 			'caption': caption,
-			'parse_mode': parse_mode if not caption_entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'caption_entities': caption_entities,
 			'duration': duration,
 			'disable_notification': disable_notification,
@@ -1077,7 +1068,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		direct_messages_topic_id: Optional[int] = None,
 		payload: Optional[str] = None,
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[MessageEntity]] = None,
 		show_caption_above_media: Optional[bool] = None,
 		disable_notification: Optional[bool] = None,
@@ -1103,7 +1094,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'media': media,
 			'payload': payload,
 			'caption': caption,
-			'parse_mode': parse_mode if not caption_entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'caption_entities': caption_entities,
 			'show_caption_above_media': show_caption_above_media,
 			'disable_notification': disable_notification,
@@ -1433,7 +1424,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		draft_id: int,
 		text: str,
 		message_thread_id: Optional[int] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		entities: Optional[List[MessageEntity]] = None,
 	) -> bool:
 		'''
@@ -1450,7 +1441,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'message_thread_id': message_thread_id,
 			'draft_id': draft_id,
 			'text': text,
-			'parse_mode': parse_mode if not entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'entities': entities,
 		})
 		return BoolAdapter.validate_python(response)
@@ -3400,7 +3391,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		content: InputStoryContent,
 		active_period: int,
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[MessageEntity]] = None,
 		areas: Optional[List[StoryArea]] = None,
 		post_to_chat_page: Optional[bool] = None,
@@ -3419,7 +3410,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'content': content,
 			'active_period': active_period,
 			'caption': caption,
-			'parse_mode': parse_mode if not caption_entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'caption_entities': caption_entities,
 			'areas': areas,
 			'post_to_chat_page': post_to_chat_page,
@@ -3464,7 +3455,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		story_id: int,
 		content: InputStoryContent,
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[MessageEntity]] = None,
 		areas: Optional[List[StoryArea]] = None,
 	) -> Story:
@@ -3482,7 +3473,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'story_id': story_id,
 			'content': content,
 			'caption': caption,
-			'parse_mode': parse_mode if not caption_entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'caption_entities': caption_entities,
 			'areas': areas,
 		})
@@ -3515,7 +3506,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		chat_id: Optional[Union[int, str]] = None,
 		message_id: Optional[int] = None,
 		inline_message_id: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		entities: Optional[List[MessageEntity]] = None,
 		link_preview_options: Optional[LinkPreviewOptions] = None,
 		reply_markup: Optional[InlineKeyboardMarkup] = None,
@@ -3539,7 +3530,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'message_id': message_id,
 			'inline_message_id': inline_message_id,
 			'text': text,
-			'parse_mode': parse_mode if not entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'entities': entities,
 			'link_preview_options': link_preview_options,
 			'reply_markup': reply_markup,
@@ -3556,7 +3547,7 @@ class Bot(core.BaseBot, BotShortcuts):
 		message_id: Optional[int] = None,
 		inline_message_id: Optional[str] = None,
 		caption: Optional[str] = None,
-		parse_mode: Optional[enums.ParseMode] = enums.ParseMode.HTML,
+		parse_mode: Optional[Union[str, enums.ParseMode]] = None,
 		caption_entities: Optional[List[MessageEntity]] = None,
 		show_caption_above_media: Optional[bool] = None,
 		reply_markup: Optional[InlineKeyboardMarkup] = None,
@@ -3580,7 +3571,7 @@ class Bot(core.BaseBot, BotShortcuts):
 			'message_id': message_id,
 			'inline_message_id': inline_message_id,
 			'caption': caption,
-			'parse_mode': parse_mode if not caption_entities else None, # FIX,
+			'parse_mode': parse_mode,
 			'caption_entities': caption_entities,
 			'show_caption_above_media': show_caption_above_media,
 			'reply_markup': reply_markup,