diff --git a/apps/chat/chat_pipeline/step/search_dataset_step/impl/base_search_dataset_step.py b/apps/chat/chat_pipeline/step/search_dataset_step/impl/base_search_dataset_step.py index 6591f6d24..ff5106e20 100644 --- a/apps/chat/chat_pipeline/step/search_dataset_step/impl/base_search_dataset_step.py +++ b/apps/chat/chat_pipeline/step/search_dataset_step/impl/base_search_dataset_step.py @@ -37,11 +37,11 @@ def get_model_by_id(_id, user_id): def get_embedding_id(dataset_id_list): dataset_list = QuerySet(DataSet).filter(id__in=dataset_id_list) - if len(set([dataset.embedding_mode_id for dataset in dataset_list])) > 1: + if len(set([dataset.embedding_model_id for dataset in dataset_list])) > 1: raise Exception(_("The vector model of the associated knowledge base is inconsistent and the segmentation cannot be recalled.")) if len(dataset_list) == 0: raise Exception(_("The knowledge base setting is wrong, please reset the knowledge base")) - return dataset_list[0].embedding_mode_id + return dataset_list[0].embedding_model_id class BaseSearchDatasetStep(ISearchDatasetStep): diff --git a/apps/chat/flow/step_node/search_dataset_node/impl/base_search_dataset_node.py b/apps/chat/flow/step_node/search_dataset_node/impl/base_search_dataset_node.py index 2859d135f..fde6bf775 100644 --- a/apps/chat/flow/step_node/search_dataset_node/impl/base_search_dataset_node.py +++ b/apps/chat/flow/step_node/search_dataset_node/impl/base_search_dataset_node.py @@ -26,11 +26,11 @@ SearchMode = None def get_embedding_id(dataset_id_list): dataset_list = QuerySet(Knowledge).filter(id__in=dataset_id_list) - if len(set([dataset.embedding_mode_id for dataset in dataset_list])) > 1: + if len(set([dataset.embedding_model_id for dataset in dataset_list])) > 1: raise Exception("关联知识库的向量模型不一致，无法召回分段。") if len(dataset_list) == 0: raise Exception("知识库设置错误,请重新设置知识库") - return dataset_list[0].embedding_mode_id + return dataset_list[0].embedding_model_id def get_none_result(question): diff --git a/apps/knowledge/serializers/document.py b/apps/knowledge/serializers/document.py index c62a2ef67..35e84c5e2 100644 --- a/apps/knowledge/serializers/document.py +++ b/apps/knowledge/serializers/document.py @@ -236,6 +236,7 @@ class DocumentSerializers(serializers.Serializer): os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_document.sql'))) def page(self, current_page, page_size): + self.is_valid(raise_exception=True) query_set = self.get_query_set() return native_page_search(current_page, page_size, query_set, select_string=get_file_content( os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_document.sql'))) diff --git a/apps/knowledge/serializers/knowledge.py b/apps/knowledge/serializers/knowledge.py index aa73f78a7..cb07ef8c0 100644 --- a/apps/knowledge/serializers/knowledge.py +++ b/apps/knowledge/serializers/knowledge.py @@ -180,7 +180,7 @@ class KnowledgeSerializer(serializers.Serializer): self.is_valid(raise_exception=True) knowledge_id = self.data.get('knowledge_id') knowledge = QuerySet(Knowledge).filter(id=knowledge_id).first() - embedding_model_id = knowledge.embedding_mode_id + embedding_model_id = knowledge.embedding_model_id knowledge_user_id = knowledge.user_id embedding_model = QuerySet(Model).filter(id=embedding_model_id).first() if embedding_model is None: diff --git a/apps/models_provider/serializers/model_serializer.py b/apps/models_provider/serializers/model_serializer.py index ed070ce5d..a84d8db90 100644 --- a/apps/models_provider/serializers/model_serializer.py +++ b/apps/models_provider/serializers/model_serializer.py @@ -155,7 +155,7 @@ class ModelSerializer(serializers.Serializer): # if application_count > 0: # raise AppApiException(500, f"该模型关联了{application_count} 个应用，无法删除该模型。") # elif model.model_type == 'EMBEDDING': - # dataset_count = DataSet.objects.filter(embedding_mode_id=model_id).count() + # dataset_count = DataSet.objects.filter(embedding_model_id=model_id).count() # if dataset_count > 0: # raise AppApiException(500, f"该模型关联了{dataset_count} 个知识库，无法删除该模型。") # elif model.model_type == 'TTS': diff --git a/ui/src/api/type/knowledge.ts b/ui/src/api/type/knowledge.ts index 8ba67fe87..29a22b2d9 100644 --- a/ui/src/api/type/knowledge.ts +++ b/ui/src/api/type/knowledge.ts @@ -3,7 +3,7 @@ interface knowledgeData { desc: String documents?: Array type?: String - embedding_mode_id?: String + embedding_model_id?: String } export type { knowledgeData } diff --git a/ui/src/views/knowledge/component/BaseForm.vue b/ui/src/views/knowledge/component/BaseForm.vue index 129c90458..0fcfa5470 100644 --- a/ui/src/views/knowledge/component/BaseForm.vue +++ b/ui/src/views/knowledge/component/BaseForm.vue @@ -32,10 +32,10 @@ ({ name: '', desc: '', - embedding_mode_id: '' + embedding_model_id: '' }) const rules = reactive({ @@ -78,7 +78,7 @@ const rules = reactive({ trigger: 'blur' } ], - embedding_mode_id: [ + embedding_model_id: [ { required: true, message: t('views.dataset.datasetForm.form.EmbeddingModel.requiredMessage'), @@ -97,7 +97,7 @@ watch( if (value && JSON.stringify(value) !== '{}') { form.value.name = value.name form.value.desc = value.desc - form.value.embedding_mode_id = value.embedding_mode_id + form.value.embedding_model_id = value.embedding_model_id } }, { @@ -134,7 +134,7 @@ onUnmounted(() => { form.value = { name: '', desc: '', - embedding_mode_id: '' + embedding_model_id: '' } FormRef.value?.clearValidate() })