AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-14 01:36:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: keywords (#7357)

Browse Source
This commit is contained in:
crazywoola 2024-08-16 20:43:55 +08:00 committed by GitHub
parent 3a33062405
commit 4d4af00399
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/controllers/service_api/dataset/segment.py
View File

@ -53,19 +53,22 @@ class SegmentApi(DatasetApiResource):
raise ProviderNotInitializeError( raise ProviderNotInitializeError(
"No Embedding Model available. Please configure a valid provider " "No Embedding Model available. Please configure a valid provider "
"in the Settings -> Model Provider.") "in the Settings -> Model Provider.")
except ProviderTokenNotInitError as ex: except ProviderTokenNotInitError as ex:
raise ProviderNotInitializeError(ex.description) raise ProviderNotInitializeError(ex.description)
# validate args # validate args
parser = reqparse.RequestParser() parser = reqparse.RequestParser()
parser.add_argument('segments', type=list, required=False, nullable=True, location='json') parser.add_argument('segments', type=list, required=False, nullable=True, location='json')
args = parser.parse_args() args = parser.parse_args()
for args_item in args['segments']: if args['segments'] is not None:
SegmentService.segment_create_args_validate(args_item, document) for args_item in args['segments']:
segments = SegmentService.multi_create_segment(args['segments'], document, dataset) SegmentService.segment_create_args_validate(args_item, document)
return { segments = SegmentService.multi_create_segment(args['segments'], document, dataset)
'data': marshal(segments, segment_fields), return {
'doc_form': document.doc_form 'data': marshal(segments, segment_fields),
}, 200 'doc_form': document.doc_form
}, 200
else:
return {"error": "Segemtns is required"}, 400
def get(self, tenant_id, dataset_id, document_id): def get(self, tenant_id, dataset_id, document_id):
"""Create single segment.""" """Create single segment."""

7
api/services/dataset_service.py
View File

@ -1429,7 +1429,10 @@ class SegmentService:
segment_data_list.append(segment_document) segment_data_list.append(segment_document)
pre_segment_data_list.append(segment_document) pre_segment_data_list.append(segment_document)
keywords_list.append(segment_item['keywords']) if 'keywords' in segment_item:
keywords_list.append(segment_item['keywords'])
else:
keywords_list.append(None)
try: try:
# save vector index # save vector index
@ -1482,7 +1485,7 @@ class SegmentService:
db.session.add(segment) db.session.add(segment)
db.session.commit() db.session.commit()
# update segment index task # update segment index task
if args['keywords']: if 'keywords' in args:
keyword = Keyword(dataset) keyword = Keyword(dataset)
keyword.delete_by_ids([segment.index_node_id]) keyword.delete_by_ids([segment.index_node_id])
document = RAGDocument( document = RAGDocument(