From 7c85f514366601807ed94f56efbe2ce30c5888ee Mon Sep 17 00:00:00 2001 From: Untone Date: Thu, 16 Jan 2025 06:42:12 +0300 Subject: [PATCH] invcache-fix5 --- cache/cache.py | 60 +++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/cache/cache.py b/cache/cache.py index 93a4c26f..ff0312e6 100644 --- a/cache/cache.py +++ b/cache/cache.py @@ -37,8 +37,8 @@ CACHE_KEYS = { async def cache_topic(topic: dict): payload = json.dumps(topic, cls=CustomJSONEncoder) await asyncio.gather( - redis.execute("SET", CACHE_KEYS['TOPIC_ID'].format(topic['id']), payload), - redis.execute("SET", CACHE_KEYS['TOPIC_SLUG'].format(topic['slug']), payload), + redis_operation('SET', f"topic:id:{topic['id']}", payload), + redis_operation('SET', f"topic:slug:{topic['slug']}", payload), ) @@ -46,29 +46,29 @@ async def cache_topic(topic: dict): async def cache_author(author: dict): payload = json.dumps(author, cls=CustomJSONEncoder) await asyncio.gather( - redis.execute("SET", CACHE_KEYS['AUTHOR_USER'].format(author['user'].strip()), str(author["id"])), - redis.execute("SET", CACHE_KEYS['AUTHOR_ID'].format(author['id']), payload), + redis_operation('SET', f"author:user:{author['user'].strip()}", str(author["id"])), + redis_operation('SET', f"author:id:{author['id']}", payload), ) # Cache follows data async def cache_follows(follower_id: int, entity_type: str, entity_id: int, is_insert=True): key = f"author:follows-{entity_type}s:{follower_id}" - follows_str = await redis.execute("get", key) + follows_str = await redis_operation('GET', key) follows = json.loads(follows_str) if follows_str else DEFAULT_FOLLOWS[entity_type] if is_insert: if entity_id not in follows: follows.append(entity_id) else: follows = [eid for eid in follows if eid != entity_id] - await redis.execute("set", key, json.dumps(follows, cls=CustomJSONEncoder)) + await redis_operation('SET', key, json.dumps(follows, cls=CustomJSONEncoder)) await update_follower_stat(follower_id, entity_type, len(follows)) # Update follower statistics async def update_follower_stat(follower_id, entity_type, count): follower_key = f"author:id:{follower_id}" - follower_str = await redis.execute("get", follower_key) + follower_str = await redis_operation('GET', follower_key) follower = json.loads(follower_str) if follower_str else None if follower: follower["stat"] = {f"{entity_type}s": count} @@ -78,7 +78,7 @@ async def update_follower_stat(follower_id, entity_type, count): # Get author from cache async def get_cached_author(author_id: int, get_with_stat): author_key = f"author:id:{author_id}" - result = await redis.execute("get", author_key) + result = await redis_operation('GET', author_key) if result: return json.loads(result) # Load from database if not found in cache @@ -103,7 +103,7 @@ async def get_cached_topic(topic_id: int): dict: Topic data or None if not found. """ topic_key = f"topic:id:{topic_id}" - cached_topic = await redis.execute("get", topic_key) + cached_topic = await redis_operation('GET', topic_key) if cached_topic: return json.loads(cached_topic) @@ -112,7 +112,7 @@ async def get_cached_topic(topic_id: int): topic = session.execute(select(Topic).where(Topic.id == topic_id)).scalar_one_or_none() if topic: topic_dict = topic.dict() - await redis.execute("set", topic_key, json.dumps(topic_dict, cls=CustomJSONEncoder)) + await redis_operation('SET', topic_key, json.dumps(topic_dict, cls=CustomJSONEncoder)) return topic_dict return None @@ -121,7 +121,7 @@ async def get_cached_topic(topic_id: int): # Get topic by slug from cache async def get_cached_topic_by_slug(slug: str, get_with_stat): topic_key = f"topic:slug:{slug}" - result = await redis.execute("get", topic_key) + result = await redis_operation('GET', topic_key) if result: return json.loads(result) # Load from database if not found in cache @@ -138,7 +138,7 @@ async def get_cached_topic_by_slug(slug: str, get_with_stat): async def get_cached_authors_by_ids(author_ids: List[int]) -> List[dict]: # Fetch all author data concurrently keys = [f"author:id:{author_id}" for author_id in author_ids] - results = await asyncio.gather(*(redis.execute("get", key) for key in keys)) + results = await asyncio.gather(*(redis_operation('GET', key) for key in keys)) authors = [json.loads(result) if result else None for result in results] # Load missing authors from database and cache missing_indices = [index for index, author in enumerate(authors) if author is None] @@ -163,7 +163,7 @@ async def get_cached_topic_followers(topic_id: int): """ try: # Попытка получить данные из кеша - cached = await redis.get(f"topic:followers:{topic_id}") + cached = await redis_operation('GET', f"topic:followers:{topic_id}") if cached: followers_ids = json.loads(cached) logger.debug(f"Cached {len(followers_ids)} followers for topic #{topic_id}") @@ -180,7 +180,7 @@ async def get_cached_topic_followers(topic_id: int): followers_ids = [f[0] for f in result.scalars().all()] # Кеширование результатов - await redis.set(f"topic:followers:{topic_id}", json.dumps(followers_ids)) + await redis_operation('SET', f"topic:followers:{topic_id}", json.dumps(followers_ids)) # Получение подробной информации о подписчиках по их ID followers = await get_cached_authors_by_ids(followers_ids) @@ -194,7 +194,7 @@ async def get_cached_topic_followers(topic_id: int): # Get cached author followers async def get_cached_author_followers(author_id: int): # Check cache for data - cached = await redis.execute("get", f"author:followers:{author_id}") + cached = await redis_operation('GET', f"author:followers:{author_id}") if cached: followers_ids = json.loads(cached) followers = await get_cached_authors_by_ids(followers_ids) @@ -210,7 +210,7 @@ async def get_cached_author_followers(author_id: int): .filter(AuthorFollower.author == author_id, Author.id != author_id) .all() ] - await redis.execute("SET", f"author:followers:{author_id}", json.dumps(followers_ids)) + await redis_operation('SET', f"author:followers:{author_id}", json.dumps(followers_ids)) followers = await get_cached_authors_by_ids(followers_ids) return followers @@ -218,7 +218,7 @@ async def get_cached_author_followers(author_id: int): # Get cached follower authors async def get_cached_follower_authors(author_id: int): # Attempt to retrieve authors from cache - cached = await redis.execute("get", f"author:follows-authors:{author_id}") + cached = await redis_operation('GET', f"author:follows-authors:{author_id}") if cached: authors_ids = json.loads(cached) else: @@ -232,7 +232,7 @@ async def get_cached_follower_authors(author_id: int): .where(AuthorFollower.follower == author_id) ).all() ] - await redis.execute("SET", f"author:follows-authors:{author_id}", json.dumps(authors_ids)) + await redis_operation('SET', f"author:follows-authors:{author_id}", json.dumps(authors_ids)) authors = await get_cached_authors_by_ids(authors_ids) return authors @@ -241,7 +241,7 @@ async def get_cached_follower_authors(author_id: int): # Get cached follower topics async def get_cached_follower_topics(author_id: int): # Attempt to retrieve topics from cache - cached = await redis.execute("get", f"author:follows-topics:{author_id}") + cached = await redis_operation('GET', f"author:follows-topics:{author_id}") if cached: topics_ids = json.loads(cached) else: @@ -254,11 +254,11 @@ async def get_cached_follower_topics(author_id: int): .where(TopicFollower.follower == author_id) .all() ] - await redis.execute("SET", f"author:follows-topics:{author_id}", json.dumps(topics_ids)) + await redis_operation('SET', f"author:follows-topics:{author_id}", json.dumps(topics_ids)) topics = [] for topic_id in topics_ids: - topic_str = await redis.execute("get", f"topic:id:{topic_id}") + topic_str = await redis_operation('GET', f"topic:id:{topic_id}") if topic_str: topic = json.loads(topic_str) if topic and topic not in topics: @@ -280,10 +280,10 @@ async def get_cached_author_by_user_id(user_id: str, get_with_stat): dict: Dictionary with author data or None if not found. """ # Attempt to find author ID by user_id in Redis cache - author_id = await redis.execute("get", f"author:user:{user_id.strip()}") + author_id = await redis_operation('GET', f"author:user:{user_id.strip()}") if author_id: # If ID is found, get full author data by ID - author_data = await redis.execute("get", f"author:id:{author_id}") + author_data = await redis_operation('GET', f"author:id:{author_id}") if author_data: return json.loads(author_data) @@ -295,8 +295,8 @@ async def get_cached_author_by_user_id(user_id: str, get_with_stat): author = authors[0] author_dict = author.dict() await asyncio.gather( - redis.execute("SET", f"author:user:{user_id.strip()}", str(author.id)), - redis.execute("SET", f"author:id:{author.id}", json.dumps(author_dict)), + redis_operation('SET', f"author:user:{user_id.strip()}", str(author.id)), + redis_operation('SET', f"author:id:{author.id}", json.dumps(author_dict)), ) return author_dict @@ -317,7 +317,7 @@ async def get_cached_topic_authors(topic_id: int): """ # Attempt to get a list of author IDs from cache rkey = f"topic:authors:{topic_id}" - cached_authors_ids = await redis.execute("get", rkey) + cached_authors_ids = await redis_operation('GET', rkey) if cached_authors_ids: authors_ids = json.loads(cached_authors_ids) else: @@ -331,7 +331,7 @@ async def get_cached_topic_authors(topic_id: int): ) authors_ids = [author_id for (author_id,) in session.execute(query).all()] # Cache the retrieved author IDs - await redis.execute("set", rkey, json.dumps(authors_ids)) + await redis_operation('SET', rkey, json.dumps(authors_ids)) # Retrieve full author details from cached IDs if authors_ids: @@ -358,13 +358,13 @@ async def cache_topic_shouts(topic_id: int, shouts: List[dict]): """Кэширует список публикаций для темы""" key = f"topic_shouts_{topic_id}" payload = json.dumps(shouts, cls=CustomJSONEncoder) - await redis.execute("SETEX", key, CACHE_TTL, payload) + await redis_operation('SETEX', key, value=payload, ttl=CACHE_TTL) async def get_cached_topic_shouts(topic_id: int) -> List[dict]: """Получает кэшированный список публикаций для темы""" key = f"topic_shouts_{topic_id}" - cached = await redis.execute("GET", key) + cached = await redis_operation('GET', key) if cached: return json.loads(cached) return None @@ -435,7 +435,7 @@ async def get_cached_entity(entity_type: str, entity_id: int, get_method, cache_ cache_method: метод кэширования """ key = f"{entity_type}:id:{entity_id}" - cached = await redis.execute("GET", key) + cached = await redis_operation('GET', key) if cached: return json.loads(cached)