zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复【知识库】设置中关联应用未显示在高级编排中使用该知识库的应用 (#692)

Browse Source
This commit is contained in:
shaohuzhang1 2024-07-03 12:26:07 +08:00 committed by GitHub
parent 4ca4d2fa84
commit 171d1aaea0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/application/serializers/application_serializers.py
View File

@ -533,6 +533,7 @@ class ApplicationSerializer(serializers.Serializer):
QuerySet(Application).filter(id=self.data.get('application_id')).delete() QuerySet(Application).filter(id=self.data.get('application_id')).delete()
return True return True
@transaction.atomic
def publish(self, instance, with_valid=True): def publish(self, instance, with_valid=True):
if with_valid: if with_valid:
self.is_valid() self.is_valid()
@ -549,9 +550,12 @@ class ApplicationSerializer(serializers.Serializer):
application.desc = node_data.get('desc') application.desc = node_data.get('desc')
application.prologue = node_data.get('prologue') application.prologue = node_data.get('prologue')
dataset_list = self.list_dataset(with_valid=False) dataset_list = self.list_dataset(with_valid=False)
self.update_reverse_search_node(work_flow, [str(dataset.get('id')) for dataset in dataset_list]) dataset_id_list = self.update_reverse_search_node(work_flow,
[str(dataset.get('id')) for dataset in dataset_list])
application.work_flow = work_flow application.work_flow = work_flow
application.save() application.save()
# 插入知识库关联关系
self.save_application_mapping(dataset_id_list, application.id)
work_flow_version = WorkFlowVersion(work_flow=work_flow, application=application) work_flow_version = WorkFlowVersion(work_flow=work_flow, application=application)
work_flow_version.save() work_flow_version.save()
return True return True
@ -585,6 +589,7 @@ class ApplicationSerializer(serializers.Serializer):
def update_reverse_search_node(self, work_flow, user_dataset_id_list: List): def update_reverse_search_node(self, work_flow, user_dataset_id_list: List):
search_node_list = self.get_search_node(work_flow) search_node_list = self.get_search_node(work_flow)
dataset_id_list = []
for search_node in search_node_list: for search_node in search_node_list:
node_data = search_node.get('properties', {}).get('node_data', {}) node_data = search_node.get('properties', {}).get('node_data', {})
dataset_id_list = node_data.get('dataset_id_list', []) dataset_id_list = node_data.get('dataset_id_list', [])
@ -598,6 +603,8 @@ class ApplicationSerializer(serializers.Serializer):
source_dataset_id_list = list({*source_dataset_id_list, *dataset_id_list}) source_dataset_id_list = list({*source_dataset_id_list, *dataset_id_list})
node_data['source_dataset_id_list'] = [] node_data['source_dataset_id_list'] = []
node_data['dataset_id_list'] = source_dataset_id_list node_data['dataset_id_list'] = source_dataset_id_list
dataset_id_list = [*source_dataset_id_list, *dataset_id_list]
return list(set(dataset_id_list))
def profile(self, with_valid=True): def profile(self, with_valid=True):
if with_valid: if with_valid:
@ -611,6 +618,7 @@ class ApplicationSerializer(serializers.Serializer):
{**ApplicationSerializer.ApplicationModel(application).data, {**ApplicationSerializer.ApplicationModel(application).data,
'show_source': application_access_token.show_source}) 'show_source': application_access_token.show_source})
@transaction.atomic
def edit(self, instance: Dict, with_valid=True): def edit(self, instance: Dict, with_valid=True):
if with_valid: if with_valid:
self.is_valid() self.is_valid()
@ -653,16 +661,20 @@ class ApplicationSerializer(serializers.Serializer):
if not application_dataset_id_list.__contains__(dataset_id): if not application_dataset_id_list.__contains__(dataset_id):
raise AppApiException(500, f"未知的知识库id${dataset_id},无法关联") raise AppApiException(500, f"未知的知识库id${dataset_id},无法关联")
# 删除已经关联的id self.save_application_mapping(application_dataset_id_list, application_id)
QuerySet(ApplicationDatasetMapping).filter(dataset_id__in=application_dataset_id_list,
application_id=application_id).delete()
# 插入
QuerySet(ApplicationDatasetMapping).bulk_create(
[ApplicationDatasetMapping(application_id=application_id, dataset_id=dataset_id) for dataset_id in
dataset_id_list]) if len(dataset_id_list) > 0 else None
chat_cache.clear_by_application_id(application_id) chat_cache.clear_by_application_id(application_id)
return self.one(with_valid=False) return self.one(with_valid=False)
@staticmethod
def save_application_mapping(dataset_id_list, application_id):
# 删除已经关联的id
QuerySet(ApplicationDatasetMapping).filter(dataset_id__in=dataset_id_list,
application_id=application_id).delete()
# 插入
QuerySet(ApplicationDatasetMapping).bulk_create(
[ApplicationDatasetMapping(application_id=application_id, dataset_id=dataset_id) for dataset_id in
dataset_id_list]) if len(dataset_id_list) > 0 else None
def list_dataset(self, with_valid=True): def list_dataset(self, with_valid=True):
if with_valid: if with_valid:
self.is_valid(raise_exception=True) self.is_valid(raise_exception=True)