used isort + black

bot/__init__.py

@@ -1,11 +1,11 @@
-from rich import print
 import contextlib
 
+from rich import print
+
 
 async def runner():
-    from .common import dp, bot
+    from . import callbacks, handlers
-
+    from .common import bot, dp
-    from . import handlers, callbacks
     from .modules.error import on_error
 
     dp.error.register(on_error)
@@ -20,8 +20,8 @@ async def runner():
 
 def plugins():
     import nest_asyncio
-    from rich import traceback
     from icecream import ic
+    from rich import traceback
 
     nest_asyncio.apply()
     traceback.install()

bot/callbacks/__init__.py

@@ -1,11 +1,8 @@
 from aiogram import Router
-from . import (
+
-    full_menu,
-    on_home,
-    settings,
-)
 from bot.middlewares import PrivateButtonMiddleware, SettingsInjectorMiddleware
 
+from . import full_menu, on_home, settings
 
 router = Router()
 

bot/callbacks/full_menu.py

@@ -1,8 +1,7 @@
-from aiogram import Router, F, Bot
+from aiogram import Bot, F, Router
 from aiogram.types import CallbackQuery
 
 from bot.factories.full_menu import FullMenuCallback
-
 from bot.keyboards.inline.settings import get_settings_kb
 
 router = Router()

bot/callbacks/on_home.py

@@ -1,8 +1,7 @@
-from aiogram import Router, F, Bot
+from aiogram import Bot, F, Router
 from aiogram.types import CallbackQuery
 
 from bot.factories.full_menu import FullMenuCallback
-
 from bot.keyboards.inline.full_menu import get_full_menu_kb
 
 router = Router()

bot/callbacks/settings.py

@@ -1,11 +1,10 @@
-from aiogram import Router, Bot
+from aiogram import Bot, Router
-from aiogram.types import CallbackQuery
 from aiogram.exceptions import TelegramBadRequest
+from aiogram.types import CallbackQuery
 
 from bot.factories.open_setting import OpenSettingCallback, SettingChoiceCallback
-
 from bot.keyboards.inline.setting import get_setting_kb
-from bot.modules.settings import settings_strings, UserSettings
+from bot.modules.settings import UserSettings, settings_strings
 
 router = Router()
 

bot/common.py

@@ -1,6 +1,8 @@
 from aiogram import Bot, Dispatcher
-from bot.modules.fsm import InDbStorage
 from rich.console import Console
+
+from bot.modules.fsm import InDbStorage
+
 from .utils.config import config
 
 bot = Bot(token=config.telegram.bot_token)

bot/factories/full_menu.py

@@ -1,4 +1,5 @@
 from typing import Literal
+
 from aiogram.filters.callback_data import CallbackData
 
 

bot/filters/url.py

@@ -1,8 +1,8 @@
+from urllib.parse import urlparse
+
 from aiogram.filters import BaseFilter
 from aiogram.types import InlineQuery
 
-from urllib.parse import urlparse
-
 
 class MusicUrlFilter(BaseFilter):
     def __init__(self):

bot/handlers/__init__.py

@@ -1,16 +1,17 @@
 from aiogram import Router
-from . import (
-    initialize,
-    inline_song,
-    inline_url,
-    inline_error,
-    inline_default,
-    inline_empty,
-    on_chosen,
-)
 
 from bot.middlewares import SaveChosenMiddleware, SettingsInjectorMiddleware
 
+from . import (
+    initialize,
+    inline_default,
+    inline_empty,
+    inline_error,
+    inline_song,
+    inline_url,
+    on_chosen,
+)
+
 router = Router()
 
 router.chosen_inline_result.outer_middleware(SaveChosenMiddleware())

bot/handlers/initialize/initializer.py

@@ -1,7 +1,6 @@
-from aiogram import Router, Bot
+from aiogram import Bot, Router
 from rich import print
 
-
 router = Router()
 
 

bot/handlers/inline_default/on_inline_default.py

@@ -1,13 +1,11 @@
-from aiogram import Router, F
+from aiogram import F, Router
-
 from aiogram.types import InlineQuery
 
+from bot.modules.settings import UserSettings
 from bot.results.deezer import get_deezer_search_results
 from bot.results.soundcloud import get_soundcloud_search_results
-from bot.results.youtube import get_youtube_search_results
 from bot.results.spotify import get_spotify_search_results
-
+from bot.results.youtube import get_youtube_search_results
-from bot.modules.settings import UserSettings
 
 router = Router()
 

bot/handlers/inline_empty/on_inline_empty.py

@@ -1,5 +1,5 @@
-from aiogram import Router, F
+from aiogram import F, Router
-from aiogram.types import InlineQuery, InputTextMessageContent, InlineQueryResultArticle
+from aiogram.types import InlineQuery, InlineQueryResultArticle, InputTextMessageContent
 
 from bot.keyboards.inline.full_menu import get_full_menu_kb
 

bot/handlers/inline_error/on_inline_error_info.py

@@ -1,9 +1,8 @@
 from aiogram import Router
-
 from aiogram.types import InlineQuery
 
-from bot.results.error import get_error_search_results
 from bot.filters import ServiceSearchFilter
+from bot.results.error import get_error_search_results
 
 router = Router()
 

bot/handlers/inline_song/__init__.py

@@ -1,10 +1,10 @@
 from aiogram import Router
 
 from . import (
-    on_inline_spotify,
     on_inline_deezer,
-    on_inline_youtube,
     on_inline_soundcloud,
+    on_inline_spotify,
+    on_inline_youtube,
 )
 
 router = Router()

bot/handlers/inline_song/on_inline_deezer.py

@@ -1,10 +1,9 @@
 from aiogram import Router
-
 from aiogram.types import InlineQuery
 
-from bot.results.deezer import get_deezer_search_results
 from bot.filters import ServiceSearchFilter
 from bot.modules.settings import UserSettings
+from bot.results.deezer import get_deezer_search_results
 
 router = Router()
 

bot/handlers/inline_song/on_inline_soundcloud.py

@@ -1,10 +1,9 @@
 from aiogram import Router
-
 from aiogram.types import InlineQuery
 
-from bot.results.soundcloud import get_soundcloud_search_results
 from bot.filters import ServiceSearchMultiletterFilter
 from bot.modules.settings import UserSettings
+from bot.results.soundcloud import get_soundcloud_search_results
 
 router = Router()
 

bot/handlers/inline_song/on_inline_spotify.py

@@ -1,10 +1,9 @@
 from aiogram import Router
-
 from aiogram.types import InlineQuery
 
-from bot.results.spotify import get_spotify_search_results
 from bot.filters import ServiceSearchFilter
 from bot.modules.settings import UserSettings
+from bot.results.spotify import get_spotify_search_results
 
 router = Router()
 

bot/handlers/inline_song/on_inline_youtube.py

@@ -1,10 +1,9 @@
 from aiogram import Router
-
 from aiogram.types import InlineQuery
 
-from bot.results.youtube import get_youtube_search_results
 from bot.filters import ServiceSearchFilter
 from bot.modules.settings import UserSettings
+from bot.results.youtube import get_youtube_search_results
 
 router = Router()
 

bot/handlers/inline_url/on_inline_url.py

@@ -1,10 +1,9 @@
 from aiogram import Router
-
 from aiogram.types import InlineQuery
 
-from bot.results.url import get_url_results
 from bot.filters import MusicUrlFilter
 from bot.modules.settings import UserSettings
+from bot.results.url import get_url_results
 
 router = Router()
 

bot/handlers/on_chosen/__init__.py

@@ -1,5 +1,6 @@
 from aiogram import Router
-from . import spotify, deezer, youtube, soundcloud, recode_cached, suppress_verify
+
+from . import deezer, recode_cached, soundcloud, spotify, suppress_verify, youtube
 
 router = Router()
 

bot/handlers/on_chosen/deezer.py

@@ -1,14 +1,14 @@
-from aiogram import Router, Bot, F
+from aiogram import Bot, F, Router
 from aiogram.types import (
     BufferedInputFile,
-    URLInputFile,
-    InputMediaAudio,
     ChosenInlineResult,
+    InputMediaAudio,
+    URLInputFile,
 )
 
-from bot.modules.deezer import deezer, DeezerBytestream
-from bot.utils.config import config
 from bot.modules.database import db
+from bot.modules.deezer import DeezerBytestream, deezer
+from bot.utils.config import config
 
 router = Router()
 

bot/handlers/on_chosen/recode_cached.py

@@ -1,17 +1,12 @@
-from aiogram import Router, Bot, F
+from io import BytesIO
-from aiogram.types import (
-    BufferedInputFile,
-    InputMediaAudio,
-    ChosenInlineResult,
-)
 
-from bot.modules.youtube.downloader import YouTubeBytestream
+from aiogram import Bot, F, Router
+from aiogram.types import BufferedInputFile, ChosenInlineResult, InputMediaAudio
 
-from bot.utils.config import config
 from bot.modules.database import db
 from bot.modules.settings import UserSettings
-
+from bot.modules.youtube.downloader import YouTubeBytestream
-from io import BytesIO
+from bot.utils.config import config
 
 router = Router()
 

bot/handlers/on_chosen/soundcloud.py

@@ -1,14 +1,14 @@
-from aiogram import Router, Bot, F
+from aiogram import Bot, F, Router
 from aiogram.types import (
     BufferedInputFile,
-    URLInputFile,
-    InputMediaAudio,
     ChosenInlineResult,
+    InputMediaAudio,
+    URLInputFile,
 )
 
-from bot.modules.soundcloud import soundcloud, SoundCloudBytestream
-from bot.utils.config import config
 from bot.modules.database import db
+from bot.modules.soundcloud import SoundCloudBytestream, soundcloud
+from bot.utils.config import config
 
 router = Router()
 

bot/handlers/on_chosen/spotify.py

@@ -1,18 +1,18 @@
-from aiogram import Router, Bot, F
+from aiogram import Bot, F, Router
 from aiogram.types import (
     BufferedInputFile,
-    URLInputFile,
-    InputMediaAudio,
     ChosenInlineResult,
+    InputMediaAudio,
+    URLInputFile,
 )
 
-from bot.modules.spotify import spotify
-from bot.modules.youtube import youtube, AgeRestrictedError
-from bot.modules.youtube.song import SongItem
-from bot.modules.deezer import deezer
-from bot.utils.config import config
 from bot.modules.database import db
+from bot.modules.deezer import deezer
 from bot.modules.settings import UserSettings
+from bot.modules.spotify import spotify
+from bot.modules.youtube import AgeRestrictedError, youtube
+from bot.modules.youtube.song import SongItem
+from bot.utils.config import config
 
 router = Router()
 

bot/handlers/on_chosen/suppress_verify.py

@@ -1,7 +1,5 @@
-from aiogram import Router, Bot, F
+from aiogram import Bot, F, Router
-from aiogram.types import (
+from aiogram.types import ChosenInlineResult
-    ChosenInlineResult,
-)
 
 router = Router()
 

bot/handlers/on_chosen/youtube.py

@@ -1,15 +1,15 @@
-from aiogram import Router, Bot, F
+from aiogram import Bot, F, Router
 from aiogram.types import (
     BufferedInputFile,
-    URLInputFile,
-    InputMediaAudio,
     ChosenInlineResult,
+    InputMediaAudio,
+    URLInputFile,
 )
 
-from bot.modules.youtube import youtube, AgeRestrictedError
-from bot.utils.config import config
 from bot.modules.database import db
 from bot.modules.settings import UserSettings
+from bot.modules.youtube import AgeRestrictedError, youtube
+from bot.utils.config import config
 
 router = Router()
 

bot/keyboards/inline/full_menu.py

@@ -1,10 +1,10 @@
 from aiogram.utils.keyboard import (
-    InlineKeyboardMarkup,
-    InlineKeyboardButton,
     InlineKeyboardBuilder,
+    InlineKeyboardButton,
+    InlineKeyboardMarkup,
 )
-from bot.factories.full_menu import FullMenuCallback
 
+from bot.factories.full_menu import FullMenuCallback
 from bot.keyboards.inline import search_variants as sv
 
 

bot/keyboards/inline/search_variants.py

@@ -1,10 +1,9 @@
 from aiogram.utils.keyboard import (
-    InlineKeyboardMarkup,
-    InlineKeyboardButton,
     InlineKeyboardBuilder,
+    InlineKeyboardButton,
+    InlineKeyboardMarkup,
 )
 
-
 deezer = {"d": "🎵 Search in Deezer"}
 soundcloud = {"c": "☁️ Search in SoundCloud"}
 youtube = {"y": "▶️ Search in YouTube"}

bot/keyboards/inline/setting.py

@@ -1,11 +1,11 @@
 from aiogram.utils.keyboard import (
-    InlineKeyboardMarkup,
-    InlineKeyboardButton,
     InlineKeyboardBuilder,
+    InlineKeyboardButton,
+    InlineKeyboardMarkup,
 )
-from bot.factories.open_setting import SettingChoiceCallback
-from bot.factories.full_menu import FullMenuCallback
 
+from bot.factories.full_menu import FullMenuCallback
+from bot.factories.open_setting import SettingChoiceCallback
 from bot.modules.settings import UserSettings
 
 

bot/keyboards/inline/settings.py

@@ -1,11 +1,11 @@
 from aiogram.utils.keyboard import (
-    InlineKeyboardMarkup,
-    InlineKeyboardButton,
     InlineKeyboardBuilder,
+    InlineKeyboardButton,
+    InlineKeyboardMarkup,
 )
-from bot.factories.open_setting import OpenSettingCallback
-from bot.factories.full_menu import FullMenuCallback
 
+from bot.factories.full_menu import FullMenuCallback
+from bot.factories.open_setting import OpenSettingCallback
 from bot.modules.settings import settings_strings
 
 

bot/middlewares/__init__.py

@@ -1,3 +1,3 @@
+from .inject_settings import SettingsInjectorMiddleware
 from .private_button import PrivateButtonMiddleware
 from .save_chosen import SaveChosenMiddleware
-from .inject_settings import SettingsInjectorMiddleware

bot/middlewares/inject_settings.py

@@ -1,8 +1,8 @@
+from typing import Any, Awaitable, Callable, Dict
+
 from aiogram.dispatcher.middlewares.base import BaseMiddleware
 from aiogram.types import TelegramObject
 
-from typing import Any, Awaitable, Callable, Dict
-
 from bot.modules.settings import UserSettings
 
 

bot/middlewares/private_button.py

@@ -1,8 +1,8 @@
+from typing import Any, Awaitable, Callable, Dict
+
 from aiogram.dispatcher.middlewares.base import BaseMiddleware
 from aiogram.types import CallbackQuery
 
-from typing import Any, Awaitable, Callable, Dict
-
 from bot.modules.database import db
 
 

bot/middlewares/save_chosen.py

@@ -1,9 +1,9 @@
+from dataclasses import dataclass
+from typing import Any, Awaitable, Callable, Dict
+
 from aiogram.dispatcher.middlewares.base import BaseMiddleware
 from aiogram.types import ChosenInlineResult
 
-from typing import Any, Awaitable, Callable, Dict
-from dataclasses import dataclass
-
 from bot.modules.database import db
 
 

bot/modules/database/__init__.py

@@ -1,6 +1,5 @@
 from .db import Db
 
-
 db = Db()
 
 __all__ = ["db"]

bot/modules/database/db_model.py

@@ -1,4 +1,5 @@
 from sqlitedict import SqliteDict
+
 from bot.utils.config import config
 
 

bot/modules/deezer/__init__.py

@@ -1,7 +1,7 @@
-from .deezer import Deezer
-from .downloader import DeezerBytestream
 from bot.utils.config import config
 
+from .deezer import Deezer
+from .downloader import DeezerBytestream
 
 deezer = Deezer(
     arl=config.tokens.deezer.arl,

bot/modules/deezer/deezer.py

@@ -1,9 +1,9 @@
 import asyncio
 
-from .song import Songs
-from .engine import DeezerEngine
-from .driver import DeezerDriver
 from .downloader import DownloaderBuilder
+from .driver import DeezerDriver
+from .engine import DeezerEngine
+from .song import Songs
 
 
 class Deezer(object):

bot/modules/deezer/downloader.py

@@ -1,12 +1,11 @@
-from attrs import define
-
 from io import BytesIO
 
-from .driver import DeezerDriver
+from attrs import define
 
 from . import track_formats
-from .util import UrlDecrypter, ChunkDecrypter
+from .driver import DeezerDriver
 from .song import FullSongItem
+from .util import ChunkDecrypter, UrlDecrypter
 
 
 @define

bot/modules/deezer/driver.py

@@ -1,7 +1,6 @@
 from attrs import define
 
 from .engine import DeezerEngine
-
 from .util import clean_query
 
 

bot/modules/deezer/engine.py

@@ -1,10 +1,7 @@
 import aiohttp
-
 from aiohttp import ClientResponse
-
 from attrs import define
 
-
 HTTP_HEADERS = {
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
     "(KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36",

bot/modules/deezer/song.py

@@ -1,8 +1,7 @@
 from attrs import define
 
-from .driver import DeezerDriver
-
 from ..common.song import BaseSongItem
+from .driver import DeezerDriver
 
 
 @define

bot/modules/deezer/util.py

@@ -1,12 +1,11 @@
 # https://pypi.org/project/music-helper/
-import warnings
-import re
 import hashlib
-
+import re
-from cryptography.hazmat.backends import default_backend
+import warnings
-from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 
 from attrs import define
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 
 from .track_formats import TrackFormat
 

bot/modules/error/__init__.py

@@ -1,2 +1,2 @@
-from .handler import on_error, Error
+from .handler import Error, on_error
 from .pretty import PrettyException

bot/modules/error/handler.py

@@ -1,14 +1,14 @@
-from bot.common import console
+from dataclasses import dataclass
-from aiogram.types.error_event import ErrorEvent
+
 from aiogram import Bot
 from aiogram.dispatcher import router as s_router
-
+from aiogram.types.error_event import ErrorEvent
 from rich.traceback import Traceback
-from .pretty import PrettyException
 
+from bot.common import console
 from bot.modules.database import db
 
-from dataclasses import dataclass
+from .pretty import PrettyException
 
 
 @dataclass
@@ -19,8 +19,8 @@ class Error:
 
 
 async def on_error(event: ErrorEvent, bot: Bot):
-    import os
     import base64
+    import os
 
     error_id = base64.urlsafe_b64encode(os.urandom(6)).decode()
 

bot/modules/error/pretty.py

@@ -1,7 +1,7 @@
-import os
-import traceback
 import contextlib
+import os
 import re
+import traceback
 from typing import Type
 
 

bot/modules/fsm/in_db.py

@@ -1,13 +1,10 @@
-from bot.modules.database import db
 from dataclasses import dataclass, field
 from typing import Any, DefaultDict, Dict, Optional
 
 from aiogram.fsm.state import State
-from aiogram.fsm.storage.base import (
+from aiogram.fsm.storage.base import BaseStorage, StateType, StorageKey
-    BaseStorage,
+
-    StateType,
+from bot.modules.database import db
-    StorageKey,
-)
 
 
 @dataclass

bot/modules/settings/__init__.py

@@ -1 +1 @@
-from .model import UserSettings, Setting, settings_strings
+from .model import Setting, UserSettings, settings_strings

bot/modules/settings/model.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+
 from ..database import db
 
 

bot/modules/soundcloud/__init__.py

@@ -1,7 +1,7 @@
-from .soundcloud import SoundCloud
-from .downloader import SoundCloudBytestream
 from bot.utils.config import config
 
+from .downloader import SoundCloudBytestream
+from .soundcloud import SoundCloud
 
 soundcloud = SoundCloud(
     client_id=config.tokens.soundcloud.client_id,

bot/modules/soundcloud/downloader.py

@@ -1,11 +1,11 @@
-from attrs import define
 from typing import Callable
 
+import m3u8
+from attrs import define
+
 from .driver import SoundCloudDriver
 from .song import SongItem
 
-import m3u8
-
 
 @define
 class SoundCloudBytestream:

bot/modules/soundcloud/engine.py

@@ -1,5 +1,5 @@
-from attrs import define
 import aiohttp
+from attrs import define
 
 
 @define

bot/modules/soundcloud/soundcloud.py

@@ -1,7 +1,7 @@
-from .engine import SoundCloudEngine
-from .driver import SoundCloudDriver
-from .song import Songs
 from .downloader import DownloaderBuilder
+from .driver import SoundCloudDriver
+from .engine import SoundCloudEngine
+from .song import Songs
 
 
 class SoundCloud(object):

bot/modules/spotify/__init__.py

@@ -1,6 +1,6 @@
-from .spotify import Spotify
 from bot.utils.config import config
 
+from .spotify import Spotify
 
 spotify = Spotify(
     client_id=config.tokens.spotify.client_id,

bot/modules/spotify/song.py

@@ -1,5 +1,5 @@
-from attrs import define
 import spotipy
+from attrs import define
 
 from ..common.song import BaseSongItem
 

bot/modules/url/__init__.py

@@ -1,2 +1,2 @@
-from .recognise import recognise_music_service, RecognisedService
 from .id_getter import get_id
+from .recognise import RecognisedService, recognise_music_service

bot/modules/url/id_getter.py

@@ -1,7 +1,7 @@
-from .recognise import RecognisedService
-
 import aiohttp
 
+from .recognise import RecognisedService
+
 
 async def get_url_after_redirect(url: str) -> str:
     async with aiohttp.ClientSession() as session:

bot/modules/url/recognise.py

@@ -1,15 +1,13 @@
-from urllib.parse import urlparse, ParseResult
 from dataclasses import dataclass
-
+from typing import Awaitable, Callable, Literal
-from typing import Callable, Awaitable, Literal
+from urllib.parse import ParseResult, urlparse
 
 from bot.modules.database import db
 from bot.modules.database.db import DBDict
-
-from bot.modules.youtube import youtube
-from bot.modules.spotify import spotify
 from bot.modules.deezer import deezer
 from bot.modules.soundcloud import soundcloud
+from bot.modules.spotify import spotify
+from bot.modules.youtube import youtube
 
 
 @dataclass

bot/modules/youtube/__init__.py

@@ -1,6 +1,6 @@
-from .youtube import YouTube
 from pytubefix.exceptions import AgeRestrictedError
 
+from .youtube import YouTube
 
 youtube = YouTube()
 

bot/modules/youtube/downloader.py

@@ -1,12 +1,10 @@
-from attrs import define
+import asyncio
-from pytubefix import YouTube, Stream
+from concurrent.futures import ThreadPoolExecutor
-
-from pydub import AudioSegment
 from io import BytesIO
 
-from concurrent.futures import ThreadPoolExecutor
+from attrs import define
-
+from pydub import AudioSegment
-import asyncio
+from pytubefix import Stream, YouTube
 
 
 @define

bot/modules/youtube/song.py

@@ -1,11 +1,10 @@
-from attrs import define
-import ytmusicapi
-
-from .downloader import Downloader, YouTubeBytestream
-
 from typing import Awaitable
 
+import ytmusicapi
+from attrs import define
+
 from ..common.song import BaseSongItem
+from .downloader import Downloader, YouTubeBytestream
 
 
 @define

bot/modules/youtube/youtube.py

@@ -1,7 +1,7 @@
 import ytmusicapi
 
-from .song import Songs
 from .downloader import Downloader
+from .song import Songs
 
 
 class YouTube(object):

bot/results/common/search.py

@@ -1,16 +1,15 @@
-from aiogram.types import (
-    InlineQueryResultDocument,
-    InlineQueryResultCachedAudio,
-    InlineKeyboardMarkup,
-    InlineKeyboardButton,
-)
-
-from bot.modules.database.db import DBDict
-from bot.modules.settings import UserSettings
-
-from bot.modules.common.song import BaseSongItem
 from typing import TypeVar
 
+from aiogram.types import (
+    InlineKeyboardButton,
+    InlineKeyboardMarkup,
+    InlineQueryResultCachedAudio,
+    InlineQueryResultDocument,
+)
+
+from bot.modules.common.song import BaseSongItem
+from bot.modules.database.db import DBDict
+from bot.modules.settings import UserSettings
 
 BaseSongT = TypeVar("BaseSongT", bound=BaseSongItem)
 

bot/results/deezer/__init__.py

@@ -1,4 +1,3 @@
 from .search import get_deezer_search_results
 
-
 __all__ = ["get_deezer_search_results"]

bot/results/deezer/search.py

@@ -1,7 +1,7 @@
-from aiogram.types import InlineQueryResultDocument, InlineQueryResultCachedAudio
+from aiogram.types import InlineQueryResultCachedAudio, InlineQueryResultDocument
 
-from bot.modules.deezer import deezer
 from bot.modules.database import db
+from bot.modules.deezer import deezer
 from bot.modules.settings import UserSettings
 
 from ..common.search import get_common_search_result

bot/results/error/error.py

@@ -1,12 +1,8 @@
-from aiogram.types import (
+from aiogram.types import InlineQueryResultArticle, InputTextMessageContent
-    InlineQueryResultArticle,
-    InputTextMessageContent,
-)
-
-from bot.modules.database import db
-from bot.modules.error import Error
 
 from bot.common import console
+from bot.modules.database import db
+from bot.modules.error import Error
 
 
 async def get_error_search_results(

bot/results/soundcloud/__init__.py

@@ -1,4 +1,3 @@
 from .search import get_soundcloud_search_results
 
-
 __all__ = ["get_soundcloud_search_results"]

bot/results/soundcloud/search.py

@@ -1,8 +1,8 @@
-from aiogram.types import InlineQueryResultDocument, InlineQueryResultCachedAudio
+from aiogram.types import InlineQueryResultCachedAudio, InlineQueryResultDocument
 
-from bot.modules.soundcloud import soundcloud
 from bot.modules.database import db
 from bot.modules.settings import UserSettings
+from bot.modules.soundcloud import soundcloud
 
 from ..common.search import get_common_search_result
 

bot/results/spotify/__init__.py

@@ -1,4 +1,3 @@
 from .search import get_spotify_search_results
 
-
 __all__ = ["get_spotify_search_results"]

bot/results/spotify/search.py

@@ -1,8 +1,8 @@
-from aiogram.types import InlineQueryResultDocument, InlineQueryResultCachedAudio
+from aiogram.types import InlineQueryResultCachedAudio, InlineQueryResultDocument
 
-from bot.modules.spotify import spotify
 from bot.modules.database import db
 from bot.modules.settings import UserSettings
+from bot.modules.spotify import spotify
 
 from ..common.search import get_common_search_result
 

bot/results/url/url.py

@@ -1,12 +1,12 @@
-from aiogram.types import InlineQueryResultDocument, InlineQueryResultCachedAudio
+import inspect
+
+from aiogram.types import InlineQueryResultCachedAudio, InlineQueryResultDocument
 
-from bot.modules.url import recognise_music_service, get_id
 from bot.modules.settings import UserSettings
+from bot.modules.url import get_id, recognise_music_service
 
 from ..common.search import get_common_search_result
 
-import inspect
-
 
 async def get_url_results(
     query: str, settings: UserSettings

bot/results/youtube/__init__.py

@@ -1,4 +1,3 @@
 from .search import get_youtube_search_results
 
-
 __all__ = ["get_youtube_search_results"]

bot/results/youtube/search.py

@@ -1,8 +1,8 @@
-from aiogram.types import InlineQueryResultDocument, InlineQueryResultCachedAudio
+from aiogram.types import InlineQueryResultCachedAudio, InlineQueryResultDocument
 
-from bot.modules.youtube import youtube
 from bot.modules.database import db
 from bot.modules.settings import UserSettings
+from bot.modules.youtube import youtube
 
 from ..common.search import get_common_search_result
 

bot/utils/config/__init__.py

@@ -1,4 +1,3 @@
 from ._config import Config
 
-
 config = Config()

lib/ShazamIO/shazamio/__init__.py

@@ -1,6 +1,6 @@
-from .serializers import Serialize
 from .api import Shazam
 from .converter import Geo
 from .enums import GenreMusic
+from .serializers import Serialize
 
 __all__ = ("Serialize", "Shazam", "Geo", "GenreMusic")

lib/ShazamIO/shazamio/algorithm.py

@@ -1,5 +1,6 @@
 from copy import copy
-from typing import List, Optional, Any
+from typing import Any, List, Optional
+
 import numpy as np
 
 from .enums import FrequencyBand

lib/ShazamIO/shazamio/api.py

@@ -1,21 +1,17 @@
 import pathlib
-import uuid
 import time
-from typing import Optional
+import uuid
+from typing import Any, Dict, Optional, Union
 
 from pydub import AudioSegment
 
-from typing import Dict, Any, Union
+from .converter import Converter, Geo
-
+from .enums import GenreMusic
-from .misc import Request
+from .misc import Request, ShazamUrl
-from .misc import ShazamUrl
 from .schemas.artists import ArtistQuery
 from .signature import DecodedMessage
-from .enums import GenreMusic
-from .converter import Converter, Geo
 from .typehints import CountryCode
-from .utils import ArtistQueryGenerator
+from .utils import ArtistQueryGenerator, get_song
-from .utils import get_song
 
 
 class Shazam(Converter, Geo, Request):

lib/ShazamIO/shazamio/client.py

@@ -1,5 +1,4 @@
 import aiohttp
-
 from shazamio.exceptions import BadMethod
 from shazamio.utils import validate_json
 

lib/ShazamIO/shazamio/factory_misc.py

@@ -1,22 +1,19 @@
 from dataclass_factory import Factory
-
 from shazamio.factory import FactorySchemas
-from shazamio.schemas.artists import ArtistInfo
+from shazamio.schemas.artists import ArtistInfo, ArtistV3
-from shazamio.schemas.artists import ArtistV3
 from shazamio.schemas.attributes import ArtistAttribute
 from shazamio.schemas.models import (
-    SongSection,
-    VideoSection,
-    RelatedSection,
-    LyricsSection,
-    BeaconDataLyricsSection,
     ArtistSection,
+    BeaconDataLyricsSection,
+    LyricsSection,
     MatchModel,
+    RelatedSection,
+    ResponseTrack,
+    SongSection,
+    TrackInfo,
+    VideoSection,
+    YoutubeData,
 )
-from shazamio.schemas.models import TrackInfo
-from shazamio.schemas.models import YoutubeData
-from shazamio.schemas.models import ResponseTrack
-
 
 FACTORY_TRACK = Factory(
     schemas={

lib/ShazamIO/shazamio/misc.py

@@ -1,4 +1,5 @@
 from random import choice
+
 from shazamio.user_agent import USER_AGENTS
 
 

lib/ShazamIO/shazamio/schemas/artist/views/full_albums.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import List, Optional
 
 from pydantic import BaseModel, Field
-
 from shazamio.schemas.attributes import AttributeName
 from shazamio.schemas.base import BaseDataModel
 from shazamio.schemas.photos import ImageModel

lib/ShazamIO/shazamio/schemas/artist/views/last_release.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import Any, Dict, List, Optional
 
 from pydantic import BaseModel, Field
-
 from shazamio.schemas.attributes import AttributeName
 from shazamio.schemas.base import BaseDataModel
 from shazamio.schemas.photos import ImageModel

lib/ShazamIO/shazamio/schemas/artist/views/simular_artists.py

@@ -3,10 +3,8 @@ from __future__ import annotations
 from typing import List, Optional
 
 from pydantic import BaseModel, Field
-
 from shazamio.schemas.attributes import AttributeName
-from shazamio.schemas.base import BaseHrefNextData
+from shazamio.schemas.base import BaseHrefNextData, BaseIdTypeHref
-from shazamio.schemas.base import BaseIdTypeHref
 from shazamio.schemas.photos import ImageModel
 
 

lib/ShazamIO/shazamio/schemas/artist/views/top_music.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import Any, Dict, List, Optional
 
 from pydantic import BaseModel, Field
-
 from shazamio.schemas.attributes import AttributeName
 from shazamio.schemas.base import BaseDataModel
 from shazamio.schemas.photos import ImageModel

lib/ShazamIO/shazamio/schemas/artist/views/top_song.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import List, Optional
 
 from pydantic import BaseModel, Field
-
 from shazamio.schemas.artist.views.top_music import PlayParams
 from shazamio.schemas.attributes import AttributeName
 from shazamio.schemas.base import BaseDataModel

lib/ShazamIO/shazamio/schemas/artists.py

@@ -1,20 +1,14 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
-from dataclasses import field
+from typing import List, Optional, Union
-from typing import List
-from typing import Optional
-from typing import Union
-
-from pydantic import BaseModel
-from pydantic import Field
 
+from pydantic import BaseModel, Field
 from shazamio.schemas.artist.views.full_albums import FullAlbumsModel
 from shazamio.schemas.artist.views.last_release import LastReleaseModel
 from shazamio.schemas.artist.views.simular_artists import SimularArtist
 from shazamio.schemas.artist.views.top_music import TopMusicVideosView
 from shazamio.schemas.artist.views.top_song import TopSong
 from shazamio.schemas.attributes import ArtistAttribute
-from shazamio.schemas.enums import ArtistExtend
+from shazamio.schemas.enums import ArtistExtend, ArtistView
-from shazamio.schemas.enums import ArtistView
 from shazamio.schemas.errors import ErrorModel
 
 

lib/ShazamIO/shazamio/schemas/attributes.py

@@ -1,8 +1,6 @@
-from typing import List
+from typing import List, Optional
-from typing import Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
-from pydantic import Field
 
 
 class AttributeName(BaseModel):

lib/ShazamIO/shazamio/schemas/base.py

@@ -1,11 +1,8 @@
-from typing import Generic
+from typing import Generic, Optional, TypeVar
-from typing import Optional
-from typing import TypeVar
 
 from pydantic import BaseModel
 from pydantic.generics import GenericModel
 
-
 T = TypeVar("T", bound=BaseModel)
 
 

lib/ShazamIO/shazamio/schemas/models.py

@@ -1,11 +1,6 @@
-from dataclasses import dataclass
+from dataclasses import dataclass, field
-from dataclasses import field
+from typing import List, Optional, Union
-from typing import List
+from urllib.parse import urlencode, urlparse, urlunparse
-from typing import Optional
-from typing import Union
-from urllib.parse import urlencode
-from urllib.parse import urlparse
-from urllib.parse import urlunparse
 from uuid import UUID
 
 

lib/ShazamIO/shazamio/schemas/photos.py

@@ -1,7 +1,6 @@
 from typing import Optional
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Field
-from pydantic import Field
 
 
 class ImageModel(BaseModel):

lib/ShazamIO/shazamio/serializers.py

@@ -1,13 +1,8 @@
 from typing import Union
 
-from shazamio.factory_misc import FACTORY_ARTIST
+from shazamio.factory_misc import FACTORY_ARTIST, FACTORY_TRACK
-from shazamio.factory_misc import FACTORY_TRACK
+from shazamio.schemas.artists import ArtistInfo, ArtistResponse, ArtistV2
-from shazamio.schemas.artists import ArtistInfo
+from shazamio.schemas.models import ResponseTrack, TrackInfo, YoutubeData
-from shazamio.schemas.artists import ArtistResponse
-from shazamio.schemas.artists import ArtistV2
-from shazamio.schemas.models import ResponseTrack
-from shazamio.schemas.models import TrackInfo
-from shazamio.schemas.models import YoutubeData
 
 
 class Serialize:

lib/ShazamIO/shazamio/signature.py

@@ -1,9 +1,10 @@
-from typing import Dict, List
 from base64 import b64decode, b64encode
-from math import exp, sqrt
 from binascii import crc32
-from io import BytesIO
 from ctypes import *
+from io import BytesIO
+from math import exp, sqrt
+from typing import Dict, List
+
 from .enums import FrequencyBand, SampleRate
 
 DATA_URI_PREFIX = "data:audio/vnd.shazam.sig;base64,"

lib/ShazamIO/shazamio/utils.py

@@ -1,16 +1,12 @@
 import pathlib
 from enum import Enum
 from io import BytesIO
-from typing import Dict
+from typing import Dict, List, Optional, Union
-from typing import List
-from typing import Optional
-from typing import Union
 
 import aiofiles
 import aiohttp
 from aiohttp import ContentTypeError
 from pydub import AudioSegment
-
 from shazamio.exceptions import FailedDecodeJson
 from shazamio.schemas.artists import ArtistQuery