Skip to content

Commit 787da98

Browse files
committed
feat: rename embedding_mode_id to embedding_model_id across multiple files
1 parent 3ded909 commit 787da98

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

apps/chat/chat_pipeline/step/search_dataset_step/impl/base_search_dataset_step.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ def get_model_by_id(_id, user_id):
3737

3838
def get_embedding_id(dataset_id_list):
3939
dataset_list = QuerySet(DataSet).filter(id__in=dataset_id_list)
40-
if len(set([dataset.embedding_mode_id for dataset in dataset_list])) > 1:
40+
if len(set([dataset.embedding_model_id for dataset in dataset_list])) > 1:
4141
raise Exception(_("The vector model of the associated knowledge base is inconsistent and the segmentation cannot be recalled."))
4242
if len(dataset_list) == 0:
4343
raise Exception(_("The knowledge base setting is wrong, please reset the knowledge base"))
44-
return dataset_list[0].embedding_mode_id
44+
return dataset_list[0].embedding_model_id
4545

4646

4747
class BaseSearchDatasetStep(ISearchDatasetStep):

apps/chat/flow/step_node/search_dataset_node/impl/base_search_dataset_node.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
def get_embedding_id(dataset_id_list):
2828
dataset_list = QuerySet(Knowledge).filter(id__in=dataset_id_list)
29-
if len(set([dataset.embedding_mode_id for dataset in dataset_list])) > 1:
29+
if len(set([dataset.embedding_model_id for dataset in dataset_list])) > 1:
3030
raise Exception("关联知识库的向量模型不一致,无法召回分段。")
3131
if len(dataset_list) == 0:
3232
raise Exception("知识库设置错误,请重新设置知识库")
33-
return dataset_list[0].embedding_mode_id
33+
return dataset_list[0].embedding_model_id
3434

3535

3636
def get_none_result(question):

apps/knowledge/serializers/document.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ def list(self):
236236
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_document.sql')))
237237

238238
def page(self, current_page, page_size):
239+
self.is_valid(raise_exception=True)
239240
query_set = self.get_query_set()
240241
return native_page_search(current_page, page_size, query_set, select_string=get_file_content(
241242
os.path.join(PROJECT_DIR, "apps", "knowledge", 'sql', 'list_document.sql')))

apps/knowledge/serializers/knowledge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ def embedding(self, with_valid=True):
180180
self.is_valid(raise_exception=True)
181181
knowledge_id = self.data.get('knowledge_id')
182182
knowledge = QuerySet(Knowledge).filter(id=knowledge_id).first()
183-
embedding_model_id = knowledge.embedding_mode_id
183+
embedding_model_id = knowledge.embedding_model_id
184184
knowledge_user_id = knowledge.user_id
185185
embedding_model = QuerySet(Model).filter(id=embedding_model_id).first()
186186
if embedding_model is None:

apps/models_provider/serializers/model_serializer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def delete(self, with_valid=True):
155155
# if application_count > 0:
156156
# raise AppApiException(500, f"该模型关联了{application_count} 个应用,无法删除该模型。")
157157
# elif model.model_type == 'EMBEDDING':
158-
# dataset_count = DataSet.objects.filter(embedding_mode_id=model_id).count()
158+
# dataset_count = DataSet.objects.filter(embedding_model_id=model_id).count()
159159
# if dataset_count > 0:
160160
# raise AppApiException(500, f"该模型关联了{dataset_count} 个知识库,无法删除该模型。")
161161
# elif model.model_type == 'TTS':

ui/src/api/type/knowledge.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ interface knowledgeData {
33
desc: String
44
documents?: Array<any>
55
type?: String
6-
embedding_mode_id?: String
6+
embedding_model_id?: String
77
}
88

99
export type { knowledgeData }

ui/src/views/knowledge/component/BaseForm.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
</el-form-item>
3333
<el-form-item
3434
:label="$t('views.dataset.datasetForm.form.EmbeddingModel.label')"
35-
prop="embedding_mode_id"
35+
prop="embedding_model_id"
3636
>
3737
<ModelSelect
38-
v-model="form.embedding_mode_id"
38+
v-model="form.embedding_model_id"
3939
:placeholder="$t('views.dataset.datasetForm.form.EmbeddingModel.placeholder')"
4040
:options="modelOptions"
4141
:model-type="'EMBEDDING'"
@@ -60,7 +60,7 @@ const { model } = useStore()
6060
const form = ref<datasetData>({
6161
name: '',
6262
desc: '',
63-
embedding_mode_id: ''
63+
embedding_model_id: ''
6464
})
6565
6666
const rules = reactive({
@@ -78,7 +78,7 @@ const rules = reactive({
7878
trigger: 'blur'
7979
}
8080
],
81-
embedding_mode_id: [
81+
embedding_model_id: [
8282
{
8383
required: true,
8484
message: t('views.dataset.datasetForm.form.EmbeddingModel.requiredMessage'),
@@ -97,7 +97,7 @@ watch(
9797
if (value && JSON.stringify(value) !== '{}') {
9898
form.value.name = value.name
9999
form.value.desc = value.desc
100-
form.value.embedding_mode_id = value.embedding_mode_id
100+
form.value.embedding_model_id = value.embedding_model_id
101101
}
102102
},
103103
{
@@ -134,7 +134,7 @@ onUnmounted(() => {
134134
form.value = {
135135
name: '',
136136
desc: '',
137-
embedding_mode_id: ''
137+
embedding_model_id: ''
138138
}
139139
FormRef.value?.clearValidate()
140140
})

0 commit comments

Comments
 (0)