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

fix document could be None (#15818)

Browse Source
This commit is contained in:
Jyong 2025-03-14 16:40:01 +08:00 committed by GitHub
parent 10bd03611c
commit 84a866028a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/core/rag/datasource/retrieval_service.py
View File

@ -276,6 +276,8 @@ class RetrievalService:
continue continue
dataset_document = dataset_documents[document_id] dataset_document = dataset_documents[document_id]
if not dataset_document:
continue
if dataset_document.doc_form == IndexType.PARENT_CHILD_INDEX: if dataset_document.doc_form == IndexType.PARENT_CHILD_INDEX:
# Handle parent-child documents # Handle parent-child documents

5
api/core/rag/retrieval/dataset_retrieval.py
View File

@ -433,6 +433,7 @@ class DatasetRetrieval:
dataset_document = DatasetDocument.query.filter( dataset_document = DatasetDocument.query.filter(
DatasetDocument.id == document.metadata["document_id"] DatasetDocument.id == document.metadata["document_id"]
).first() ).first()
if dataset_document:
if dataset_document.doc_form == IndexType.PARENT_CHILD_INDEX: if dataset_document.doc_form == IndexType.PARENT_CHILD_INDEX:
child_chunk = ChildChunk.query.filter( child_chunk = ChildChunk.query.filter(
ChildChunk.index_node_id == document.metadata["doc_id"], ChildChunk.index_node_id == document.metadata["doc_id"],
@ -454,7 +455,9 @@ class DatasetRetrieval:
query = query.filter(DocumentSegment.dataset_id == document.metadata["dataset_id"]) query = query.filter(DocumentSegment.dataset_id == document.metadata["dataset_id"])
# add hit count to document segment # add hit count to document segment
query.update({DocumentSegment.hit_count: DocumentSegment.hit_count + 1}, synchronize_session=False) query.update(
{DocumentSegment.hit_count: DocumentSegment.hit_count + 1}, synchronize_session=False
)
db.session.commit() db.session.commit()