telegrinder 0.1.dev160__tar.gz → 0.1.dev161__tar.gz

{telegrinder-0.1.dev160 → telegrinder-0.1.dev161}/PKG-INFO

@@ -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 → telegrinder-0.1.dev161}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "telegrinder"
-version = "0.1.dev160"
+version = "0.1.dev161"
 description = "Framework for effective and reliable async telegram bot building."
 authors = ["timoniq <tesseradecades@mail.ru>"]
 maintainers = ["luwqz1 <howluwqz1@gmail.com>"]

{telegrinder-0.1.dev160 → telegrinder-0.1.dev161}/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-0.1.dev160 → telegrinder-0.1.dev161}/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-0.1.dev161/telegrinder/bot/scenario/__init__.py

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

{telegrinder-0.1.dev160 → telegrinder-0.1.dev161}/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-0.1.dev160 → telegrinder-0.1.dev161}/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/telegrinder/bot/scenario/__init__.py

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