pyTelegramBotAPI 4.36.0__tar.gz → 4.36.1__tar.gz

{pytelegrambotapi-4.36.0 → pytelegrambotapi-4.36.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: pyTelegramBotAPI
-Version: 4.36.0
+Version: 4.36.1
 Summary: Python Telegram bot API.
 Project-URL: Homepage, https://github.com/eternnoir/pyTelegramBotAPI
 Project-URL: Documentation, https://pytba.readthedocs.org

{pytelegrambotapi-4.36.0 → pytelegrambotapi-4.36.1}/docs/source/conf.py

@@ -22,7 +22,7 @@ author = 'coder2020official'
 copyright = f'2022-{datetime.now().year}, {author}'
 
 # The full version, including alpha/beta/rc tags
-release = '4.36.0'
+release = '4.36.1'
 
 
 # -- General configuration ---------------------------------------------------

{pytelegrambotapi-4.36.0 → pytelegrambotapi-4.36.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pyTelegramBotAPI"
-version = "4.36.0"
+version = "4.36.1"
 description = "Python Telegram bot API."
 authors = [{name = "eternnoir", email = "eternnoir@gmail.com"}]
 license = {text = "GPL2"}

{pytelegrambotapi-4.36.0 → pytelegrambotapi-4.36.1}/requirements.txt

@@ -1,4 +1,4 @@
 pytest
 requests==2.33.0
 wheel==0.46.2
-aiohttp==3.14.1
+aiohttp==3.14.3

{pytelegrambotapi-4.36.0 → pytelegrambotapi-4.36.1}/telebot/types.py

@@ -2526,14 +2526,19 @@ class Location(JsonDeserializable, JsonSerializable, Dictionaryable):
         return json.dumps(self.to_dict())
 
     def to_dict(self):
-        return {
+        data = {
             "longitude": self.longitude,
             "latitude": self.latitude,
-            "horizontal_accuracy": self.horizontal_accuracy,
-            "live_period": self.live_period,
-            "heading": self.heading,
-            "proximity_alert_radius": self.proximity_alert_radius,
         }
+        if self.horizontal_accuracy is not None:
+            data["horizontal_accuracy"] = self.horizontal_accuracy
+        if self.live_period is not None:
+            data["live_period"] = self.live_period
+        if self.heading is not None:
+            data["heading"] = self.heading
+        if self.proximity_alert_radius is not None:
+            data["proximity_alert_radius"] = self.proximity_alert_radius
+        return data
 
 
 class Venue(JsonDeserializable):
@@ -4454,14 +4459,17 @@ class InputLocationMessageContent(Dictionaryable):
         self.proximity_alert_radius: Optional[int] = proximity_alert_radius
 
     def to_dict(self):
-        json_dict = {'latitude': self.latitude, 'longitude': self.longitude}
-        if self.horizontal_accuracy:
+        json_dict = {
+            'latitude': self.latitude,
+            'longitude': self.longitude
+        }
+        if self.horizontal_accuracy is not None:
             json_dict['horizontal_accuracy'] = self.horizontal_accuracy
-        if self.live_period:
+        if self.live_period is not None:
             json_dict['live_period'] = self.live_period
-        if self.heading:
+        if self.heading is not None:
             json_dict['heading'] = self.heading
-        if self.proximity_alert_radius:
+        if self.proximity_alert_radius is not None:
             json_dict['proximity_alert_radius'] = self.proximity_alert_radius
         return json_dict
 
@@ -5665,19 +5673,19 @@ class InlineQueryResultLocation(InlineQueryResultBase):
         json_dict = super().to_dict()
         json_dict['latitude'] = self.latitude
         json_dict['longitude'] = self.longitude
-        if self.horizontal_accuracy:
+        if self.horizontal_accuracy is not None:
             json_dict['horizontal_accuracy'] = self.horizontal_accuracy
-        if self.live_period:
+        if self.live_period is not None:
             json_dict['live_period'] = self.live_period
-        if self.heading:
+        if self.heading is not None:
             json_dict['heading'] = self.heading
-        if self.proximity_alert_radius:
+        if self.proximity_alert_radius is not None:
             json_dict['proximity_alert_radius'] = self.proximity_alert_radius
         if self.thumbnail_url:
             json_dict['thumbnail_url'] = self.thumbnail_url
-        if self.thumbnail_width:
+        if self.thumbnail_width is not None:
             json_dict['thumbnail_width'] = self.thumbnail_width
-        if self.thumbnail_height:
+        if self.thumbnail_height is not None:
             json_dict['thumbnail_height'] = self.thumbnail_height
         return json_dict
 
@@ -14679,7 +14687,7 @@ class BotAccessSettings(JsonDeserializable):
         return cls(**obj)
 
 
-class RichText(JsonDeserializable):
+class RichText(JsonDeserializable, Dictionaryable):
     """
     This object represents a rich formatted text. Currently, it can be either a String for plain text,
     an Array of :class:`RichText`, or any of the following types:
@@ -14721,9 +14729,12 @@ class RichText(JsonDeserializable):
     def de_json(cls, json_string):
         if json_string is None: return None
         if isinstance(json_string, str):
+            # "...can be either a String for plain text..."
             return json_string
         if isinstance(json_string, list):
+            # "...an Array of :class:`RichText`..."
             return [RichText.de_json(item) for item in json_string]
+        # "...or any of the following types..."
         obj = cls.check_json(json_string)
         type = obj.pop('type', None)
         if type == 'bold':
@@ -14777,7 +14788,24 @@ class RichText(JsonDeserializable):
         elif type == 'reference_link':
             return RichTextReferenceLink.de_json(obj)
         return None
-    
+
+    def to_dict(self):
+        data = {
+            'type': self.type
+        }
+        return data
+
+    @staticmethod
+    def richtext_to_dict(richtext: Union[str, List[RichText], RichText]):
+        if isinstance(richtext, str):
+            return richtext
+        elif isinstance(richtext, list):
+            return [RichText.richtext_to_dict(item) for item in richtext]
+        elif isinstance(richtext, RichText):
+            return richtext.to_dict()
+        return None
+
+
 class RichTextBold(RichText):
     """
     A bold text.
@@ -14804,6 +14832,12 @@ class RichTextBold(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        return data
+
+
 class RichTextItalic(RichText):
     """
     An italicized text.
@@ -14830,6 +14864,12 @@ class RichTextItalic(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        return data
+
+
 class RichTextUnderline(RichText):
     """
     An underlined text.
@@ -14856,6 +14896,12 @@ class RichTextUnderline(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        return data
+
+
 class RichTextStrikethrough(RichText):
     """
     A strikethrough text.
@@ -14882,6 +14928,12 @@ class RichTextStrikethrough(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        return data
+
+
 class RichTextSpoiler(RichText):
     """
     A text covered by a spoiler.
@@ -14908,6 +14960,12 @@ class RichTextSpoiler(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        return data
+
+
 class RichTextDateTime(RichText):
     """
     Formatted date and time.
@@ -14942,6 +15000,14 @@ class RichTextDateTime(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['unix_time'] = self.unix_time
+        data['date_time_format'] = self.date_time_format
+        return data
+
+
 class RichTextTextMention(RichText):
     """
     A mention of a Telegram user by their identifier.
@@ -14973,6 +15039,12 @@ class RichTextTextMention(RichText):
         obj['user'] = User.de_json(obj['user'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['user'] = self.user.to_dict()
+        return data
+
 
 class RichTextSubscript(RichText):
     """
@@ -15000,6 +15072,12 @@ class RichTextSubscript(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        return data
+
+
 class RichTextSuperscript(RichText):
     """
     A superscript text.
@@ -15026,6 +15104,12 @@ class RichTextSuperscript(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        return data
+
+
 class RichTextMarked(RichText):
     """
     A marked text.
@@ -15052,6 +15136,12 @@ class RichTextMarked(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        return data
+
+
 class RichTextCode(RichText):
     """
     A monowidth text.
@@ -15078,6 +15168,12 @@ class RichTextCode(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        return data
+
+
 class RichTextCustomEmoji(RichText):
     """
     A custom emoji.
@@ -15107,6 +15203,13 @@ class RichTextCustomEmoji(RichText):
         obj = cls.check_json(json_string)
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['custom_emoji_id'] = self.custom_emoji_id
+        data['alternative_text'] = self.alternative_text
+        return data
+
+
 class RichTextMathematicalExpression(RichText):
     """
     A mathematical expression.
@@ -15132,6 +15235,12 @@ class RichTextMathematicalExpression(RichText):
         obj = cls.check_json(json_string)
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['expression'] = self.expression
+        return data
+
+
 class RichTextUrl(RichText):
     """
     A text with a link.
@@ -15162,6 +15271,13 @@ class RichTextUrl(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['url'] = self.url
+        return data
+
+
 class RichTextEmailAddress(RichText):
     """
     A text with an email address.
@@ -15192,6 +15308,13 @@ class RichTextEmailAddress(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['email_address'] = self.email_address
+        return data
+
+
 class RichTextPhoneNumber(RichText):
     """
     A text with a phone number.
@@ -15222,6 +15345,13 @@ class RichTextPhoneNumber(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['phone_number'] = self.phone_number
+        return data
+
+
 class RichTextBankCardNumber(RichText):
     """
     A text with a bank card number.
@@ -15252,6 +15382,13 @@ class RichTextBankCardNumber(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['bank_card_number'] = self.bank_card_number
+        return data
+
+
 class RichTextMention(RichText):
     """
     A mention by a username.
@@ -15270,7 +15407,6 @@ class RichTextMention(RichText):
     :return: Instance of the class
     :rtype: :class:`RichTextMention`
     """
-
     def __init__(self, text: RichText, username: str, **kwargs):
         super().__init__(type='mention', **kwargs)
         self.text: RichText = text
@@ -15283,6 +15419,12 @@ class RichTextMention(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['username'] = self.username
+        return data
+
 
 class RichTextHashtag(RichText):
     """
@@ -15314,6 +15456,12 @@ class RichTextHashtag(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['hashtag'] = self.hashtag
+        return data
+
 
 class RichTextCashtag(RichText):
     """
@@ -15345,6 +15493,12 @@ class RichTextCashtag(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['cashtag'] = self.cashtag
+        return data
+
 
 class RichTextBotCommand(RichText):
     """
@@ -15376,6 +15530,12 @@ class RichTextBotCommand(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['bot_command'] = self.bot_command
+        return data
+
 
 class RichTextAnchor(RichText):
     """
@@ -15402,6 +15562,11 @@ class RichTextAnchor(RichText):
         obj = cls.check_json(json_string)
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['name'] = self.name
+        return data
+
 
 class RichTextAnchorLink(RichText):
     """
@@ -15432,7 +15597,13 @@ class RichTextAnchorLink(RichText):
         obj = cls.check_json(json_string)
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
-    
+
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['anchor_name'] = self.anchor_name
+        return data
+
     
 class RichTextReference(RichText):
     """
@@ -15452,7 +15623,6 @@ class RichTextReference(RichText):
     :return: Instance of the class
     :rtype: :class:`RichTextReference`
     """
-
     def __init__(self, text: RichText, name: str, **kwargs):
         super().__init__(type='reference', **kwargs)
         self.text: RichText = text
@@ -15464,7 +15634,13 @@ class RichTextReference(RichText):
         obj = cls.check_json(json_string)
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
-    
+
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['name'] = self.name
+        return data
+
     
 class RichTextReferenceLink(RichText):
     """
@@ -15483,9 +15659,7 @@ class RichTextReferenceLink(RichText):
 
     :return: Instance of the class
     :rtype: :class:`RichTextReferenceLink`
-
     """
-
     def __init__(self, text: RichText, reference_name: str, **kwargs):
         super().__init__(type='reference_link', **kwargs)
         self.text: RichText = text
@@ -15498,8 +15672,14 @@ class RichTextReferenceLink(RichText):
         obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = super().to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
+        data['reference_name'] = self.reference_name
+        return data
+
 
-class RichBlockCaption(JsonDeserializable):
+class RichBlockCaption(JsonDeserializable, Dictionaryable):
     """
     This object represents the caption of a rich formatted block.
 
@@ -15529,8 +15709,16 @@ class RichBlockCaption(JsonDeserializable):
             obj['credit'] = RichText.de_json(obj['credit'])
         return cls(**obj)
 
+    def to_dict(self):
+        data = {
+            'text': RichText.richtext_to_dict(self.text),
+        }
+        if self.credit is not None:
+            data['credit'] = RichText.richtext_to_dict(self.credit)
+        return data
+
 
-class RichBlockTableCell(JsonDeserializable):
+class RichBlockTableCell(JsonDeserializable, Dictionaryable):
     """
     This object represents a cell of a table.
 
@@ -15573,7 +15761,22 @@ class RichBlockTableCell(JsonDeserializable):
         if 'text' in obj:
             obj['text'] = RichText.de_json(obj['text'])
         return cls(**obj)
-    
+
+    def to_dict(self):
+        data = {
+            'align': self.align,
+            'valign': self.valign,
+        }
+        if self.text is not None:
+            data['text'] = RichText.richtext_to_dict(self.text)
+        if self.is_header is not None:
+            data['is_header'] = self.is_header
+        if self.colspan is not None:
+            data['colspan'] = self.colspan
+        if self.rowspan is not None:
+            data['rowspan'] = self.rowspan
+        return data
+
     
 class RichBlockListItem(JsonDeserializable):
     """
@@ -16517,9 +16720,9 @@ class InputMediaVoiceNote(InputMedia):
         if self.duration is not None:
             data['duration'] = self.duration
         return data
-    
 
-class InputRichMessageMedia(Dictionaryable):
+
+class InputRichMessageMedia(Dictionaryable, JsonSerializable):
     """
     This object represents a media element embedded in an outgoing rich message.
 
@@ -16545,12 +16748,12 @@ class InputRichMessageMedia(Dictionaryable):
             'media': self.media.to_dict()
         }
         return data
-    
+
     def to_json(self) -> str:
         return json.dumps(self.to_dict())
-    
 
-class InputRichBlockListItem(Dictionaryable):
+
+class InputRichBlockListItem(Dictionaryable, JsonSerializable):
     """
     An item of a list to be sent.
 
@@ -16600,6 +16803,7 @@ class InputRichBlockListItem(Dictionaryable):
     def to_json(self) -> str:
         return json.dumps(self.to_dict())
 
+
 class InputRichBlock(Dictionaryable, JsonSerializable):
     """
     This object represents a block in a rich formatted message to be sent.
@@ -16664,7 +16868,7 @@ class InputRichBlockParagraph(InputRichBlock):
 
     def to_dict(self) -> dict:
         data = super().to_dict()
-        data['text'] = self.text.to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
         return data
     
 
@@ -16693,7 +16897,7 @@ class InputRichBlockSectionHeading(InputRichBlock):
 
     def to_dict(self) -> dict:
         data = super().to_dict()
-        data['text'] = self.text.to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
         data['size'] = self.size
         return data
 
@@ -16723,7 +16927,7 @@ class InputRichBlockPreformatted(InputRichBlock):
 
     def to_dict(self) -> dict:
         data = super().to_dict()
-        data['text'] = self.text.to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
         if self.language is not None:
             data['language'] = self.language
         return data
@@ -16750,7 +16954,7 @@ class InputRichBlockFooter(InputRichBlock):
 
     def to_dict(self) -> dict:
         data = super().to_dict()
-        data['text'] = self.text.to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
         return data
 
 
@@ -16873,7 +17077,7 @@ class InputRichBlockBlockQuotation(InputRichBlock):
         data = super().to_dict()
         data['blocks'] = [block.to_dict() for block in self.blocks]
         if self.credit is not None:
-            data['credit'] = self.credit.to_dict()
+            data['credit'] = RichText.richtext_to_dict(self.credit)
         return data
 
 
@@ -16902,9 +17106,9 @@ class InputRichBlockPullQuotation(InputRichBlock):
 
     def to_dict(self) -> dict:
         data = super().to_dict()
-        data['text'] = self.text.to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
         if self.credit is not None:
-            data['credit'] = self.credit.to_dict()
+            data['credit'] = RichText.richtext_to_dict(self.credit)
         return data
 
 
@@ -17016,7 +17220,7 @@ class InputRichBlockTable(InputRichBlock):
         if self.is_striped is not None:
             data['is_striped'] = self.is_striped
         if self.caption is not None:
-            data['caption'] = self.caption.to_dict()
+            data['caption'] = RichText.richtext_to_dict(self.caption)
         return data
 
 
@@ -17055,7 +17259,7 @@ class InputRichBlockDetails(InputRichBlock):
 
     def to_dict(self) -> dict:
         data = super().to_dict()
-        data['summary'] = self.summary.to_dict()
+        data['summary'] = RichText.richtext_to_dict(self.summary)
         data['blocks'] = [block.to_dict() for block in self.blocks]
         if self.is_open is not None:
             data['is_open'] = self.is_open
@@ -17292,7 +17496,7 @@ class InputRichBlockThinking(InputRichBlock):
 
     def to_dict(self) -> dict:
         data = super().to_dict()
-        data['text'] = self.text.to_dict()
+        data['text'] = RichText.richtext_to_dict(self.text)
         return data
     
 

{pytelegrambotapi-4.36.0 → pytelegrambotapi-4.36.1}/telebot/version.py

@@ -1,3 +1,3 @@
 # Versions should comply with PEP440.
 # This line is parsed in setup.py:
-__version__ = '4.36.0'
+__version__ = '4.36.1'