From 2845217190b6126dc633bad0fc562d8a6288edb0 Mon Sep 17 00:00:00 2001 From: Nikita Grogolev Date: Fri, 18 Apr 2025 21:33:46 +0600 Subject: [PATCH 1/2] Fix: InputPaidMedia default parse_mode insertation --- telegram/ext/_extbot.py | 8 ++++++-- tests/auxil/bot_method_checks.py | 13 ++++++++++--- tests/test_bot.py | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/telegram/ext/_extbot.py b/telegram/ext/_extbot.py index 20a72917074..f74304b5b64 100644 --- a/telegram/ext/_extbot.py +++ b/telegram/ext/_extbot.py @@ -62,6 +62,7 @@ InlineKeyboardMarkup, InlineQueryResultsButton, InputMedia, + InputPaidMedia, InputPollOption, LinkPreviewOptions, Location, @@ -114,7 +115,6 @@ InputMediaDocument, InputMediaPhoto, InputMediaVideo, - InputPaidMedia, InputSticker, LabeledPrice, MessageEntity, @@ -466,7 +466,11 @@ def _insert_defaults(self, data: dict[str, object]) -> None: with copied_val._unfrozen(): copied_val.parse_mode = self.defaults.parse_mode data[key] = copied_val - elif key == "media" and isinstance(val, Sequence): + elif ( + key == "media" + and isinstance(val, Sequence) + and not isinstance(val[0], InputPaidMedia) + ): # Copy objects as not to edit them in-place copy_list = [copy(media) for media in val] for media in copy_list: diff --git a/tests/auxil/bot_method_checks.py b/tests/auxil/bot_method_checks.py index d396a462725..18f7dd93e45 100644 --- a/tests/auxil/bot_method_checks.py +++ b/tests/auxil/bot_method_checks.py @@ -35,6 +35,7 @@ InlineQueryResultArticle, InlineQueryResultCachedPhoto, InputMediaPhoto, + InputPaidMediaPhoto, InputTextMessageContent, LinkPreviewOptions, ReplyParameters, @@ -285,8 +286,13 @@ def build_kwargs( elif name in ["prices", "commands", "errors"]: kws[name] = [] elif name == "media": - media = InputMediaPhoto("media", parse_mode=manually_passed_value) - if "list" in str(param.annotation).lower(): + if "star_count" in signature.parameters: + media = InputPaidMediaPhoto("media") + else: + media = InputMediaPhoto("media", parse_mode=manually_passed_value) + + param_annotation = str(param.annotation).lower() + if "sequence" in param_annotation or "list" in param_annotation: kws[name] = [media] else: kws[name] = media @@ -507,7 +513,8 @@ def check_input_media(m: dict): ) media = data.pop("media", None) - if media: + paid_media = media and data.pop("star_count", None) + if media and not paid_media: if isinstance(media, dict) and isinstance(media.get("type", None), InputMediaType): check_input_media(media) else: diff --git a/tests/test_bot.py b/tests/test_bot.py index 2f8f2431282..22ffc9accc7 100644 --- a/tests/test_bot.py +++ b/tests/test_bot.py @@ -543,7 +543,7 @@ def test_api_kwargs_and_timeouts_present(self, bot_class, bot_method_name, bot_m if bot_method_name.replace("_", "").lower() != "getupdates" and bot_class is ExtBot: assert rate_arg in param_names, f"{bot_method} is missing the parameter `{rate_arg}`" - @bot_methods(ext_bot=False) + @bot_methods() async def test_defaults_handling( self, bot_class, From 9d5c03d74f1854a76dda3cacf4e3b08cd09e756a Mon Sep 17 00:00:00 2001 From: Hinrich Mahler <22366557+Bibo-Joshi@users.noreply.github.com> Date: Sat, 19 Apr 2025 16:52:05 +0200 Subject: [PATCH 2/2] Add chango fragment --- changes/unreleased/4761.mmsngFA6b4ccdEzEpFTZS3.toml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changes/unreleased/4761.mmsngFA6b4ccdEzEpFTZS3.toml diff --git a/changes/unreleased/4761.mmsngFA6b4ccdEzEpFTZS3.toml b/changes/unreleased/4761.mmsngFA6b4ccdEzEpFTZS3.toml new file mode 100644 index 00000000000..a47dcdcc3b1 --- /dev/null +++ b/changes/unreleased/4761.mmsngFA6b4ccdEzEpFTZS3.toml @@ -0,0 +1,6 @@ +bugfixes = "Fix Handling of ``Defaults`` for ``InputPaidMedia``" + +[[pull_requests]] +uid = "4761" +author_uid = "ngrogolev" +closes_threads = ["4753"] pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy