aiogram_tool 1.2.3__tar.gz → 1.2.5__tar.gz

{aiogram_tool-1.2.3 → aiogram_tool-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: aiogram-tool
-Version: 1.2.3
+Version: 1.2.5
 Summary: Tools which doing work with aiogram simple
 Project-URL: Repository, https://github.com/shayzi3/aiogram_tool
 Project-URL: Contributing, https://github.com/shayzi3/aiogram_tool/blob/master/CONTRIBUTING.md
@@ -9,7 +9,7 @@ License-Expression: MIT
 License-File: LICENSE.md
 Keywords: DI,aiogram,callback,cooldown,data,delay,dependency-injection,depends,limit,long,rate,throttling
 Requires-Python: >=3.11
-Requires-Dist: aiogram==3.29.1
+Requires-Dist: aiogram<4.0.0,>=3.29.1
 Requires-Dist: redis>=8.0.0
 Description-Content-Type: text/markdown
 

{aiogram_tool-1.2.3 → aiogram_tool-1.2.5}/aiogram_tool/tools/callback_data/filter.py

@@ -20,9 +20,14 @@ class _UniqueIDCallbackData(CallbackData, prefix=UNIQUE_PREFIX):
 
     @classmethod
     def build(cls, callback_data: type[CallbackData]) -> Self:
-        separators_len = len(cls.__separator__) * len(cls.model_fields)
+        separators_len = len(cls.__separator__.encode("utf-8")) * len(cls.model_fields)
         unique_id_len = (
-            64 - (len(UNIQUE_PREFIX) + len(callback_data.__prefix__) + separators_len)
+            64
+            - (
+                len(UNIQUE_PREFIX.encode("utf-8"))
+                + len(callback_data.__prefix__.encode("utf-8"))
+                + separators_len
+            )
         ) // 2
 
         if unique_id_len < 6:

{aiogram_tool-1.2.3 → aiogram_tool-1.2.5}/aiogram_tool/tools/depend/utils/stack_manager.py

@@ -13,7 +13,7 @@ class AsyncExitStackTransaction:
         return self
 
     async def __aexit__(self, *args) -> None:
-        await self.stack.aclose()
+        await self.stack.__aexit__(*args)
 
     def _get_stack(self, scope: Scope) -> AsyncExitStack:
         return self.app_stack if scope == Scope.SINGLETON else self.stack

{aiogram_tool-1.2.3 → aiogram_tool-1.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "aiogram-tool"
-version = "1.2.3"
+version = "1.2.5"
 description = "Tools which doing work with aiogram simple"
 authors = [
     {name = "Vlad_shayzi1",email = "tecnomega@mail.ru"}
@@ -9,7 +9,7 @@ readme = "README.md"
 license = "MIT"
 requires-python = ">=3.11"
 dependencies = [
-    "aiogram==3.29.1",
+    "aiogram>=3.29.1,<4.0.0",
     "redis>=8.0.0",
 ]
 keywords = [

aiogram_tool-1.2.5/tests/callback_data/test_unique_id.py

@@ -0,0 +1,40 @@
+import pytest
+
+from aiogram_tool.storage.impl.memory import MemoryStorage
+from aiogram_tool.tools.callback_data.filter import (
+    LongCallbackData,
+    LongCallbackQueryFilter,
+    _UniqueIDCallbackData,
+)
+
+from .conftest import CallbackQueryFactoryType
+
+
+async def test_unique_id_data_error() -> None:
+
+    class Data(LongCallbackData, prefix="LONG" * 13):
+        attr: str
+
+    with pytest.raises(ValueError):
+        # Error is too long prefix
+        await Data(attr="important_data").pack_long()
+
+
+async def test_unicode_prefix_unique_id_respects_telegram_byte_limit(
+    callback_query_factory: CallbackQueryFactoryType,
+) -> None:
+    class Data(LongCallbackData, prefix="🐍" * 10):
+        _storage = MemoryStorage()
+
+        attr: str
+
+    unique_id = _UniqueIDCallbackData.build(Data).pack()
+    assert len(unique_id.encode("utf-8")) <= 64
+
+    packed = await Data(attr="important_data" * 10).pack_long()
+    assert len(packed.encode("utf-8")) <= 64
+
+    result = await LongCallbackQueryFilter(callback_data=Data)(
+        callback_query_factory(packed)
+    )
+    assert result["callback_data"] == Data(attr="important_data" * 10)

aiogram_tool-1.2.5/tests/depend/test_stack_exception.py

@@ -0,0 +1,44 @@
+from contextlib import AsyncExitStack, asynccontextmanager
+
+import pytest
+
+from aiogram_tool.tools.depend.types.enums import Scope
+from aiogram_tool.tools.depend.utils.stack_manager import AsyncExitStackTransaction
+
+
+@pytest.mark.parametrize("scope", [Scope.REQUEST, Scope.TRANSIENT])
+async def test_dependency_receives_handler_exception(scope):
+    seen = []
+
+    @asynccontextmanager
+    async def dependency():
+        try:
+            yield
+        except RuntimeError as exc:
+            seen.append(exc)
+            raise
+        else:
+            seen.append("success")
+
+    error = RuntimeError("handler failed")
+    async with AsyncExitStack() as app_stack:
+        with pytest.raises(RuntimeError) as caught:
+            async with AsyncExitStackTransaction(app_stack) as transaction:
+                await transaction.enter_async_context(dependency(), scope)
+                raise error
+    assert caught.value is error
+    assert seen == [error]
+
+
+async def test_dependency_receives_success():
+    seen = []
+
+    @asynccontextmanager
+    async def dependency():
+        yield
+        seen.append("success")
+
+    async with AsyncExitStack() as app_stack:
+        async with AsyncExitStackTransaction(app_stack) as transaction:
+            await transaction.enter_async_context(dependency(), Scope.REQUEST)
+    assert seen == ["success"]