Asyncio

telegram/_bot.py

@@ -1036,7 +1036,7 @@ async def send_audio(
         if caption_entities:
             data['caption_entities'] = caption_entities
         if thumb:
-            data['thumb'] = parse_file_input(thumb)
+            data['thumb'] = parse_file_input(thumb, attach=True)
 
         return await self._send_message(  # type: ignore[return-value]
             'sendAudio',
@@ -1171,7 +1171,7 @@ async def send_document(
         if disable_content_type_detection is not None:
             data['disable_content_type_detection'] = disable_content_type_detection
         if thumb:
-            data['thumb'] = parse_file_input(thumb)
+            data['thumb'] = parse_file_input(thumb, attach=True)
 
         return await self._send_message(  # type: ignore[return-value]
             'sendDocument',
@@ -1410,7 +1410,7 @@ async def send_video(
         if height:
             data['height'] = height
         if thumb:
-            data['thumb'] = parse_file_input(thumb)
+            data['thumb'] = parse_file_input(thumb, attach=True)
 
         return await self._send_message(  # type: ignore[return-value]
             'sendVideo',
@@ -1533,7 +1533,7 @@ async def send_video_note(
         if length is not None:
             data['length'] = length
         if thumb:
-            data['thumb'] = parse_file_input(thumb)
+            data['thumb'] = parse_file_input(thumb, attach=True)
 
         return await self._send_message(  # type: ignore[return-value]
             'sendVideoNote',
@@ -1673,7 +1673,7 @@ async def send_animation(
         if height:
             data['height'] = height
         if thumb:
-            data['thumb'] = parse_file_input(thumb)
+            data['thumb'] = parse_file_input(thumb, attach=True)
         if caption:
             data['caption'] = caption
         if caption_entities:

telegram/_files/inputfile.py

@@ -49,25 +49,32 @@ class InputFile:
             .. versionchanged:: 14.0
                 Accept string input.
         filename (:obj:`str`, optional): Filename for this InputFile.
+        attach (:obj:`bool`, optional): Pass :obj:`True` if the parameter this file belongs to in
+            the request to Telegram should point to the multipart data via an ``attach://`` URI.
+            Defaults to `False`.
 
     Attributes:
         input_file_content (:obj:`bytes`): The binary content of the file to send.
-        attach_name (:obj:`str`): Attach name.
+        attach_name (:obj:`str`, Optional ): If present, the parameter this file belongs to in
+            the request to Telegram should point to the multipart data via a an URI of the form
+            ``attach://<attach_name>`` URI.
         filename (:obj:`str`): Filename for the file to be sent.
         mimetype (:obj:`str`): The mimetype inferred from the file to be sent.
 
     """
 
     __slots__ = ('filename', 'attach_name', 'input_file_content', 'mimetype')
 
-    def __init__(self, obj: Union[IO[bytes], bytes, str], filename: str = None):
+    def __init__(
+        self, obj: Union[IO[bytes], bytes, str], filename: str = None, attach: bool = False
+    ):
         if isinstance(obj, bytes):
             self.input_file_content = obj
         elif isinstance(obj, str):
             self.input_file_content = obj.encode('utf-8')
         else:
             self.input_file_content = obj.read()
-        self.attach_name = 'attached' + uuid4().hex
+        self.attach_name: Optional[str] = 'attached' + uuid4().hex if attach else None
 
         if (
             not filename
@@ -119,6 +126,7 @@ def field_tuple(self) -> FieldTuple:
         return self.filename, self.input_file_content, self.mimetype
 
     @property
-    def attach_uri(self) -> str:
-        """URI to insert into the JSON data for uploading the file."""
-        return f'attach://{self.attach_name}'
+    def attach_uri(self) -> Optional[str]:
+        """URI to insert into the JSON data for uploading the file. Returns :obj:`None`, if
+        :attr:`attach_name` is :obj:`None`."""
+        return f'attach://{self.attach_name}' if self.attach_name else None

telegram/_files/inputmedia.py

@@ -103,7 +103,7 @@ def to_dict(self) -> JSONDict:
 
     @staticmethod
     def _parse_thumb_input(thumb: Optional[FileInput]) -> Optional[Union[str, InputFile]]:
-        return parse_file_input(thumb) if thumb is not None else thumb
+        return parse_file_input(thumb, attach=True) if thumb is not None else thumb
 
 
 class InputMediaAnimation(InputMedia):
@@ -184,7 +184,7 @@ def __init__(
             duration = media.duration if duration is None else duration
             media = media.file_id
         else:
-            media = parse_file_input(media, filename=filename)
+            media = parse_file_input(media, filename=filename, attach=True)
 
         super().__init__(InputMediaType.ANIMATION, media, caption, caption_entities, parse_mode)
         self.thumb = self._parse_thumb_input(thumb)
@@ -240,7 +240,7 @@ def __init__(
         caption_entities: Union[List[MessageEntity], Tuple[MessageEntity, ...]] = None,
         filename: str = None,
     ):
-        media = parse_file_input(media, PhotoSize, filename=filename)
+        media = parse_file_input(media, PhotoSize, filename=filename, attach=True)
         super().__init__(InputMediaType.PHOTO, media, caption, caption_entities, parse_mode)
 
 
@@ -331,7 +331,7 @@ def __init__(
             duration = duration if duration is not None else media.duration
             media = media.file_id
         else:
-            media = parse_file_input(media, filename=filename)
+            media = parse_file_input(media, filename=filename, attach=True)
 
         super().__init__(InputMediaType.VIDEO, media, caption, caption_entities, parse_mode)
         self.width = width
@@ -422,7 +422,7 @@ def __init__(
             title = media.title if title is None else title
             media = media.file_id
         else:
-            media = parse_file_input(media, filename=filename)
+            media = parse_file_input(media, filename=filename, attach=True)
 
         super().__init__(InputMediaType.AUDIO, media, caption, caption_entities, parse_mode)
         self.thumb = self._parse_thumb_input(thumb)
@@ -496,7 +496,7 @@ def __init__(
         caption_entities: Union[List[MessageEntity], Tuple[MessageEntity, ...]] = None,
         filename: str = None,
     ):
-        media = parse_file_input(media, Document, filename=filename)
+        media = parse_file_input(media, Document, filename=filename, attach=True)
         super().__init__(InputMediaType.DOCUMENT, media, caption, caption_entities, parse_mode)
         self.thumb = self._parse_thumb_input(thumb)
         self.disable_content_type_detection = disable_content_type_detection

telegram/_utils/enum.py

@@ -0,0 +1,36 @@
+#
+#  A library that provides a Python interface to the Telegram Bot API
+#  Copyright (C) 2015-2022
+#  Leandro Toledo de Souza <devs@python-telegram-bot.org>
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU Lesser Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU Lesser Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser Public License
+#  along with this program.  If not, see [http://www.gnu.org/licenses/].
+"""This module contains a helper class for Enums that should be subclasses of `str`.
+
+Warning:
+    Contents of this module are intended to be used internally by the library and *not* by the
+    user. Changes to this module are not considered breaking changes and may not be documented in
+    the changelog.
+"""
+from enum import Enum
+
+
+class StringEnum(str, Enum):
+    """Helper class for string enums where the value is not important to be displayed on
+    stringification.
+    """
+
+    __slots__ = ()
+
+    def __repr__(self) -> str:
+        return f'<{self.__class__.__name__}.{self.name}>'

telegram/_utils/files.py

@@ -58,6 +58,7 @@ def parse_file_input(
     file_input: Union[FileInput, 'TelegramObject'],
     tg_type: Type['TelegramObject'] = None,
     filename: str = None,
+    attach: bool = False,
 ) -> Union[str, 'InputFile', Any]:
     """
     Parses input for sending files:
@@ -77,6 +78,9 @@ def parse_file_input(
             :class:`telegram.Animation`.
         filename (:obj:`str`, optional): The filename. Only relevant in case an
             :class:`telegram.InputFile` is returned.
+        attach (:obj:`bool`, optional): Pass :obj:`True` if the parameter this file belongs to in
+            the request to Telegram should point to the multipart data via an ``attach://`` URI.
+            Defaults to `False`. Only relevant if an :class:`telegram.InputFile` is returned.
 
     Returns:
         :obj:`str` | :class:`telegram.InputFile` | :obj:`object`: The parsed input or the untouched
@@ -94,9 +98,9 @@ def parse_file_input(
             out = file_input  # type: ignore[assignment]
         return out
     if isinstance(file_input, bytes):
-        return InputFile(file_input, filename=filename)
+        return InputFile(file_input, filename=filename, attach=attach)
     if hasattr(file_input, 'read'):
-        return InputFile(cast(IO, file_input), filename=filename)
+        return InputFile(cast(IO, file_input), filename=filename, attach=attach)
     if tg_type and isinstance(file_input, tg_type):
         return file_input.file_id  # type: ignore[attr-defined]
     return file_input

telegram/constants.py

@@ -63,20 +63,10 @@
     'UpdateType',
 ]
 
-from enum import Enum, IntEnum
+from enum import IntEnum
 from typing import List
 
-
-class _StringEnum(str, Enum):
-    """Helper class for string enums where the value is not important to be displayed on
-    stringification.
-    """
-
-    __slots__ = ()
-
-    def __repr__(self) -> str:
-        return f'<{self.__class__.__name__}.{self.name}>'
-
+from telegram._utils.enum import StringEnum
 
 BOT_API_VERSION = '5.7'
 
@@ -85,7 +75,7 @@ def __repr__(self) -> str:
 SUPPORTED_WEBHOOK_PORTS: List[int] = [443, 80, 88, 8443]
 
 
-class BotCommandScopeType(_StringEnum):
+class BotCommandScopeType(StringEnum):
     """This enum contains the available types of :class:`telegram.BotCommandScope`. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
 
@@ -125,7 +115,7 @@ class CallbackQueryLimit(IntEnum):
     :meth:`telegram.Bot.answer_callback_query`."""
 
 
-class ChatAction(_StringEnum):
+class ChatAction(StringEnum):
     """This enum contains the available chat actions for :meth:`telegram.Bot.send_chat_action`.
     The enum members of this enumeration are instances of :class:`str` and can be treated as such.
 
@@ -210,7 +200,7 @@ class ChatInviteLinkLimit(IntEnum):
     :meth:`telegram.Bot.create_chat_invite_link` and :meth:`telegram.Bot.edit_chat_invite_link`."""
 
 
-class ChatMemberStatus(_StringEnum):
+class ChatMemberStatus(StringEnum):
     """This enum contains the available states for :class:`telegram.ChatMember`. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
 
@@ -233,7 +223,7 @@ class ChatMemberStatus(_StringEnum):
     """:obj:`str`: A :class:`telegram.ChatMember` who was restricted in this chat."""
 
 
-class ChatType(_StringEnum):
+class ChatType(StringEnum):
     """This enum contains the available types of :class:`telegram.Chat`. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
 
@@ -255,7 +245,7 @@ class ChatType(_StringEnum):
     """:obj:`str`: A :class:`telegram.Chat` that is a channel."""
 
 
-class DiceEmoji(_StringEnum):
+class DiceEmoji(StringEnum):
     """This enum contains the available emoji for :class:`telegram.Dice`/
     :meth:`telegram.Bot.send_dice`. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
@@ -344,7 +334,7 @@ class InlineKeyboardMarkupLimit(IntEnum):
     """
 
 
-class InputMediaType(_StringEnum):
+class InputMediaType(StringEnum):
     """This enum contains the available types of :class:`telegram.InputMedia`. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
 
@@ -383,7 +373,7 @@ class InlineQueryLimit(IntEnum):
     :meth:`telegram.Bot.answer_inline_query`."""
 
 
-class InlineQueryResultType(_StringEnum):
+class InlineQueryResultType(StringEnum):
     """This enum contains the available types of :class:`telegram.InlineQueryResult`. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
 
@@ -457,7 +447,7 @@ class LocationLimit(IntEnum):
     """
 
 
-class MaskPosition(_StringEnum):
+class MaskPosition(StringEnum):
     """This enum contains the available positions for :class:`telegram.MaskPosition`. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
 
@@ -476,7 +466,7 @@ class MaskPosition(_StringEnum):
     """:obj:`str`: Mask position for a sticker on the chin."""
 
 
-class MessageAttachmentType(_StringEnum):
+class MessageAttachmentType(StringEnum):
     """This enum contains the available types of :class:`telegram.Message` that can bee seens
     as attachment. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
@@ -525,7 +515,7 @@ class MessageAttachmentType(_StringEnum):
     """:obj:`str`: Messages with :attr:`telegram.Message.venue`."""
 
 
-class MessageEntityType(_StringEnum):
+class MessageEntityType(StringEnum):
     """This enum contains the available types of :class:`telegram.MessageEntity`. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
 
@@ -592,7 +582,7 @@ class MessageLimit(IntEnum):
     """
 
 
-class MessageType(_StringEnum):
+class MessageType(StringEnum):
     """This enum contains the available types of :class:`telegram.Message` that can be seen
     as attachment. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
@@ -679,7 +669,7 @@ class MessageType(_StringEnum):
     """:obj:`str`: Messages with :attr:`telegram.Message.voice_chat_participants_invited`."""
 
 
-class ParseMode(_StringEnum):
+class ParseMode(StringEnum):
     """This enum contains the available parse modes. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
 
@@ -719,7 +709,7 @@ class PollLimit(IntEnum):
     """:obj:`str`: Maximum number of available options for the poll."""
 
 
-class PollType(_StringEnum):
+class PollType(StringEnum):
     """This enum contains the available types for :class:`telegram.Poll`/
     :meth:`telegram.Bot.send_poll`. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
@@ -735,7 +725,7 @@ class PollType(_StringEnum):
     """:obj:`str`: quiz polls."""
 
 
-class UpdateType(_StringEnum):
+class UpdateType(StringEnum):
     """This enum contains the available types of :class:`telegram.Update`. The enum
     members of this enumeration are instances of :class:`str` and can be treated as such.
 

telegram/request/_baserequest.py

@@ -18,7 +18,6 @@
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 """This module contains an abstract class to make POST and GET requests."""
 import abc
-import traceback
 from contextlib import AbstractAsyncContextManager
 from http import HTTPStatus
 from types import TracebackType
@@ -280,7 +279,6 @@ async def _request_wrapper(
         except TelegramError as exc:
             raise exc
         except Exception as exc:
-            traceback.print_tb(exc.__traceback__)
             raise NetworkError(f"Unknown error in HTTP implementation: {repr(exc)}") from exc
 
         if HTTPStatus.OK <= code <= 299: