Added more aliases, refactor CallbackData factory, added base exceptions classification mechanism

tests/mocked_bot.py

@@ -4,17 +4,17 @@ from typing import TYPE_CHECKING, AsyncGenerator, Deque, Optional, Type
 from aiogram import Bot
 from aiogram.client.session.base import BaseSession
 from aiogram.methods import TelegramMethod
-from aiogram.methods.base import Request, Response, T
-from aiogram.types import UNSET
+from aiogram.methods.base import Request, Response, TelegramType
+from aiogram.types import UNSET, ResponseParameters
 
 
 class MockedSession(BaseSession):
     def __init__(self):
         super(MockedSession, self).__init__()
-        self.responses: Deque[Response[T]] = deque()
+        self.responses: Deque[Response[TelegramType]] = deque()
         self.requests: Deque[Request] = deque()
 
-    def add_result(self, response: Response[T]) -> Response[T]:
+    def add_result(self, response: Response[TelegramType]) -> Response[TelegramType]:
         self.responses.append(response)
         return response
 
@@ -25,11 +25,13 @@ class MockedSession(BaseSession):
         pass
 
     async def make_request(
-        self, bot: Bot, method: TelegramMethod[T], timeout: Optional[int] = UNSET
-    ) -> T:
+        self, bot: Bot, method: TelegramMethod[TelegramType], timeout: Optional[int] = UNSET
+    ) -> TelegramType:
         self.requests.append(method.build_request(bot))
-        response: Response[T] = self.responses.pop()
-        self.raise_for_status(response)
+        response: Response[TelegramType] = self.responses.pop()
+        self.check_response(
+            method=method, status_code=response.error_code, content=response.json()
+        )
         return response.result  # type: ignore
 
     async def stream_content(
@@ -47,21 +49,23 @@ class MockedBot(Bot):
 
     def add_result_for(
         self,
-        method: Type[TelegramMethod[T]],
+        method: Type[TelegramMethod[TelegramType]],
         ok: bool,
-        result: T = None,
+        result: TelegramType = None,
         description: Optional[str] = None,
         error_code: Optional[int] = None,
         migrate_to_chat_id: Optional[int] = None,
         retry_after: Optional[int] = None,
-    ) -> Response[T]:
+    ) -> Response[TelegramType]:
         response = Response[method.__returning__](  # type: ignore
             ok=ok,
             result=result,
             description=description,
             error_code=error_code,
-            migrate_to_chat_id=migrate_to_chat_id,
-            retry_after=retry_after,
+            parameters=ResponseParameters(
+                migrate_to_chat_id=migrate_to_chat_id,
+                retry_after=retry_after,
+            ),
         )
         self.session.add_result(response)
         return response

tests/test_api/test_client/test_session/test_aiohttp_session.py

@@ -172,14 +172,10 @@ class TestAiohttpSession:
                 return Request(method="method", data={})
 
         call = TestMethod()
-        with patch(
-            "aiogram.client.session.base.BaseSession.raise_for_status"
-        ) as patched_raise_for_status:
-            result = await session.make_request(bot, call)
-            assert isinstance(result, int)
-            assert result == 42
 
-            assert patched_raise_for_status.called_once()
+        result = await session.make_request(bot, call)
+        assert isinstance(result, int)
+        assert result == 42
 
     @pytest.mark.asyncio
     async def test_stream_content(self, aresponses: ResponsesMockServer):

tests/test_api/test_client/test_session/test_base_session.py

@@ -4,9 +4,9 @@ from typing import AsyncContextManager, AsyncGenerator, Optional
 
 import pytest
 
-from aiogram.client.session.base import BaseSession, T
+from aiogram.client.session.base import BaseSession, TelegramType
 from aiogram.client.telegram import PRODUCTION, TelegramAPIServer
-from aiogram.methods import GetMe, Response, TelegramMethod
+from aiogram.methods import DeleteMessage, GetMe, Response, TelegramMethod
 from aiogram.types import UNSET
 
 try:
@@ -20,7 +20,7 @@ class CustomSession(BaseSession):
     async def close(self):
         pass
 
-    async def make_request(self, token: str, method: TelegramMethod[T], timeout: Optional[int] = UNSET) -> None:  # type: ignore
+    async def make_request(self, token: str, method: TelegramMethod[TelegramType], timeout: Optional[int] = UNSET) -> None:  # type: ignore
         assert isinstance(token, str)
         assert isinstance(method, TelegramMethod)
 
@@ -135,12 +135,20 @@ class TestBaseSession:
 
         assert session.clean_json(42) == 42
 
-    def test_raise_for_status(self):
+    def check_response(self):
         session = CustomSession()
 
-        session.raise_for_status(Response[bool](ok=True, result=True))
+        session.check_response(
+            method=DeleteMessage(chat_id=42, message_id=42),
+            status_code=200,
+            content='{"ok":true,"result":true}',
+        )
         with pytest.raises(Exception):
-            session.raise_for_status(Response[bool](ok=False, description="Error", error_code=400))
+            session.check_response(
+                method=DeleteMessage(chat_id=42, message_id=42),
+                status_code=400,
+                content='{"ok":false,"description":"test"}',
+            )
 
     @pytest.mark.asyncio
     async def test_make_request(self):

tests/test_api/test_types/test_message.py

@@ -5,6 +5,9 @@ import pytest
 
 from aiogram.methods import (
     CopyMessage,
+    DeleteMessage,
+    EditMessageCaption,
+    EditMessageText,
     SendAnimation,
     SendAudio,
     SendContact,
@@ -549,3 +552,28 @@ class TestMessage:
         if method:
             assert isinstance(method, expected_method)
         # TODO: Check additional fields
+
+    def test_edit_text(self):
+        message = Message(
+            message_id=42, chat=Chat(id=42, type="private"), date=datetime.datetime.now()
+        )
+        method = message.edit_text(text="test")
+        assert isinstance(method, EditMessageText)
+        assert method.chat_id == message.chat.id
+
+    def test_edit_caption(self):
+        message = Message(
+            message_id=42, chat=Chat(id=42, type="private"), date=datetime.datetime.now()
+        )
+        method = message.edit_caption(caption="test")
+        assert isinstance(method, EditMessageCaption)
+        assert method.chat_id == message.chat.id
+
+    def test_delete(self):
+        message = Message(
+            message_id=42, chat=Chat(id=42, type="private"), date=datetime.datetime.now()
+        )
+        method = message.delete()
+        assert isinstance(method, DeleteMessage)
+        assert method.chat_id == message.chat.id
+        assert method.message_id == message.message_id