used isort + black

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
-
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
+import re
+import warnings
 
 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 aiogram.types.error_event import ErrorEvent
+from dataclasses import dataclass
+
 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 (
-    BaseStorage,
-    StateType,
-    StorageKey,
-)
+from aiogram.fsm.storage.base import BaseStorage, StateType, StorageKey
+
+from bot.modules.database import db
 
 
 @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 Callable, Awaitable, Literal
+from typing import Awaitable, Callable, 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
-from pytubefix import YouTube, Stream
-
-from pydub import AudioSegment
+import asyncio
+from concurrent.futures import ThreadPoolExecutor
 from io import BytesIO
 
-from concurrent.futures import ThreadPoolExecutor
-
-import asyncio
+from attrs import define
+from pydub import AudioSegment
+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):