suguo
/
dify
mirror of https://github.com/langgenius/dify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Add dataset_id filters to the hit_count's subqueries (#33757)

This commit is contained in:
FFXN 2026-03-20 10:21:45 +08:00
parent 12178e7aec
commit 1730f900c1
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ from contextlib import ExitStack
from typing import Any, Literal, cast from typing import Any, Literal, cast
from uuid import UUID from uuid import UUID
import sqlalchemy as sa
from flask import request, send_file from flask import request, send_file
from flask_restx import Resource, fields, marshal, marshal_with from flask_restx import Resource, fields, marshal, marshal_with
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
@ -294,23 +295,15 @@ class DatasetDocumentListApi(Resource):
sort_logic = asc sort_logic = asc
if sort == "hit_count": if sort == "hit_count":
# sub_query = ( sub_query = (
# sa.select(DocumentSegment.document_id, sa.select(DocumentSegment.document_id, sa.func.sum(DocumentSegment.hit_count).label("total_hit_count"))
# sa.func.sum(DocumentSegment.hit_count).label("total_hit_count")) .where(DocumentSegment.dataset_id == str(dataset_id))
# .group_by(DocumentSegment.document_id) .group_by(DocumentSegment.document_id)
# .subquery() .subquery()
# ) )
# query = query.outerjoin(sub_query, sub_query.c.document_id == Document.id).order_by( query = query.outerjoin(sub_query, sub_query.c.document_id == Document.id).order_by(
# sort_logic(sa.func.coalesce(sub_query.c.total_hit_count, 0)), sort_logic(sa.func.coalesce(sub_query.c.total_hit_count, 0)),
# sort_logic(Document.position),
# )
# TODO: uncomment this when we have a way to get the hit count,
# currently we don't have a way to get the hit count,
# so we use the created_at to sort the documents.
query = query.order_by(
sort_logic(Document.created_at),
sort_logic(Document.position), sort_logic(Document.position),
) )
elif sort == "created_at": elif sort == "created_at":