discours.io/core
5
0
Fork 0
Code Pull Requests Actions 1 Projects Activity

scored-subquery-fix

Browse Source
This commit is contained in:
Untone 2024-01-29 00:42:03 +03:00
parent 86f2c51f5a
commit f749ac7999
1 changed files with 24 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
resolvers/reader.py
View File

@ -1,7 +1,7 @@
import logging import logging
from sqlalchemy import bindparam, distinct, literal_column, or_ from sqlalchemy import bindparam, distinct, literal_column, or_
from sqlalchemy.orm import aliased, column_property, joinedload, selectinload from sqlalchemy.orm import aliased, joinedload, selectinload
from sqlalchemy.sql.expression import and_, asc, case, desc, func, nulls_last, select from sqlalchemy.sql.expression import and_, asc, case, desc, func, nulls_last, select
from starlette.exceptions import HTTPException from starlette.exceptions import HTTPException
@ -82,9 +82,7 @@ async def get_shout(_, _info, slug=None, shout_id=None):
'rating': int(likes_stat or 0) - int(dislikes_stat or 0), 'rating': int(likes_stat or 0) - int(dislikes_stat or 0),
} }
for author_caption in ( for author_caption in session.query(ShoutAuthor).join(Shout).where(Shout.slug == slug):
session.query(ShoutAuthor).join(Shout).where(Shout.slug == slug)
):
for author in shout.authors: for author in shout.authors:
if author.id == author_caption.author: if author.id == author_caption.author:
author.caption = author_caption.caption author.caption = author_caption.caption
@ -105,9 +103,7 @@ async def get_shout(_, _info, slug=None, shout_id=None):
shout.main_topic = main_topic[0] shout.main_topic = main_topic[0]
return shout return shout
except Exception: except Exception:
raise HTTPException( raise HTTPException(status_code=404, detail=f'shout {slug or shout_id} not found')
status_code=404, detail=f'shout {slug or shout_id} not found'
)
@query.field('load_shouts_by') @query.field('load_shouts_by')
@ -153,9 +149,7 @@ async def load_shouts_by(_, _info, options):
# order # order
order_by = options.get('order_by', Shout.published_at) order_by = options.get('order_by', Shout.published_at)
query_order_by = ( query_order_by = desc(order_by) if options.get('order_by_desc', True) else asc(order_by)
desc(order_by) if options.get('order_by_desc', True) else asc(order_by)
)
q = q.order_by(nulls_last(query_order_by)) q = q.order_by(nulls_last(query_order_by))
# limit offset # limit offset
@ -248,20 +242,15 @@ async def load_shouts_feed(_, info, options):
with local_session() as session: with local_session() as session:
reader = session.query(Author).filter(Author.user == user_id).first() reader = session.query(Author).filter(Author.user == user_id).first()
if reader: if reader:
reader_followed_authors = select(AuthorFollower.author).where( reader_followed_authors = select(AuthorFollower.author).where(AuthorFollower.follower == reader.id)
AuthorFollower.follower == reader.id reader_followed_topics = select(TopicFollower.topic).where(TopicFollower.follower == reader.id)
)
reader_followed_topics = select(TopicFollower.topic).where(
TopicFollower.follower == reader.id
)
subquery = ( subquery = (
select(Shout.id) select(Shout.id)
.where(Shout.id == ShoutAuthor.shout) .where(Shout.id == ShoutAuthor.shout)
.where(Shout.id == ShoutTopic.shout) .where(Shout.id == ShoutTopic.shout)
.where( .where(
(ShoutAuthor.author.in_(reader_followed_authors)) (ShoutAuthor.author.in_(reader_followed_authors)) | (ShoutTopic.topic.in_(reader_followed_topics))
| (ShoutTopic.topic.in_(reader_followed_topics))
) )
) )
@ -286,24 +275,15 @@ async def load_shouts_feed(_, info, options):
order_by = options.get('order_by', Shout.published_at) order_by = options.get('order_by', Shout.published_at)
query_order_by = ( query_order_by = desc(order_by) if options.get('order_by_desc', True) else asc(order_by)
desc(order_by) if options.get('order_by_desc', True) else asc(order_by)
)
offset = options.get('offset', 0) offset = options.get('offset', 0)
limit = options.get('limit', 10) limit = options.get('limit', 10)
q = ( q = q.group_by(Shout.id).order_by(nulls_last(query_order_by)).limit(limit).offset(offset)
q.group_by(Shout.id)
.order_by(nulls_last(query_order_by))
.limit(limit)
.offset(offset)
)
# print(q.compile(compile_kwargs={"literal_binds": True})) # print(q.compile(compile_kwargs={"literal_binds": True}))
for [shout, reacted_stat, commented_stat, _last_comment] in session.execute( for [shout, reacted_stat, commented_stat, _last_comment] in session.execute(q).unique():
q
).unique():
main_topic = ( main_topic = (
session.query(Topic.slug) session.query(Topic.slug)
.join( .join(
@ -336,13 +316,14 @@ async def load_shouts_search(_, _info, text, limit=50, offset=0):
results_dict = {r['slug']: r for r in results} results_dict = {r['slug']: r for r in results}
found_keys = list(results_dict.keys()) found_keys = list(results_dict.keys())
with local_session() as session: with local_session() as session:
# Define a virtual column 'score' using column_property subquery = (
Shout.score = column_property( select(
literal_column(f"({results_dict.get(Shout.slug, {}).get('score', 0)})") [
Shout,
literal_column(f"({results_dict.get(Shout.slug, {}).get('score', 0)})").label('score'),
]
) )
.select_from(Shout)
results = (
session.query(Shout)
.join(ShoutTopic, Shout.id == ShoutTopic.shout) .join(ShoutTopic, Shout.id == ShoutTopic.shout)
.options( .options(
joinedload(Shout.authors), joinedload(Shout.authors),
@ -354,11 +335,10 @@ async def load_shouts_search(_, _info, text, limit=50, offset=0):
Shout.slug.in_(found_keys), Shout.slug.in_(found_keys),
) )
) )
.order_by(desc(Shout.score)) # Order by the virtual 'score' column ).alias('scored_shouts')
.limit(limit)
.offset(offset) # Use the subquery in the main query
.all() results = session.query(subquery).order_by(desc(subquery.c.score)).limit(limit).offset(offset).all()
)
logger.debug(f'search found {len(results)} results') logger.debug(f'search found {len(results)} results')
@ -380,9 +360,7 @@ async def load_shouts_unrated(_, info, limit: int = 50, offset: int = 0):
and_( and_(
Reaction.shout == Shout.id, Reaction.shout == Shout.id,
Reaction.replyTo.is_(None), Reaction.replyTo.is_(None),
Reaction.kind.in_( Reaction.kind.in_([ReactionKind.LIKE.value, ReactionKind.DISLIKE.value]),
[ReactionKind.LIKE.value, ReactionKind.DISLIKE.value]
),
), ),
) )
.outerjoin(Author, Author.user == bindparam('user_id')) .outerjoin(Author, Author.user == bindparam('user_id'))
@ -451,9 +429,7 @@ async def load_shouts_random_top(_, _info, options):
aliased_reaction = aliased(Reaction) aliased_reaction = aliased(Reaction)
subquery = ( subquery = select(Shout.id).outerjoin(aliased_reaction).where(Shout.deleted_at.is_(None))
select(Shout.id).outerjoin(aliased_reaction).where(Shout.deleted_at.is_(None))
)
subquery = apply_filters(subquery, options.get('filters', {})) subquery = apply_filters(subquery, options.get('filters', {}))
subquery = subquery.group_by(Shout.id).order_by( subquery = subquery.group_by(Shout.id).order_by(