From dbaacf42a9782915381e8cb92125de15ed49401b Mon Sep 17 00:00:00 2001 From: codey Date: Sat, 18 Jan 2025 13:34:10 -0500 Subject: [PATCH] refactor --- lyric_search_new/sources/cache.py | 2 +- lyric_search_new/sources/redis_cache.py | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lyric_search_new/sources/cache.py b/lyric_search_new/sources/cache.py index c3e7eed..776e943 100644 --- a/lyric_search_new/sources/cache.py +++ b/lyric_search_new/sources/cache.py @@ -49,7 +49,7 @@ class Cache: artist=row['artist'], song=row['song'], lyrics=row['lyrics'], - src=f"{row['src']} (redis, id: {row['id']})", + src=f"{row['src']} (redis cache, id: {row['id']})", confidence=row['confidence'] ) else: diff --git a/lyric_search_new/sources/redis_cache.py b/lyric_search_new/sources/redis_cache.py index 4884a61..097cf5c 100644 --- a/lyric_search_new/sources/redis_cache.py +++ b/lyric_search_new/sources/redis_cache.py @@ -6,10 +6,9 @@ import logging import traceback import json import redis.asyncio as redis -from redis.commands.json.path import Path -from redis.commands.search.query import NumericFilter, Query +from redis.commands.search.query import Query from redis.commands.search.indexDefinition import IndexDefinition, IndexType -from redis.commands.search.field import TextField, NumericField, TagField +from redis.commands.search.field import TextField from . import private @@ -27,8 +26,7 @@ class RedisCache: """ def __init__(self): - self.redis_pw = private.REDIS_PW - self.redis_client = redis.Redis(password=self.redis_pw) + self.redis_client = redis.Redis(password=private.REDIS_PW) async def create_index(self): """Create Index""" @@ -39,10 +37,11 @@ class RedisCache: TextField("$.src", as_name="src"), TextField("$.lyrics", as_name="lyrics") ) - result = await self.redis_client.ft().create_index(schema, definition=IndexDefinition(prefix=["lyrics:"], index_type=IndexType.JSON)) + result = await self.redis_client.ft().create_index( + schema, definition=IndexDefinition(prefix=["lyrics:"], index_type=IndexType.JSON)) if str(result) != "OK": raise RedisException(f"Redis: Failed to create index: {result}") - except Exception as e: + except: pass async def search(self, **kwargs):