codey/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reparations

Browse Source
This commit is contained in:
codey 2025-01-18 14:46:05 -05:00
parent d7fef03f1b
commit bfe09e8afc
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lyric_search_new/sources/cache.py
View File

@ -50,7 +50,7 @@ class Cache:
artist=row['artist'], artist=row['artist'],
song=row['song'], song=row['song'],
lyrics=row['lyrics'], lyrics=row['lyrics'],
src=f"{row['src']} (redis cache, id: {row['id']})", src=f"{row['src']} (redis cache, id: {key})",
confidence=row['confidence'] confidence=row['confidence']
) )
else: else:
@ -171,21 +171,21 @@ class Cache:
else: else:
best_match = (result_tracks[0], 100) best_match = (result_tracks[0], 100)
if not best_match:
return None
(candidate, confidence) = best_match if best_match:
matched = self.get_matched(redis_results=redis_result, matched_candidate=candidate, (candidate, confidence) = best_match
matched = self.get_matched(redis_results=redis_result, matched_candidate=candidate,
confidence=confidence) confidence=confidence)
time_end: float = time.time()
time_diff: float = time_end - time_start
matched.confidence = confidence
matched.time = time_diff
if matched: if matched:
logging.info("Found %s on redis cache, skipping SQLite...", time_end: float = time.time()
f"{artist} - {song}") time_diff: float = time_end - time_start
return matched matched.confidence = confidence
matched.time = time_diff
logging.info("Found %s on redis cache, skipping SQLite...",
f"{artist} - {song}")
return matched
"""SQLite: Fallback""" """SQLite: Fallback"""

8
lyric_search_new/sources/redis_cache.py
View File

@ -65,12 +65,16 @@ class RedisCache:
search_res = await self.redis_client.ft().search( search_res = await self.redis_client.ft().search(
Query(f"@artist:{artist} @song:{song}" Query(f"@artist:{artist} @song:{song}"
)) ))
search_res_out = [(result['id'], dict(json.loads(result['json']))) search_res_out = [(result['id'].split(":",
maxsplit=1)[1][:-1], dict(json.loads(result['json'])))
for result in search_res.docs] for result in search_res.docs]
else: else:
random_redis_key = await self.redis_client.randomkey() random_redis_key = await self.redis_client.randomkey()
out_id = str(random_redis_key).split(":",
maxsplit=1)[1][:-1]
search_res = await self.redis_client.json().get(random_redis_key) search_res = await self.redis_client.json().get(random_redis_key)
search_res_out = [(random_redis_key, search_res)] search_res_out = [(out_id, search_res)]
return search_res_out return search_res_out
except: except: