Skip to content

fix: 修复应用关联知识库取消关联未删除关联关系 #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 3, 2024
Merged

fix: 修复应用关联知识库取消关联未删除关联关系 #698

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions apps/application/serializers/application_serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,13 +550,12 @@ def publish(self, instance, with_valid=True):
application.desc = node_data.get('desc')
application.prologue = node_data.get('prologue')
dataset_list = self.list_dataset(with_valid=False)
dataset_id_list = self.update_reverse_search_node(work_flow,
[str(dataset.get('id')) for dataset in dataset_list])

application_dataset_id_list = [str(dataset.get('id')) for dataset in dataset_list]
dataset_id_list = self.update_reverse_search_node(work_flow, application_dataset_id_list)
application.work_flow = work_flow
application.save()
# 插入知识库关联关系
self.save_application_mapping(dataset_id_list, application.id)
self.save_application_mapping(application_dataset_id_list, dataset_id_list, application.id)
work_flow_version = WorkFlowVersion(work_flow=work_flow, application=application)
work_flow_version.save()
return True
Expand Down Expand Up @@ -662,16 +661,16 @@ def edit(self, instance: Dict, with_valid=True):
if not application_dataset_id_list.__contains__(dataset_id):
raise AppApiException(500, f"未知的知识库id${dataset_id},无法关联")

self.save_application_mapping(application_dataset_id_list, application_id)
self.save_application_mapping(application_dataset_id_list, dataset_id_list, application_id)
chat_cache.clear_by_application_id(application_id)
return self.one(with_valid=False)

@staticmethod
def save_application_mapping(dataset_id_list, application_id):
def save_application_mapping(application_dataset_id_list, dataset_id_list, application_id):
# 需要排除已删除的数据集
dataset_id_list = [dataset.id for dataset in QuerySet(DataSet).filter(id__in=dataset_id_list)]
# 删除已经关联的id
QuerySet(ApplicationDatasetMapping).filter(dataset_id__in=dataset_id_list,
QuerySet(ApplicationDatasetMapping).filter(dataset_id__in=application_dataset_id_list,
application_id=application_id).delete()
# 插入
QuerySet(ApplicationDatasetMapping).bulk_create(
Expand Down