refactor: document segment query

pull/12372/head
Yeuoly 2 years ago
parent d36dece0af
commit 685e8cdc7d
No known key found for this signature in database
GPG Key ID: A66E7E320FB19F61

@ -170,9 +170,9 @@ class DatasetDocumentListApi(Resource):
raise Forbidden(str(e)) raise Forbidden(str(e))
with Session(db.engine) as session: with Session(db.engine) as session:
query = session.execute( query = session.query(Document).filter_by(
select(Document).filter_by(dataset_id=str(dataset_id), tenant_id=current_user.current_tenant_id) dataset_id=str(dataset_id), tenant_id=current_user.current_tenant_id
).all() )
if search: if search:
search = f"%{search}%" search = f"%{search}%"
@ -186,7 +186,9 @@ class DatasetDocumentListApi(Resource):
if sort == "hit_count": if sort == "hit_count":
sub_query = ( sub_query = (
db.select(DocumentSegment.document_id, db.func.sum(DocumentSegment.hit_count).label("total_hit_count")) db.select(
DocumentSegment.document_id, db.func.sum(DocumentSegment.hit_count).label("total_hit_count")
)
.group_by(DocumentSegment.document_id) .group_by(DocumentSegment.document_id)
.subquery() .subquery()
) )
@ -209,7 +211,6 @@ class DatasetDocumentListApi(Resource):
paginated_documents = query.paginate(page=page, per_page=limit, max_per_page=100, error_out=False) paginated_documents = query.paginate(page=page, per_page=limit, max_per_page=100, error_out=False)
documents = paginated_documents.items documents = paginated_documents.items
if fetch: if fetch:
with Session(db.engine) as session:
for document in documents: for document in documents:
completed_segments = ( completed_segments = (
session.query(DocumentSegment) session.query(DocumentSegment)

Loading…
Cancel
Save