outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add secondary sort_key when using order_by and paginate at the same time (#7225)

Browse Source
This commit is contained in:
feng0 2024-08-13 17:39:51 +08:00 committed by GitHub
parent 986fd5bfc6
commit 2fe2e350ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/controllers/console/datasets/datasets_document.py
View File

@ -178,11 +178,20 @@ class DatasetDocumentListApi(Resource):
.subquery() .subquery()
query = query.outerjoin(sub_query, sub_query.c.document_id == Document.id) \ query = query.outerjoin(sub_query, sub_query.c.document_id == Document.id) \
.order_by(sort_logic(db.func.coalesce(sub_query.c.total_hit_count, 0))) .order_by(
sort_logic(db.func.coalesce(sub_query.c.total_hit_count, 0)),
sort_logic(Document.position),
)
elif sort == 'created_at': elif sort == 'created_at':
query = query.order_by(sort_logic(Document.created_at)) query = query.order_by(
sort_logic(Document.created_at),
sort_logic(Document.position),
)
else: else:
query = query.order_by(desc(Document.created_at)) query = query.order_by(
desc(Document.created_at),
desc(Document.position),
)
paginated_documents = query.paginate( paginated_documents = query.paginate(
page=page, per_page=limit, max_per_page=100, error_out=False) page=page, per_page=limit, max_per_page=100, error_out=False)