From ff22636453b8785a9d2be92a7955b94c9c93f464 Mon Sep 17 00:00:00 2001 From: hhh Date: Sat, 2 Nov 2024 00:10:44 +0200 Subject: [PATCH] used isort + black --- bot/__init__.py | 10 ++++----- bot/callbacks/__init__.py | 7 ++----- bot/callbacks/full_menu.py | 3 +-- bot/callbacks/on_home.py | 3 +-- bot/callbacks/settings.py | 7 +++---- bot/common.py | 4 +++- bot/factories/full_menu.py | 1 + bot/filters/url.py | 4 ++-- bot/handlers/__init__.py | 19 +++++++++-------- bot/handlers/initialize/initializer.py | 3 +-- .../inline_default/on_inline_default.py | 8 +++---- bot/handlers/inline_empty/on_inline_empty.py | 4 ++-- .../inline_error/on_inline_error_info.py | 3 +-- bot/handlers/inline_song/__init__.py | 4 ++-- bot/handlers/inline_song/on_inline_deezer.py | 3 +-- .../inline_song/on_inline_soundcloud.py | 3 +-- bot/handlers/inline_song/on_inline_spotify.py | 3 +-- bot/handlers/inline_song/on_inline_youtube.py | 3 +-- bot/handlers/inline_url/on_inline_url.py | 3 +-- bot/handlers/on_chosen/__init__.py | 3 ++- bot/handlers/on_chosen/deezer.py | 10 ++++----- bot/handlers/on_chosen/recode_cached.py | 15 +++++-------- bot/handlers/on_chosen/soundcloud.py | 10 ++++----- bot/handlers/on_chosen/spotify.py | 16 +++++++------- bot/handlers/on_chosen/suppress_verify.py | 6 ++---- bot/handlers/on_chosen/youtube.py | 10 ++++----- bot/keyboards/inline/full_menu.py | 6 +++--- bot/keyboards/inline/search_variants.py | 5 ++--- bot/keyboards/inline/setting.py | 8 +++---- bot/keyboards/inline/settings.py | 8 +++---- bot/middlewares/__init__.py | 2 +- bot/middlewares/inject_settings.py | 4 ++-- bot/middlewares/private_button.py | 4 ++-- bot/middlewares/save_chosen.py | 6 +++--- bot/modules/database/__init__.py | 1 - bot/modules/database/db_model.py | 1 + bot/modules/deezer/__init__.py | 4 ++-- bot/modules/deezer/deezer.py | 6 +++--- bot/modules/deezer/downloader.py | 7 +++---- bot/modules/deezer/driver.py | 1 - bot/modules/deezer/engine.py | 3 --- bot/modules/deezer/song.py | 3 +-- bot/modules/deezer/util.py | 9 ++++---- bot/modules/error/__init__.py | 2 +- bot/modules/error/handler.py | 12 +++++------ bot/modules/error/pretty.py | 4 ++-- bot/modules/fsm/in_db.py | 9 +++----- bot/modules/settings/__init__.py | 2 +- bot/modules/settings/model.py | 1 + bot/modules/soundcloud/__init__.py | 4 ++-- bot/modules/soundcloud/downloader.py | 6 +++--- bot/modules/soundcloud/engine.py | 2 +- bot/modules/soundcloud/soundcloud.py | 6 +++--- bot/modules/spotify/__init__.py | 2 +- bot/modules/spotify/song.py | 2 +- bot/modules/url/__init__.py | 2 +- bot/modules/url/id_getter.py | 4 ++-- bot/modules/url/recognise.py | 10 ++++----- bot/modules/youtube/__init__.py | 2 +- bot/modules/youtube/downloader.py | 12 +++++------ bot/modules/youtube/song.py | 9 ++++---- bot/modules/youtube/youtube.py | 2 +- bot/results/common/search.py | 21 +++++++++---------- bot/results/deezer/__init__.py | 1 - bot/results/deezer/search.py | 4 ++-- bot/results/error/error.py | 10 +++------ bot/results/soundcloud/__init__.py | 1 - bot/results/soundcloud/search.py | 4 ++-- bot/results/spotify/__init__.py | 1 - bot/results/spotify/search.py | 4 ++-- bot/results/url/url.py | 8 +++---- bot/results/youtube/__init__.py | 1 - bot/results/youtube/search.py | 4 ++-- bot/utils/config/__init__.py | 1 - lib/ShazamIO/shazamio/__init__.py | 2 +- lib/ShazamIO/shazamio/algorithm.py | 3 ++- lib/ShazamIO/shazamio/api.py | 16 ++++++-------- lib/ShazamIO/shazamio/client.py | 1 - lib/ShazamIO/shazamio/factory_misc.py | 21 ++++++++----------- lib/ShazamIO/shazamio/misc.py | 1 + .../schemas/artist/views/full_albums.py | 1 - .../schemas/artist/views/last_release.py | 1 - .../schemas/artist/views/simular_artists.py | 4 +--- .../schemas/artist/views/top_music.py | 1 - .../shazamio/schemas/artist/views/top_song.py | 1 - lib/ShazamIO/shazamio/schemas/artists.py | 14 ++++--------- lib/ShazamIO/shazamio/schemas/attributes.py | 6 ++---- lib/ShazamIO/shazamio/schemas/base.py | 5 +---- lib/ShazamIO/shazamio/schemas/models.py | 11 +++------- lib/ShazamIO/shazamio/schemas/photos.py | 3 +-- lib/ShazamIO/shazamio/serializers.py | 11 +++------- lib/ShazamIO/shazamio/signature.py | 7 ++++--- lib/ShazamIO/shazamio/utils.py | 6 +----- 93 files changed, 216 insertions(+), 295 deletions(-) diff --git a/bot/__init__.py b/bot/__init__.py index be3cdcb..786db19 100644 --- a/bot/__init__.py +++ b/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 handlers, callbacks + from . import callbacks, handlers + from .common import bot, dp 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() diff --git a/bot/callbacks/__init__.py b/bot/callbacks/__init__.py index 6ad7d02..ab93328 100644 --- a/bot/callbacks/__init__.py +++ b/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() diff --git a/bot/callbacks/full_menu.py b/bot/callbacks/full_menu.py index e9c9ede..5bdc444 100644 --- a/bot/callbacks/full_menu.py +++ b/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() diff --git a/bot/callbacks/on_home.py b/bot/callbacks/on_home.py index e699cb8..d46b514 100644 --- a/bot/callbacks/on_home.py +++ b/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() diff --git a/bot/callbacks/settings.py b/bot/callbacks/settings.py index 0029c4b..5af529e 100644 --- a/bot/callbacks/settings.py +++ b/bot/callbacks/settings.py @@ -1,11 +1,10 @@ -from aiogram import Router, Bot -from aiogram.types import CallbackQuery +from aiogram import Bot, Router 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() diff --git a/bot/common.py b/bot/common.py index 4bc42f6..3158a9e 100644 --- a/bot/common.py +++ b/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) diff --git a/bot/factories/full_menu.py b/bot/factories/full_menu.py index edcbd86..50e6b50 100644 --- a/bot/factories/full_menu.py +++ b/bot/factories/full_menu.py @@ -1,4 +1,5 @@ from typing import Literal + from aiogram.filters.callback_data import CallbackData diff --git a/bot/filters/url.py b/bot/filters/url.py index 4ee9034..fc6cc46 100644 --- a/bot/filters/url.py +++ b/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): diff --git a/bot/handlers/__init__.py b/bot/handlers/__init__.py index 3716dd2..42db1b2 100644 --- a/bot/handlers/__init__.py +++ b/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()) diff --git a/bot/handlers/initialize/initializer.py b/bot/handlers/initialize/initializer.py index 306a125..354ce0e 100644 --- a/bot/handlers/initialize/initializer.py +++ b/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() diff --git a/bot/handlers/inline_default/on_inline_default.py b/bot/handlers/inline_default/on_inline_default.py index 221b639..65f6b90 100644 --- a/bot/handlers/inline_default/on_inline_default.py +++ b/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.modules.settings import UserSettings +from bot.results.youtube import get_youtube_search_results router = Router() diff --git a/bot/handlers/inline_empty/on_inline_empty.py b/bot/handlers/inline_empty/on_inline_empty.py index d3a9e25..12a811d 100644 --- a/bot/handlers/inline_empty/on_inline_empty.py +++ b/bot/handlers/inline_empty/on_inline_empty.py @@ -1,5 +1,5 @@ -from aiogram import Router, F -from aiogram.types import InlineQuery, InputTextMessageContent, InlineQueryResultArticle +from aiogram import F, Router +from aiogram.types import InlineQuery, InlineQueryResultArticle, InputTextMessageContent from bot.keyboards.inline.full_menu import get_full_menu_kb diff --git a/bot/handlers/inline_error/on_inline_error_info.py b/bot/handlers/inline_error/on_inline_error_info.py index b156997..b837095 100644 --- a/bot/handlers/inline_error/on_inline_error_info.py +++ b/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() diff --git a/bot/handlers/inline_song/__init__.py b/bot/handlers/inline_song/__init__.py index df416bd..c336932 100644 --- a/bot/handlers/inline_song/__init__.py +++ b/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() diff --git a/bot/handlers/inline_song/on_inline_deezer.py b/bot/handlers/inline_song/on_inline_deezer.py index 4ff13c6..d77b065 100644 --- a/bot/handlers/inline_song/on_inline_deezer.py +++ b/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() diff --git a/bot/handlers/inline_song/on_inline_soundcloud.py b/bot/handlers/inline_song/on_inline_soundcloud.py index 22f0596..24ae286 100644 --- a/bot/handlers/inline_song/on_inline_soundcloud.py +++ b/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() diff --git a/bot/handlers/inline_song/on_inline_spotify.py b/bot/handlers/inline_song/on_inline_spotify.py index 5122c9e..f88f6c3 100644 --- a/bot/handlers/inline_song/on_inline_spotify.py +++ b/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() diff --git a/bot/handlers/inline_song/on_inline_youtube.py b/bot/handlers/inline_song/on_inline_youtube.py index 2b7a785..297598f 100644 --- a/bot/handlers/inline_song/on_inline_youtube.py +++ b/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() diff --git a/bot/handlers/inline_url/on_inline_url.py b/bot/handlers/inline_url/on_inline_url.py index 2c3ace4..d872770 100644 --- a/bot/handlers/inline_url/on_inline_url.py +++ b/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() diff --git a/bot/handlers/on_chosen/__init__.py b/bot/handlers/on_chosen/__init__.py index 156f09b..d21b3ea 100644 --- a/bot/handlers/on_chosen/__init__.py +++ b/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() diff --git a/bot/handlers/on_chosen/deezer.py b/bot/handlers/on_chosen/deezer.py index 0ceb490..c1b53ec 100644 --- a/bot/handlers/on_chosen/deezer.py +++ b/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() diff --git a/bot/handlers/on_chosen/recode_cached.py b/bot/handlers/on_chosen/recode_cached.py index 29eba26..f69fd95 100644 --- a/bot/handlers/on_chosen/recode_cached.py +++ b/bot/handlers/on_chosen/recode_cached.py @@ -1,17 +1,12 @@ -from aiogram import Router, Bot, F -from aiogram.types import ( - BufferedInputFile, - InputMediaAudio, - ChosenInlineResult, -) +from io import BytesIO -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 io import BytesIO +from bot.modules.youtube.downloader import YouTubeBytestream +from bot.utils.config import config router = Router() diff --git a/bot/handlers/on_chosen/soundcloud.py b/bot/handlers/on_chosen/soundcloud.py index 8021be3..3638793 100644 --- a/bot/handlers/on_chosen/soundcloud.py +++ b/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() diff --git a/bot/handlers/on_chosen/spotify.py b/bot/handlers/on_chosen/spotify.py index 7c42cf2..6253c30 100644 --- a/bot/handlers/on_chosen/spotify.py +++ b/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() diff --git a/bot/handlers/on_chosen/suppress_verify.py b/bot/handlers/on_chosen/suppress_verify.py index ef20ac2..402f321 100644 --- a/bot/handlers/on_chosen/suppress_verify.py +++ b/bot/handlers/on_chosen/suppress_verify.py @@ -1,7 +1,5 @@ -from aiogram import Router, Bot, F -from aiogram.types import ( - ChosenInlineResult, -) +from aiogram import Bot, F, Router +from aiogram.types import ChosenInlineResult router = Router() diff --git a/bot/handlers/on_chosen/youtube.py b/bot/handlers/on_chosen/youtube.py index 57bdad3..75bfcb5 100644 --- a/bot/handlers/on_chosen/youtube.py +++ b/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() diff --git a/bot/keyboards/inline/full_menu.py b/bot/keyboards/inline/full_menu.py index 9e259ca..8a1c84b 100644 --- a/bot/keyboards/inline/full_menu.py +++ b/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 diff --git a/bot/keyboards/inline/search_variants.py b/bot/keyboards/inline/search_variants.py index 6423577..111ec56 100644 --- a/bot/keyboards/inline/search_variants.py +++ b/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"} diff --git a/bot/keyboards/inline/setting.py b/bot/keyboards/inline/setting.py index edf1587..3e845e1 100644 --- a/bot/keyboards/inline/setting.py +++ b/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 diff --git a/bot/keyboards/inline/settings.py b/bot/keyboards/inline/settings.py index 4c0d65f..0158550 100644 --- a/bot/keyboards/inline/settings.py +++ b/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 diff --git a/bot/middlewares/__init__.py b/bot/middlewares/__init__.py index ac8128d..7308169 100644 --- a/bot/middlewares/__init__.py +++ b/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 diff --git a/bot/middlewares/inject_settings.py b/bot/middlewares/inject_settings.py index 1b21115..ec9a2f7 100644 --- a/bot/middlewares/inject_settings.py +++ b/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 diff --git a/bot/middlewares/private_button.py b/bot/middlewares/private_button.py index b4dfa22..6412dd5 100644 --- a/bot/middlewares/private_button.py +++ b/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 diff --git a/bot/middlewares/save_chosen.py b/bot/middlewares/save_chosen.py index d0ff446..15f1c35 100644 --- a/bot/middlewares/save_chosen.py +++ b/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 diff --git a/bot/modules/database/__init__.py b/bot/modules/database/__init__.py index d3e1d04..0d1f9fc 100644 --- a/bot/modules/database/__init__.py +++ b/bot/modules/database/__init__.py @@ -1,6 +1,5 @@ from .db import Db - db = Db() __all__ = ["db"] diff --git a/bot/modules/database/db_model.py b/bot/modules/database/db_model.py index 87133dc..23fa2b0 100644 --- a/bot/modules/database/db_model.py +++ b/bot/modules/database/db_model.py @@ -1,4 +1,5 @@ from sqlitedict import SqliteDict + from bot.utils.config import config diff --git a/bot/modules/deezer/__init__.py b/bot/modules/deezer/__init__.py index 28f8641..01bf107 100644 --- a/bot/modules/deezer/__init__.py +++ b/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, diff --git a/bot/modules/deezer/deezer.py b/bot/modules/deezer/deezer.py index d117b07..0997b07 100644 --- a/bot/modules/deezer/deezer.py +++ b/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): diff --git a/bot/modules/deezer/downloader.py b/bot/modules/deezer/downloader.py index f30ccb3..fd48a52 100644 --- a/bot/modules/deezer/downloader.py +++ b/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 diff --git a/bot/modules/deezer/driver.py b/bot/modules/deezer/driver.py index 2085bf1..19a4e9f 100644 --- a/bot/modules/deezer/driver.py +++ b/bot/modules/deezer/driver.py @@ -1,7 +1,6 @@ from attrs import define from .engine import DeezerEngine - from .util import clean_query diff --git a/bot/modules/deezer/engine.py b/bot/modules/deezer/engine.py index d87f800..cb42c81 100644 --- a/bot/modules/deezer/engine.py +++ b/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", diff --git a/bot/modules/deezer/song.py b/bot/modules/deezer/song.py index c2f3f35..ac9c912 100644 --- a/bot/modules/deezer/song.py +++ b/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 diff --git a/bot/modules/deezer/util.py b/bot/modules/deezer/util.py index 5643d07..d534614 100644 --- a/bot/modules/deezer/util.py +++ b/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 diff --git a/bot/modules/error/__init__.py b/bot/modules/error/__init__.py index f7c0612..f2620b5 100644 --- a/bot/modules/error/__init__.py +++ b/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 diff --git a/bot/modules/error/handler.py b/bot/modules/error/handler.py index 4235ffa..ef51d5f 100644 --- a/bot/modules/error/handler.py +++ b/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() diff --git a/bot/modules/error/pretty.py b/bot/modules/error/pretty.py index 537feb9..8d490aa 100644 --- a/bot/modules/error/pretty.py +++ b/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 diff --git a/bot/modules/fsm/in_db.py b/bot/modules/fsm/in_db.py index 9c6bac4..00c5269 100644 --- a/bot/modules/fsm/in_db.py +++ b/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 diff --git a/bot/modules/settings/__init__.py b/bot/modules/settings/__init__.py index 7201f5a..e2cdcae 100644 --- a/bot/modules/settings/__init__.py +++ b/bot/modules/settings/__init__.py @@ -1 +1 @@ -from .model import UserSettings, Setting, settings_strings +from .model import Setting, UserSettings, settings_strings diff --git a/bot/modules/settings/model.py b/bot/modules/settings/model.py index 40c3e7e..54193f0 100644 --- a/bot/modules/settings/model.py +++ b/bot/modules/settings/model.py @@ -1,4 +1,5 @@ from dataclasses import dataclass + from ..database import db diff --git a/bot/modules/soundcloud/__init__.py b/bot/modules/soundcloud/__init__.py index 195d79c..1e6c4b7 100644 --- a/bot/modules/soundcloud/__init__.py +++ b/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, diff --git a/bot/modules/soundcloud/downloader.py b/bot/modules/soundcloud/downloader.py index 724ff2e..40c5a7e 100644 --- a/bot/modules/soundcloud/downloader.py +++ b/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: diff --git a/bot/modules/soundcloud/engine.py b/bot/modules/soundcloud/engine.py index e953532..311736e 100644 --- a/bot/modules/soundcloud/engine.py +++ b/bot/modules/soundcloud/engine.py @@ -1,5 +1,5 @@ -from attrs import define import aiohttp +from attrs import define @define diff --git a/bot/modules/soundcloud/soundcloud.py b/bot/modules/soundcloud/soundcloud.py index 03cb8e9..86d3599 100644 --- a/bot/modules/soundcloud/soundcloud.py +++ b/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): diff --git a/bot/modules/spotify/__init__.py b/bot/modules/spotify/__init__.py index 1a503db..44103dd 100644 --- a/bot/modules/spotify/__init__.py +++ b/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, diff --git a/bot/modules/spotify/song.py b/bot/modules/spotify/song.py index c8e24dc..4f56974 100644 --- a/bot/modules/spotify/song.py +++ b/bot/modules/spotify/song.py @@ -1,5 +1,5 @@ -from attrs import define import spotipy +from attrs import define from ..common.song import BaseSongItem diff --git a/bot/modules/url/__init__.py b/bot/modules/url/__init__.py index 38ad1dc..b1ec77b 100644 --- a/bot/modules/url/__init__.py +++ b/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 diff --git a/bot/modules/url/id_getter.py b/bot/modules/url/id_getter.py index 0813bb1..e6b8028 100644 --- a/bot/modules/url/id_getter.py +++ b/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: diff --git a/bot/modules/url/recognise.py b/bot/modules/url/recognise.py index 96b88af..f42c023 100644 --- a/bot/modules/url/recognise.py +++ b/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 diff --git a/bot/modules/youtube/__init__.py b/bot/modules/youtube/__init__.py index f3907c3..50a6e00 100644 --- a/bot/modules/youtube/__init__.py +++ b/bot/modules/youtube/__init__.py @@ -1,6 +1,6 @@ -from .youtube import YouTube from pytubefix.exceptions import AgeRestrictedError +from .youtube import YouTube youtube = YouTube() diff --git a/bot/modules/youtube/downloader.py b/bot/modules/youtube/downloader.py index 964a529..4ce6875 100644 --- a/bot/modules/youtube/downloader.py +++ b/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 diff --git a/bot/modules/youtube/song.py b/bot/modules/youtube/song.py index 869d355..35ab56a 100644 --- a/bot/modules/youtube/song.py +++ b/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 diff --git a/bot/modules/youtube/youtube.py b/bot/modules/youtube/youtube.py index d756f27..0c1a0af 100644 --- a/bot/modules/youtube/youtube.py +++ b/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): diff --git a/bot/results/common/search.py b/bot/results/common/search.py index 92433e1..379342a 100644 --- a/bot/results/common/search.py +++ b/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) diff --git a/bot/results/deezer/__init__.py b/bot/results/deezer/__init__.py index 2b3f940..22c11a5 100644 --- a/bot/results/deezer/__init__.py +++ b/bot/results/deezer/__init__.py @@ -1,4 +1,3 @@ from .search import get_deezer_search_results - __all__ = ["get_deezer_search_results"] diff --git a/bot/results/deezer/search.py b/bot/results/deezer/search.py index ca416d5..6412e41 100644 --- a/bot/results/deezer/search.py +++ b/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 diff --git a/bot/results/error/error.py b/bot/results/error/error.py index 90fb51f..df05039 100644 --- a/bot/results/error/error.py +++ b/bot/results/error/error.py @@ -1,12 +1,8 @@ -from aiogram.types import ( - InlineQueryResultArticle, - InputTextMessageContent, -) - -from bot.modules.database import db -from bot.modules.error import Error +from aiogram.types import InlineQueryResultArticle, InputTextMessageContent from bot.common import console +from bot.modules.database import db +from bot.modules.error import Error async def get_error_search_results( diff --git a/bot/results/soundcloud/__init__.py b/bot/results/soundcloud/__init__.py index 0a54fc7..095f38b 100644 --- a/bot/results/soundcloud/__init__.py +++ b/bot/results/soundcloud/__init__.py @@ -1,4 +1,3 @@ from .search import get_soundcloud_search_results - __all__ = ["get_soundcloud_search_results"] diff --git a/bot/results/soundcloud/search.py b/bot/results/soundcloud/search.py index 5911f69..8c3840d 100644 --- a/bot/results/soundcloud/search.py +++ b/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 diff --git a/bot/results/spotify/__init__.py b/bot/results/spotify/__init__.py index d7673ce..d6513be 100644 --- a/bot/results/spotify/__init__.py +++ b/bot/results/spotify/__init__.py @@ -1,4 +1,3 @@ from .search import get_spotify_search_results - __all__ = ["get_spotify_search_results"] diff --git a/bot/results/spotify/search.py b/bot/results/spotify/search.py index b5f797c..e46dae6 100644 --- a/bot/results/spotify/search.py +++ b/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 diff --git a/bot/results/url/url.py b/bot/results/url/url.py index cd63de1..385b9a1 100644 --- a/bot/results/url/url.py +++ b/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 diff --git a/bot/results/youtube/__init__.py b/bot/results/youtube/__init__.py index a182d7f..f95951e 100644 --- a/bot/results/youtube/__init__.py +++ b/bot/results/youtube/__init__.py @@ -1,4 +1,3 @@ from .search import get_youtube_search_results - __all__ = ["get_youtube_search_results"] diff --git a/bot/results/youtube/search.py b/bot/results/youtube/search.py index 4ad0249..4ea126f 100644 --- a/bot/results/youtube/search.py +++ b/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 diff --git a/bot/utils/config/__init__.py b/bot/utils/config/__init__.py index c7cb2eb..4efceb0 100644 --- a/bot/utils/config/__init__.py +++ b/bot/utils/config/__init__.py @@ -1,4 +1,3 @@ from ._config import Config - config = Config() diff --git a/lib/ShazamIO/shazamio/__init__.py b/lib/ShazamIO/shazamio/__init__.py index 1d6b6aa..e3986f7 100644 --- a/lib/ShazamIO/shazamio/__init__.py +++ b/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") diff --git a/lib/ShazamIO/shazamio/algorithm.py b/lib/ShazamIO/shazamio/algorithm.py index dc69acd..54ef897 100644 --- a/lib/ShazamIO/shazamio/algorithm.py +++ b/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 diff --git a/lib/ShazamIO/shazamio/api.py b/lib/ShazamIO/shazamio/api.py index 0470ed9..39223f5 100644 --- a/lib/ShazamIO/shazamio/api.py +++ b/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 .misc import Request -from .misc import ShazamUrl +from .converter import Converter, Geo +from .enums import GenreMusic +from .misc import Request, 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 get_song +from .utils import ArtistQueryGenerator, get_song class Shazam(Converter, Geo, Request): diff --git a/lib/ShazamIO/shazamio/client.py b/lib/ShazamIO/shazamio/client.py index 8862942..aa80990 100644 --- a/lib/ShazamIO/shazamio/client.py +++ b/lib/ShazamIO/shazamio/client.py @@ -1,5 +1,4 @@ import aiohttp - from shazamio.exceptions import BadMethod from shazamio.utils import validate_json diff --git a/lib/ShazamIO/shazamio/factory_misc.py b/lib/ShazamIO/shazamio/factory_misc.py index b9d0076..2b94968 100644 --- a/lib/ShazamIO/shazamio/factory_misc.py +++ b/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 ArtistV3 +from shazamio.schemas.artists import ArtistInfo, 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={ diff --git a/lib/ShazamIO/shazamio/misc.py b/lib/ShazamIO/shazamio/misc.py index 12d5c08..c1dc836 100644 --- a/lib/ShazamIO/shazamio/misc.py +++ b/lib/ShazamIO/shazamio/misc.py @@ -1,4 +1,5 @@ from random import choice + from shazamio.user_agent import USER_AGENTS diff --git a/lib/ShazamIO/shazamio/schemas/artist/views/full_albums.py b/lib/ShazamIO/shazamio/schemas/artist/views/full_albums.py index 3ee3278..b62651f 100644 --- a/lib/ShazamIO/shazamio/schemas/artist/views/full_albums.py +++ b/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 diff --git a/lib/ShazamIO/shazamio/schemas/artist/views/last_release.py b/lib/ShazamIO/shazamio/schemas/artist/views/last_release.py index ce9518e..fc6e016 100644 --- a/lib/ShazamIO/shazamio/schemas/artist/views/last_release.py +++ b/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 diff --git a/lib/ShazamIO/shazamio/schemas/artist/views/simular_artists.py b/lib/ShazamIO/shazamio/schemas/artist/views/simular_artists.py index 5147835..bf23579 100644 --- a/lib/ShazamIO/shazamio/schemas/artist/views/simular_artists.py +++ b/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 BaseIdTypeHref +from shazamio.schemas.base import BaseHrefNextData, BaseIdTypeHref from shazamio.schemas.photos import ImageModel diff --git a/lib/ShazamIO/shazamio/schemas/artist/views/top_music.py b/lib/ShazamIO/shazamio/schemas/artist/views/top_music.py index 8886311..20ccaae 100644 --- a/lib/ShazamIO/shazamio/schemas/artist/views/top_music.py +++ b/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 diff --git a/lib/ShazamIO/shazamio/schemas/artist/views/top_song.py b/lib/ShazamIO/shazamio/schemas/artist/views/top_song.py index 8b0e135..a22ec60 100644 --- a/lib/ShazamIO/shazamio/schemas/artist/views/top_song.py +++ b/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 diff --git a/lib/ShazamIO/shazamio/schemas/artists.py b/lib/ShazamIO/shazamio/schemas/artists.py index b76a8c8..ab7a08d 100644 --- a/lib/ShazamIO/shazamio/schemas/artists.py +++ b/lib/ShazamIO/shazamio/schemas/artists.py @@ -1,20 +1,14 @@ -from dataclasses import dataclass -from dataclasses import field -from typing import List -from typing import Optional -from typing import Union - -from pydantic import BaseModel -from pydantic import Field +from dataclasses import dataclass, field +from typing import List, Optional, Union +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 ArtistView +from shazamio.schemas.enums import ArtistExtend, ArtistView from shazamio.schemas.errors import ErrorModel diff --git a/lib/ShazamIO/shazamio/schemas/attributes.py b/lib/ShazamIO/shazamio/schemas/attributes.py index c278cc6..55718f1 100644 --- a/lib/ShazamIO/shazamio/schemas/attributes.py +++ b/lib/ShazamIO/shazamio/schemas/attributes.py @@ -1,8 +1,6 @@ -from typing import List -from typing import Optional +from typing import List, Optional -from pydantic import BaseModel -from pydantic import Field +from pydantic import BaseModel, Field class AttributeName(BaseModel): diff --git a/lib/ShazamIO/shazamio/schemas/base.py b/lib/ShazamIO/shazamio/schemas/base.py index 7347a2b..13b6795 100644 --- a/lib/ShazamIO/shazamio/schemas/base.py +++ b/lib/ShazamIO/shazamio/schemas/base.py @@ -1,11 +1,8 @@ -from typing import Generic -from typing import Optional -from typing import TypeVar +from typing import Generic, Optional, TypeVar from pydantic import BaseModel from pydantic.generics import GenericModel - T = TypeVar("T", bound=BaseModel) diff --git a/lib/ShazamIO/shazamio/schemas/models.py b/lib/ShazamIO/shazamio/schemas/models.py index af8745b..2ed24ab 100644 --- a/lib/ShazamIO/shazamio/schemas/models.py +++ b/lib/ShazamIO/shazamio/schemas/models.py @@ -1,11 +1,6 @@ -from dataclasses import dataclass -from dataclasses import field -from typing import List -from typing import Optional -from typing import Union -from urllib.parse import urlencode -from urllib.parse import urlparse -from urllib.parse import urlunparse +from dataclasses import dataclass, field +from typing import List, Optional, Union +from urllib.parse import urlencode, urlparse, urlunparse from uuid import UUID diff --git a/lib/ShazamIO/shazamio/schemas/photos.py b/lib/ShazamIO/shazamio/schemas/photos.py index 94af3cd..5f331c9 100644 --- a/lib/ShazamIO/shazamio/schemas/photos.py +++ b/lib/ShazamIO/shazamio/schemas/photos.py @@ -1,7 +1,6 @@ from typing import Optional -from pydantic import BaseModel -from pydantic import Field +from pydantic import BaseModel, Field class ImageModel(BaseModel): diff --git a/lib/ShazamIO/shazamio/serializers.py b/lib/ShazamIO/shazamio/serializers.py index 094bcd9..c404113 100644 --- a/lib/ShazamIO/shazamio/serializers.py +++ b/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_TRACK -from shazamio.schemas.artists import ArtistInfo -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 +from shazamio.factory_misc import FACTORY_ARTIST, FACTORY_TRACK +from shazamio.schemas.artists import ArtistInfo, ArtistResponse, ArtistV2 +from shazamio.schemas.models import ResponseTrack, TrackInfo, YoutubeData class Serialize: diff --git a/lib/ShazamIO/shazamio/signature.py b/lib/ShazamIO/shazamio/signature.py index b918ef2..4d594fd 100644 --- a/lib/ShazamIO/shazamio/signature.py +++ b/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," diff --git a/lib/ShazamIO/shazamio/utils.py b/lib/ShazamIO/shazamio/utils.py index bfc5c79..d0d2898 100644 --- a/lib/ShazamIO/shazamio/utils.py +++ b/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 List -from typing import Optional -from typing import Union +from typing import Dict, List, Optional, Union import aiofiles import aiohttp from aiohttp import ContentTypeError from pydub import AudioSegment - from shazamio.exceptions import FailedDecodeJson from shazamio.schemas.artists import ArtistQuery