aiogram_tool 1.2.0__tar.gz → 1.2.1__tar.gz

{aiogram_tool-1.2.0 → aiogram_tool-1.2.1}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.3
 Name: aiogram_tool
-Version: 1.2.0
+Version: 1.2.1
 Summary: Tools which doing work with aiogram simple
 License: MIT
-Keywords: aiogram,rate,throttling,limit,dependency-injection,depends,cooldown,delay,DI
+Keywords: aiogram,rate,throttling,limit,dependency-injection,depends,cooldown,delay,DI,callback,data,long
 Author: Vlad_shayzi1
 Author-email: tecnomega@mail.ru
 Requires-Python: >=3.10

aiogram_tool-1.2.1/aiogram_tool/callback_data/__init__.py

@@ -0,0 +1,5 @@
+from .filter import LongCallbackData
+
+__all__ = [
+     "LongCallbackData",
+]

aiogram_tool-1.2.1/aiogram_tool/callback_data/filter.py

@@ -0,0 +1,67 @@
+from typing import Any
+from string import digits, ascii_letters
+from random import choice
+
+from aiogram.filters.callback_data import CallbackQueryFilter, CallbackData
+from aiogram.types import CallbackQuery
+from magic_filter import MagicFilter
+
+from .storage import data_storage
+
+
+
+class UniqueIDCallbackData(CallbackData, prefix="?"):
+     mode: str = "__unique_id_callback"
+     unique_id: str
+     
+
+
+class LongCallbackQueryFilter(CallbackQueryFilter):
+     
+     async def __call__(
+          self, 
+          query: CallbackQuery, 
+     ) -> bool | dict[str, Any]:
+          if not isinstance(query, CallbackQuery) or not query.data:
+               return False
+          try:
+               callback_data_model = (
+                    UniqueIDCallbackData
+                    if "__unique_id_callback" in query.data
+                    else self.callback_data
+               )
+               callback_data = callback_data_model.unpack(query.data)
+          except (TypeError, ValueError):
+               return False
+          
+          if isinstance(callback_data, UniqueIDCallbackData):
+               callback_data = data_storage.get_value(key=callback_data.unique_id)
+               if callback_data is None:
+                    await query.answer("Button expired")
+                    return False
+               
+          if self.rule is None or self.rule.resolve(callback_data):
+               return {"callback_data": callback_data}
+          return False
+     
+     
+class LongCallbackData(CallbackData, prefix="?"):
+     
+     def pack(self) -> str:
+          try:
+               return super().pack()
+          except ValueError as ex:
+               if "long" in str(ex):
+                    unique_id = self.__generate_unique_id()
+                    data_storage.set_value(key=unique_id, value=self)
+                    return UniqueIDCallbackData(unique_id=unique_id).pack()
+               raise ex
+               
+     @classmethod
+     def filter(cls, rule: MagicFilter | None = None) -> LongCallbackQueryFilter:
+          return LongCallbackQueryFilter(callback_data=cls, rule=rule)
+               
+               
+     def __generate_unique_id(self) -> str:
+          symbols = ascii_letters + digits
+          return "".join([choice(symbols) for _ in range(35)])  

aiogram_tool-1.2.1/aiogram_tool/callback_data/storage.py

@@ -0,0 +1,17 @@
+from typing import Any
+
+
+
+class DataStorage:
+     def __init__(self):
+          self._data: dict[str, Any] = {}
+     
+     def set_value(self, key: str, value: Any) -> None:
+          self._data[key] = value
+          
+     def get_value(self, key: str) -> Any:
+          return self._data.get(key)
+     
+     
+data_storage = DataStorage()
+     

{aiogram_tool-1.2.0 → aiogram_tool-1.2.1}/aiogram_tool/depend/setup.py

@@ -31,8 +31,8 @@ def setup_depend_tool(
                     observer.middleware(DependInnerMiddleware())
      
      else:
-          for allow in dispatcher.resolve_used_update_types():
-               observer: TelegramEventObserver = getattr(dispatcher, allow)
+          for update in dispatcher.resolve_used_update_types():
+               observer: TelegramEventObserver = dispatcher.observers.get(update)
                observer.middleware(DependInnerMiddleware())
                
                

{aiogram_tool-1.2.0 → aiogram_tool-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aiogram_tool"
-version = "1.2.0"
+version = "1.2.1"
 description = "Tools which doing work with aiogram simple"
 authors = [
     {name = "Vlad_shayzi1",email = "tecnomega@mail.ru"}
@@ -21,7 +21,10 @@ keywords = [
     "depends",
     "cooldown",
     "delay",
-    "DI"
+    "DI",
+    "callback",
+    "data",
+    "long"
 ]