mirror of
https://github.com/1Panel-dev/MaxKB.git
synced 2025-12-29 16:12:55 +00:00
feat: rename embedding_mode_id to embedding_model_id across multiple files
This commit is contained in:
parent
3ded9092ca
commit
787da980b8
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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')))
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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':
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ interface knowledgeData {
|
|||
desc: String
|
||||
documents?: Array<any>
|
||||
type?: String
|
||||
embedding_mode_id?: String
|
||||
embedding_model_id?: String
|
||||
}
|
||||
|
||||
export type { knowledgeData }
|
||||
|
|
|
|||
|
|
@ -32,10 +32,10 @@
|
|||
</el-form-item>
|
||||
<el-form-item
|
||||
:label="$t('views.dataset.datasetForm.form.EmbeddingModel.label')"
|
||||
prop="embedding_mode_id"
|
||||
prop="embedding_model_id"
|
||||
>
|
||||
<ModelSelect
|
||||
v-model="form.embedding_mode_id"
|
||||
v-model="form.embedding_model_id"
|
||||
:placeholder="$t('views.dataset.datasetForm.form.EmbeddingModel.placeholder')"
|
||||
:options="modelOptions"
|
||||
:model-type="'EMBEDDING'"
|
||||
|
|
@ -60,7 +60,7 @@ const { model } = useStore()
|
|||
const form = ref<datasetData>({
|
||||
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()
|
||||
})
|
||||
|
|
|
|||
Loading…
Reference in New Issue