telegrinder 0.1.dev160__py3-none-any.whl → 0.1.dev161__py3-none-any.whl

telegrinder/api/abc.py

@@ -17,6 +17,9 @@ class Token(str):
         if token.count(":") != 1 or not token.split(":")[0].isdigit():
             raise InvalidTokenError("Invalid token, it should look like this '123:ABC'.")
         return super().__new__(cls, token)
+    
+    def __repr__(self) -> str:
+        return f"<Token: {self.bot_id}:{''.join(self.split(':')[-1])[:6]}...>"
 
     @classmethod
     def from_env(

telegrinder/api/api.py

@@ -24,7 +24,7 @@ def compose_data(
 
 
 class API(ABCAPI, APIMethods):
-    API_URL: typing.ClassVar[str] = "https://api.telegram.org/"
+    API_URL = "https://api.telegram.org/"
 
     def __init__(self, token: Token, *, http: ABCClient | None = None) -> None:
         self.token = token
@@ -32,9 +32,9 @@ class API(ABCAPI, APIMethods):
         super().__init__(self)
     
     def __repr__(self) -> str:
-        return "<{}: id={}, http={!r}>".format(
+        return "<{}: token={!r}, http={!r}>".format(
             self.__class__.__name__,
-            self.id,
+            self.token,
             self.http,
         )
 

telegrinder/bot/scenario/__init__.py

@@ -1,5 +1,5 @@
 from .abc import ABCScenario
-from .checkbox import Checkbox
+from .checkbox import Checkbox, Choice
 from .choice import SingleChoice
 
-__all__ = ("ABCScenario", "Checkbox", "SingleChoice")
+__all__ = ("ABCScenario", "Checkbox", "Choice", "SingleChoice")

telegrinder/bot/scenario/checkbox.py

@@ -1,6 +1,5 @@
 import dataclasses
-import random
-import string
+import secrets
 import typing
 
 from telegrinder.bot.cute_types import CallbackQueryCute
@@ -25,29 +24,26 @@ class Choice:
     code: str
 
 
-def random_code(length: int) -> str:
-    return "".join(random.choices(string.ascii_letters + string.digits, k=length))
-
-
 class Checkbox(ABCScenario[CallbackQueryCute]):
-    INVALID_CODE: typing.ClassVar[str] = "Invalid code"
-    CALLBACK_ANSWER: typing.ClassVar[str] = "Done"
-    PARSE_MODE: typing.ClassVar[str] = ParseMode.MARKDOWNV2
+    INVALID_CODE = "Invalid code"
+    CALLBACK_ANSWER = "Done"
+    PARSE_MODE = ParseMode.HTML
 
     def __init__(
         self,
         waiter_machine: WaiterMachine,
         chat_id: int,
         msg: str,
+        *,
         ready_text: str = "Ready",
         max_in_row: int = 3,
-    ):
+    ) -> None:
         self.chat_id = chat_id
         self.msg = msg
         self.choices: list[Choice] = []
         self.ready = ready_text
         self.max_in_row = max_in_row
-        self.random_code = random_code(16)
+        self.random_code = secrets.token_hex(16)
         self.waiter_machine = waiter_machine
 
     def get_markup(self) -> InlineKeyboardMarkup:
@@ -77,7 +73,7 @@ class Checkbox(ABCScenario[CallbackQueryCute]):
         is_picked: bool = False,
     ) -> typing.Self:
         self.choices.append(
-            Choice(name, is_picked, default_text, picked_text, random_code(16)),
+            Choice(name, is_picked, default_text, picked_text, secrets.token_hex(16)),
         )
         return self
 
@@ -128,4 +124,4 @@ class Checkbox(ABCScenario[CallbackQueryCute]):
         )
 
 
-__all__ = ("Checkbox", "Choice", "random_code")
+__all__ = ("Checkbox", "Choice")

telegrinder/bot/scenario/choice.py

@@ -34,11 +34,11 @@ class SingleChoice(Checkbox):
     async def wait(
         self,
         api: "API",
-        cb_view: "BaseStateView[CallbackQueryCute]",
+        view: "BaseStateView[CallbackQueryCute]",
     ) -> tuple[str, int]:
         if len([choice for choice in self.choices if choice.is_picked]) != 1:
             raise ValueError("Exactly one choice must be picked")
-        choices, m_id = await super().wait(api, cb_view)
+        choices, m_id = await super().wait(api, view)
         return list(choices.keys())[list(choices.values()).index(True)], m_id
 
 

{telegrinder-0.1.dev160.dist-info → telegrinder-0.1.dev161.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: telegrinder
-Version: 0.1.dev160
+Version: 0.1.dev161
 Summary: Framework for effective and reliable async telegram bot building.
 Home-page: https://github.com/timoniq/telegrinder
 License: MIT

{telegrinder-0.1.dev160.dist-info → telegrinder-0.1.dev161.dist-info}/RECORD

@@ -1,7 +1,7 @@
 telegrinder/__init__.py,sha256=iAaXnpZbc6xcdpHv56K6Hbi8KFryT--wC8UZo4sOUXk,2859
 telegrinder/api/__init__.py,sha256=pIDtnsL0NwT5PgVm43Gkp-ByOqDsqnD-oFDiC9tcPT4,246
-telegrinder/api/abc.py,sha256=STaVKkWr4SCfVrmNXU-JpSmaNNIeb8oB1S4jxOuucX8,1688
-telegrinder/api/api.py,sha256=d3K5QSL_Ist40qddoTy18-RQ2f7jh1Vvjn6LShp0QII,2400
+telegrinder/api/abc.py,sha256=5pK6zqZtLphnOVAYwa8sT15F940gCQNzy53nyUTZWWQ,1803
+telegrinder/api/api.py,sha256=q7E3CmEGGZNArA-evH1UWFf3tbBvo1SwKGeMmkwnUCw,2386
 telegrinder/api/error.py,sha256=7qOYpP3P-s1p235Gp4VhCxcpY5VX8KyK_md3_-M-NCQ,390
 telegrinder/api/response.py,sha256=d7Oxd5kOdbZNJiALkzkecHl8Y3K_BzCmsRq2Sn3otqA,491
 telegrinder/bot/__init__.py,sha256=tLEUne5ftvKUVlkMAtPTO1_TSHkYJBbG73LuiBeC7gk,1560
@@ -65,10 +65,10 @@ telegrinder/bot/rules/regex.py,sha256=wqGEEiFqe5t_RwX9KjVCtg0wRZfwqo1ktGvNBo9JaK
 telegrinder/bot/rules/rule_enum.py,sha256=BUd78f7fEa0hfu1Paa384_Q-r0lB-ZWWukqkrFXdn58,2083
 telegrinder/bot/rules/start.py,sha256=5ok581Ww56g27rE4QkrykbBZ-ER-SnATQNzMGut2PHA,1183
 telegrinder/bot/rules/text.py,sha256=LaY8A2KUYDZpIllYTRSXXCwWfDN6dnFFmdvXM1nCKvA,1147
-telegrinder/bot/scenario/__init__.py,sha256=sH-n6ZhVPgAiAgQVY9Y8QA4wjkjR5a5z63Oa0PrWogs,148
+telegrinder/bot/scenario/__init__.py,sha256=Ehe2uH-eQ-vRBPxIzdmE23B-FBOAa9YQyndmb6K8C5E,166
 telegrinder/bot/scenario/abc.py,sha256=3AZYRjZlkbDtyFbsKdZ6BefzWYlJ0DOrGwh8jI3nzv4,474
-telegrinder/bot/scenario/checkbox.py,sha256=lTPXTxIISCQk2qDmtdj5KLcFsxp5p0QjK8ybT8KHpsk,3956
-telegrinder/bot/scenario/choice.py,sha256=dbRBBSHwODtik95vm4A5SPMbRrDjqVxUbTfNHnnzsFo,1448
+telegrinder/bot/scenario/checkbox.py,sha256=n4eYbyhn6AKHDF7Ek_LOiuH7O3YuSErEa2yZ1mlTe-s,3765
+telegrinder/bot/scenario/choice.py,sha256=-NYyzgfGI0njVuT-EY0j3jS4tPlsKOEkZaUagtns7dE,1442
 telegrinder/client/__init__.py,sha256=ZiS1Wb_l_kv3FHzEEi1oXtFLwlA_HXmWOzeN0xA3E7Y,104
 telegrinder/client/abc.py,sha256=OxsTX_PLYBEeFT9zpidFUzAbQL9BM7rQqru7zdn5DiQ,1611
 telegrinder/client/aiohttp.py,sha256=vGJDAttRVasDZJn39KgUFFZ0nowf7iXTRKcFTO85vwQ,4163
@@ -121,7 +121,7 @@ telegrinder/types/__init__.py,sha256=pvPKWDXq9PBiIOCW8dFcJMqgr1kAqodPhwT-u8I4kug
 telegrinder/types/enums.py,sha256=lahMwaLRB8Y2KTqRNyHr5veQ4KgPMuZmDQ_F0Th1LlA,18127
 telegrinder/types/methods.py,sha256=2ezfJ6iQHNcb3qta_GkjTqRXbROIlweL-wr1C5F_DlA,180182
 telegrinder/types/objects.py,sha256=YA2lq0x3RFOxpGOGfs8DlU-ESxtBclNmE-l1Ryi15so,205771
-telegrinder-0.1.dev160.dist-info/LICENSE,sha256=J9ngGsqHCNNjpm3xYPT7EnlzsnjhfqNXej5mJFjM6lw,1094
-telegrinder-0.1.dev160.dist-info/METADATA,sha256=S3z-GN6tzKtNnnUZ-MpaVop7NG3ZSH5Dt14eWZwfEKU,2892
-telegrinder-0.1.dev160.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-telegrinder-0.1.dev160.dist-info/RECORD,,
+telegrinder-0.1.dev161.dist-info/LICENSE,sha256=J9ngGsqHCNNjpm3xYPT7EnlzsnjhfqNXej5mJFjM6lw,1094
+telegrinder-0.1.dev161.dist-info/METADATA,sha256=-qWSanyZ5vSU1QOLf3CARwnZV-ikNpnFotZecd_FQEI,2892
+telegrinder-0.1.dev161.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+telegrinder-0.1.dev161.dist-info/RECORD,,