From 26a527473f666df5ef3eab26b62bd1cc971c3ac4 Mon Sep 17 00:00:00 2001 From: Untone Date: Tue, 12 Mar 2024 15:26:36 +0300 Subject: [PATCH] use-cached-authors --- resolvers/author.py | 14 +++++++------- resolvers/stat.py | 17 +++++++++++++++++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/resolvers/author.py b/resolvers/author.py index 6992636a..b16c3817 100644 --- a/resolvers/author.py +++ b/resolvers/author.py @@ -9,7 +9,7 @@ from sqlalchemy_searchable import search from orm.author import Author, AuthorFollower from orm.shout import ShoutAuthor, ShoutTopic from orm.topic import Topic -from resolvers.stat import get_with_stat, author_follows_authors, author_follows_topics +from resolvers.stat import get_authors_with_stat_cached, author_follows_authors, author_follows_topics from services.cache import set_author_cache, update_author_followers_cache from services.auth import login_required from services.db import local_session @@ -44,7 +44,7 @@ async def get_author(_, _info, slug='', author_id=None): try: if slug: q = select(Author).select_from(Author).filter(Author.slug == slug) - result = get_with_stat(q) + result = get_authors_with_stat_cached(q) if result: [author] = result author_id = author.id @@ -57,7 +57,7 @@ async def get_author(_, _info, slug='', author_id=None): if cache: author_dict = json.loads(cache) else: - result = get_with_stat(q) + result = get_authors_with_stat_cached(q) if result: [author] = result author_dict = author.dict() @@ -90,7 +90,7 @@ async def get_author_by_user_id(user_id: str): return author q = select(Author).filter(Author.user == user_id) - result = get_with_stat(q) + result = get_authors_with_stat_cached(q) if result: [author] = result await set_author_cache(author.dict()) @@ -137,7 +137,7 @@ def load_authors_by(_, _info, by, limit, offset): # q = q.distinct() q = q.limit(limit).offset(offset) - authors = get_with_stat(q) + authors = get_authors_with_stat_cached(q) return authors @@ -266,7 +266,7 @@ async def get_author_followers(_, _info, slug: str): author_follower_alias.follower == Author.id, ), ) - results = get_with_stat(q) + results = get_authors_with_stat_cached(q) _ = asyncio.create_task( update_author_followers_cache( author_id, [x.dict() for x in results] @@ -288,4 +288,4 @@ async def get_author_followers(_, _info, slug: str): @query.field('search_authors') def search_authors(_, _info, what: str): q = search(select(Author), what) - return get_with_stat(q) + return get_authors_with_stat_cached(q) diff --git a/resolvers/stat.py b/resolvers/stat.py index adf97897..123504e6 100644 --- a/resolvers/stat.py +++ b/resolvers/stat.py @@ -1,3 +1,5 @@ +import json + from sqlalchemy import func, distinct, select, join, and_, case, true, cast, Integer from sqlalchemy.orm import aliased @@ -7,6 +9,7 @@ from services.db import local_session from orm.author import AuthorFollower, Author, AuthorRating from orm.shout import ShoutTopic, ShoutAuthor, Shout from services.logger import root_logger as logger +from services.rediscache import redis def add_topic_stat_columns(q): @@ -196,6 +199,20 @@ def get_with_stat(q): return records +async def get_authors_with_stat_cached(q): + try: + records = [] + with local_session() as session: + for x in session.execute(q): + stat_str = await redis.execute('GET', f'id:{x.id}:{'author'}') + if isinstance(stat_str, str): + x.stat = json.loads(stat_str).get('stat') + records.append(x) + except Exception as exc: + raise Exception(exc) + return records + + def author_follows_authors(author_id: int): af = aliased(AuthorFollower, name="af") q = (