diff --git a/base.py b/base.py index 8ea5720..4812d59 100644 --- a/base.py +++ b/base.py @@ -6,7 +6,7 @@ import asyncio from typing import Any from fastapi import FastAPI, Request from fastapi.middleware.cors import CORSMiddleware -from lyric_search_new.sources import redis_cache +from lyric_search.sources import redis_cache logger = logging.getLogger() diff --git a/endpoints/lyric_search.py b/endpoints/lyric_search.py index 143a9b6..1dbf71b 100644 --- a/endpoints/lyric_search.py +++ b/endpoints/lyric_search.py @@ -12,8 +12,8 @@ import aiohttp import aiosqlite as sqlite3 from fastapi import FastAPI, HTTPException from pydantic import BaseModel -from lyric_search_new.sources import aggregate -from lyric_search_new import notifier +from lyric_search.sources import aggregate +from lyric_search import notifier class ValidLyricRequest(BaseModel): diff --git a/endpoints/misc.py b/endpoints/misc.py index 64288c6..4bb6326 100644 --- a/endpoints/misc.py +++ b/endpoints/misc.py @@ -11,7 +11,7 @@ from redis.commands.search.query import Query from redis.commands.search.indexDefinition import IndexDefinition, IndexType from redis.commands.search.field import TextField, TagField from redis.commands.json.path import Path -from lyric_search_new.sources import private, cache as LyricsCache, redis_cache +from lyric_search.sources import private, cache as LyricsCache, redis_cache class Misc(FastAPI): """Misc Endpoints""" diff --git a/lyric_search_new/__init__.py b/lyric_search/__init__.py similarity index 100% rename from lyric_search_new/__init__.py rename to lyric_search/__init__.py diff --git a/lyric_search_new/constructors.py b/lyric_search/constructors.py similarity index 100% rename from lyric_search_new/constructors.py rename to lyric_search/constructors.py diff --git a/lyric_search_new/sources/__init__.py b/lyric_search/sources/__init__.py similarity index 100% rename from lyric_search_new/sources/__init__.py rename to lyric_search/sources/__init__.py diff --git a/lyric_search_new/sources/aggregate.py b/lyric_search/sources/aggregate.py similarity index 96% rename from lyric_search_new/sources/aggregate.py rename to lyric_search/sources/aggregate.py index d9a08a8..2d9d822 100644 --- a/lyric_search_new/sources/aggregate.py +++ b/lyric_search/sources/aggregate.py @@ -2,8 +2,8 @@ # pylint: disable=wrong-import-order, wrong-import-position from typing import Optional -from lyric_search_new.constructors import LyricsResult -from lyric_search_new import notifier +from lyric_search.constructors import LyricsResult +from lyric_search import notifier import sys import logging import traceback diff --git a/lyric_search_new/sources/cache.py b/lyric_search/sources/cache.py similarity index 99% rename from lyric_search_new/sources/cache.py rename to lyric_search/sources/cache.py index 39b3b06..6ba4667 100644 --- a/lyric_search_new/sources/cache.py +++ b/lyric_search/sources/cache.py @@ -12,8 +12,8 @@ sys.path.insert(1,'.') from typing import Optional, Any import aiosqlite as sqlite3 from . import redis_cache -from lyric_search_new import utils, notifier -from lyric_search_new.constructors import LyricsResult +from lyric_search import utils, notifier +from lyric_search.constructors import LyricsResult diff --git a/lyric_search_new/sources/common.py b/lyric_search/sources/common.py similarity index 100% rename from lyric_search_new/sources/common.py rename to lyric_search/sources/common.py diff --git a/lyric_search_new/sources/genius.py b/lyric_search/sources/genius.py similarity index 98% rename from lyric_search_new/sources/genius.py rename to lyric_search/sources/genius.py index f7cf435..58d65cf 100644 --- a/lyric_search_new/sources/genius.py +++ b/lyric_search/sources/genius.py @@ -11,8 +11,8 @@ from aiohttp import ClientTimeout, ClientSession from bs4 import BeautifulSoup, ResultSet import html as htm from . import private, common, cache, redis_cache -from lyric_search_new import utils -from lyric_search_new.constructors import LyricsResult +from lyric_search import utils +from lyric_search.constructors import LyricsResult logger = logging.getLogger() diff --git a/lyric_search_new/sources/lrclib.py b/lyric_search/sources/lrclib.py similarity index 98% rename from lyric_search_new/sources/lrclib.py rename to lyric_search/sources/lrclib.py index c531530..28fcbf2 100644 --- a/lyric_search_new/sources/lrclib.py +++ b/lyric_search/sources/lrclib.py @@ -8,8 +8,8 @@ import traceback import logging from typing import Optional from aiohttp import ClientTimeout, ClientSession -from lyric_search_new import utils -from lyric_search_new.constructors import LyricsResult +from lyric_search import utils +from lyric_search.constructors import LyricsResult from . import common, cache, redis_cache logger = logging.getLogger() diff --git a/lyric_search_new/sources/redis_cache.py b/lyric_search/sources/redis_cache.py similarity index 98% rename from lyric_search_new/sources/redis_cache.py rename to lyric_search/sources/redis_cache.py index fbeae32..32e2dd0 100644 --- a/lyric_search_new/sources/redis_cache.py +++ b/lyric_search/sources/redis_cache.py @@ -10,8 +10,8 @@ import time import sys import regex sys.path.insert(1,'..') -from lyric_search_new import notifier -from lyric_search_new.constructors import LyricsResult +from lyric_search import notifier +from lyric_search.constructors import LyricsResult import redis.asyncio as redis from redis.commands.search.query import Query from redis.commands.search.indexDefinition import IndexDefinition, IndexType diff --git a/lyric_search_new/utils.py b/lyric_search/utils.py similarity index 100% rename from lyric_search_new/utils.py rename to lyric_search/utils.py