Update project structure

aiogram/__init__.py

@@ -1,6 +1,5 @@
-from .api import methods, types
-from .api.client import session
-from .api.client.bot import Bot
+from .client import session
+from .client.bot import Bot
 from .dispatcher import filters, handler
 from .dispatcher.dispatcher import Dispatcher
 from .dispatcher.middlewares.base import BaseMiddleware
@@ -28,5 +27,5 @@ __all__ = (
     "handler",
 )
 
-__version__ = "3.0.0a5"
-__api_version__ = "4.9"
+__version__ = "3.0.0a6"
+__api_version__ = "5.0"

aiogram/client/bot.py

@@ -19,8 +19,9 @@ from typing import (
 import aiofiles
 from async_lru import alru_cache
 
-from ...utils.mixins import ContextInstanceMixin
-from ...utils.token import extract_bot_id, validate_token
+from aiogram.utils.mixins import ContextInstanceMixin
+from aiogram.utils.token import extract_bot_id, validate_token
+
 from ..methods import (
     AddStickerToSet,
     AnswerCallbackQuery,
@@ -104,6 +105,7 @@ from ..types import (
     Chat,
     ChatMember,
     ChatPermissions,
+    Downloadable,
     File,
     ForceReply,
     GameHighScore,

aiogram/client/session/aiohttp.py

@@ -17,7 +17,7 @@ from typing import (
 
 from aiohttp import BasicAuth, ClientSession, FormData, TCPConnector
 
-from aiogram.api.methods import Request, TelegramMethod
+from aiogram.methods import Request, TelegramMethod
 
 from .base import BaseSession
 

aiogram/client/session/base.py

@@ -18,7 +18,7 @@ from typing import (
 
 from aiogram.utils.exceptions import TelegramAPIError
 
-from ....utils.helper import Default
+from aiogram.utils.helper import Default
 from ...methods import Response, TelegramMethod
 from ...types import UNSET
 from ..telegram import PRODUCTION, TelegramAPIServer

aiogram/client/telegram.py

@@ -12,7 +12,7 @@ class TelegramAPIServer:
 
     def api_url(self, token: str, method: str) -> str:
         """
-        Generate URL for API methods
+        Generate URL for methods
 
         :param token: Bot token
         :param method: API method name (case insensitive)

aiogram/dispatcher/dispatcher.py

@@ -7,9 +7,9 @@ from asyncio import CancelledError, Future, Lock
 from typing import Any, AsyncGenerator, Dict, Optional, Union
 
 from .. import loggers
-from ..api.client.bot import Bot
-from ..api.methods import TelegramMethod
-from ..api.types import Update, User
+from aiogram.client.bot import Bot
+from ..methods import TelegramMethod
+from ..types import Update, User
 from ..utils.exceptions import TelegramAPIError
 from .event.bases import NOT_HANDLED
 from .middlewares.user_context import UserContextMiddleware

aiogram/dispatcher/event/bases.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from typing import Any, Awaitable, Callable, Dict, NoReturn, Optional, Union
 from unittest.mock import sentinel
 
-from ...api.types import TelegramObject
+from ...types import TelegramObject
 from ..middlewares.base import BaseMiddleware
 
 NextMiddlewareType = Callable[[TelegramObject, Dict[str, Any]], Awaitable[Any]]

aiogram/dispatcher/event/telegram.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, Generator, List, Optional
 
 from pydantic import ValidationError
 
-from ...api.types import TelegramObject
+from ...types import TelegramObject
 from ..filters.base import BaseFilter
 from .bases import NOT_HANDLED, MiddlewareType, NextMiddlewareType, SkipHandler
 from .handler import CallbackType, FilterObject, FilterType, HandlerObject, HandlerType

aiogram/dispatcher/filters/command.py

@@ -7,7 +7,7 @@ from typing import Any, Dict, Match, Optional, Pattern, Sequence, Union, cast
 from pydantic import validator
 
 from aiogram import Bot
-from aiogram.api.types import Message
+from aiogram.types import Message
 from aiogram.dispatcher.filters import BaseFilter
 
 CommandPatterType = Union[str, re.Pattern]

aiogram/dispatcher/filters/content_types.py

@@ -2,8 +2,8 @@ from typing import Any, Dict, Optional, Sequence, Union
 
 from pydantic import validator
 
-from ...api.types import Message
-from ...api.types.message import ContentType
+from ...types import Message
+from aiogram.types.message import ContentType
 from .base import BaseFilter
 
 

aiogram/dispatcher/filters/text.py

@@ -2,7 +2,7 @@ from typing import Any, Dict, Optional, Sequence, Union
 
 from pydantic import root_validator
 
-from aiogram.api.types import CallbackQuery, InlineQuery, Message, Poll
+from aiogram.types import CallbackQuery, InlineQuery, Message, Poll
 from aiogram.dispatcher.filters import BaseFilter
 
 TextType = str

aiogram/dispatcher/handler/base.py

@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any, Dict, Generic, TypeVar, cast
 
 from aiogram import Bot
-from aiogram.api.types import Update
+from aiogram.types import Update
 
 T = TypeVar("T")
 

aiogram/dispatcher/handler/callback_query.py

@@ -1,7 +1,7 @@
 from abc import ABC
 from typing import Optional
 
-from aiogram.api.types import CallbackQuery, Message, User
+from aiogram.types import CallbackQuery, Message, User
 from aiogram.dispatcher.handler import BaseHandler
 
 

aiogram/dispatcher/handler/chosen_inline_result.py

@@ -1,6 +1,6 @@
 from abc import ABC
 
-from aiogram.api.types import ChosenInlineResult, User
+from aiogram.types import ChosenInlineResult, User
 from aiogram.dispatcher.handler import BaseHandler
 
 

aiogram/dispatcher/handler/inline_query.py

@@ -1,6 +1,6 @@
 from abc import ABC
 
-from aiogram.api.types import InlineQuery, User
+from aiogram.types import InlineQuery, User
 from aiogram.dispatcher.handler import BaseHandler
 
 

aiogram/dispatcher/handler/message.py

@@ -1,7 +1,7 @@
 from abc import ABC
 from typing import Optional, cast
 
-from aiogram.api.types import Chat, Message, User
+from aiogram.types import Chat, Message, User
 from aiogram.dispatcher.filters import CommandObject
 from aiogram.dispatcher.handler.base import BaseHandler, BaseHandlerMixin
 

aiogram/dispatcher/handler/poll.py

@@ -1,7 +1,7 @@
 from abc import ABC
 from typing import List
 
-from aiogram.api.types import Poll, PollOption
+from aiogram.types import Poll, PollOption
 from aiogram.dispatcher.handler import BaseHandler
 
 

aiogram/dispatcher/handler/pre_checkout_query.py

@@ -1,6 +1,6 @@
 from abc import ABC
 
-from aiogram.api.types import PreCheckoutQuery, User
+from aiogram.types import PreCheckoutQuery, User
 from aiogram.dispatcher.handler import BaseHandler
 
 

aiogram/dispatcher/handler/shipping_query.py

@@ -1,6 +1,6 @@
 from abc import ABC
 
-from aiogram.api.types import ShippingQuery, User
+from aiogram.types import ShippingQuery, User
 from aiogram.dispatcher.handler import BaseHandler
 
 

aiogram/dispatcher/middlewares/error.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Awaitable, Callable, Dict
 
-from ...api.types import Update
+from ...types import Update
 from ..event.bases import NOT_HANDLED, CancelHandler, SkipHandler
 from .base import BaseMiddleware
 

aiogram/dispatcher/middlewares/user_context.py

@@ -1,7 +1,7 @@
 from contextlib import contextmanager
 from typing import Any, Awaitable, Callable, Dict, Iterator, Optional, Tuple
 
-from aiogram.api.types import Chat, Update, User
+from aiogram.types import Chat, Update, User
 from aiogram.dispatcher.middlewares.base import BaseMiddleware
 
 

aiogram/dispatcher/router.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import warnings
 from typing import Any, Dict, Generator, List, Optional, Union
 
-from ..api.types import TelegramObject, Update
+from ..types import TelegramObject, Update
 from ..utils.imports import import_module
 from ..utils.warnings import CodeHasNoEffect
 from .event.bases import NOT_HANDLED, SkipHandler

aiogram/methods/base.py

@@ -84,7 +84,7 @@ class TelegramMethod(abc.ABC, BaseModel, Generic[T]):
         return await bot(self)
 
     def __await__(self) -> Generator[Any, None, T]:
-        from aiogram.api.client.bot import Bot
+        from aiogram.client.bot import Bot
 
         bot = Bot.get_current(no_error=False)
         return self.emit(bot).__await__()