Skip to content

Commit 621f2ce

Browse files
committed
fix: Optimize the creation of models
--bug=1053742 --user=王孝刚 【模型管理】- 创建模型时,若在选择供应商列表选择了模型类型,进入供应商表单时,携带模型类型 https://www.tapd.cn/57709429/s/1674767
1 parent 259d1c8 commit 621f2ce

File tree

15 files changed

+49
-18
lines changed

15 files changed

+49
-18
lines changed

ui/src/components/generate-related-dialog/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
v-model="form.model_id"
3636
:placeholder="$t('views.application.applicationForm.form.aiModel.placeholder')"
3737
:options="modelOptions"
38+
showFooter
39+
:model-type="'LLM'"
3840
></ModelSelect>
3941
</el-form-item>
4042
<el-form-item

ui/src/components/model-select/index.vue

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</el-option-group>
5252
<template #footer v-if="showFooter">
5353
<slot name="footer">
54-
<div class="w-full text-left cursor" @click="openCreateModel()">
54+
<div class="w-full text-left cursor" @click="openCreateModel(undefined, props.modelType)">
5555
<el-button type="primary" link>
5656
<el-icon class="mr-4">
5757
<Plus />
@@ -72,7 +72,7 @@
7272
<SelectProviderDialog
7373
v-if="showFooter"
7474
ref="selectProviderRef"
75-
@change="openCreateModel($event)"
75+
@change="(provider, modelType) => openCreateModel(provider, modelType)"
7676
/>
7777
</div>
7878
</template>
@@ -85,11 +85,13 @@ import SelectProviderDialog from '@/views/template/component/SelectProviderDialo
8585
8686
import { t } from '@/locales'
8787
import useStore from '@/stores'
88+
8889
defineOptions({ name: 'ModelSelect' })
8990
const props = defineProps<{
9091
modelValue: any
9192
options: any
9293
showFooter?: false
94+
modelType?: ''
9395
}>()
9496
9597
const emit = defineEmits(['update:modelValue', 'change', 'submitModel'])
@@ -121,11 +123,12 @@ function getProvider() {
121123
})
122124
}
123125
124-
const openCreateModel = (provider?: Provider) => {
126+
const openCreateModel = (provider?: Provider, model_type?: string) => {
125127
if (provider && provider.provider) {
126-
createModelRef.value?.open(provider)
128+
createModelRef.value?.open(provider, model_type)
127129
} else {
128-
selectProviderRef.value?.open()
130+
console.log(model_type)
131+
selectProviderRef.value?.open(model_type)
129132
}
130133
}
131134
@@ -145,9 +148,11 @@ onMounted(() => {
145148
background-color: var(--el-fill-color-light);
146149
}
147150
}
151+
148152
.model-icon {
149153
width: 18px;
150154
}
155+
151156
.check-icon {
152157
position: absolute;
153158
right: 10px;

ui/src/views/application/ApplicationSetting.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
@change="model_change"
8484
@submitModel="getModel"
8585
showFooter
86+
:model-type="'LLM'"
8687
></ModelSelect>
8788
</el-form-item>
8889
<el-form-item
@@ -336,6 +337,7 @@
336337
v-model="applicationForm.stt_model_id"
337338
:placeholder="$t('views.application.applicationForm.form.voiceInput.placeholder')"
338339
:options="sttModelOptions"
340+
:model-type="'STT'"
339341
></ModelSelect>
340342
</el-form-item>
341343
<el-form-item
@@ -398,6 +400,7 @@
398400
"
399401
:options="ttsModelOptions"
400402
@change="ttsModelChange()"
403+
:model-type="'TTS'"
401404
></ModelSelect>
402405

403406
<el-button
@@ -551,7 +554,7 @@ const applicationForm = ref<ApplicationFormType>({
551554
prompt: defaultPrompt,
552555
system: t('views.application.applicationForm.form.roleSettings.placeholder'),
553556
no_references_prompt: '{question}',
554-
reasoning_content_enable: false,
557+
reasoning_content_enable: false
555558
},
556559
model_params_setting: {},
557560
problem_optimization: false,

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
v-model="form.embedding_mode_id"
3939
:placeholder="$t('views.dataset.datasetForm.form.EmbeddingModel.placeholder')"
4040
:options="modelOptions"
41+
:model-type="'EMBEDDING'"
42+
showFooter
4143
></ModelSelect>
4244
</el-form-item>
4345
</el-form>

ui/src/views/template/component/CreateModelDialog.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,12 +369,13 @@ const getModelForm = (model_name: string) => {
369369
}
370370
}
371371
372-
const open = (provider: Provider) => {
372+
const open = (provider: Provider, model_type?: string) => {
373373
ModelApi.listModelType(provider.provider, model_type_loading).then((ok) => {
374374
model_type_list.value = ok.data
375375
})
376376
providerValue.value = provider
377377
dialogVisible.value = true
378+
base_form_data.value.model_type = model_type || ''
378379
activeName.value = 'base-info'
379380
}
380381

ui/src/views/template/component/SelectProviderDialog.vue

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,22 @@ const loading = ref<boolean>(false)
5656
const dialogVisible = ref<boolean>(false)
5757
const list_provider = ref<Array<Provider>>([])
5858
const currentModelType = ref('')
59-
59+
const selectModelType = ref('')
6060
const modelTypeOptions = [{ text: t('views.template.model.allModel'), value: '' }, ...modelTypeList]
6161
62-
const open = () => {
62+
const open = (model_type?: string) => {
6363
dialogVisible.value = true
6464
const option = modelTypeOptions.find((item) => item.text === currentModelType.value)
65-
checkModelType(option ? option.value : '')
65+
checkModelType(model_type ? model_type : option ? option.value : '')
6666
}
6767
6868
const close = () => {
6969
dialogVisible.value = false
7070
}
7171
7272
const checkModelType = (model_type: string) => {
73-
currentModelType.value = modelTypeOptions.filter(
74-
(item) => item.value === model_type
75-
)[0].text
73+
selectModelType.value = model_type
74+
currentModelType.value = modelTypeOptions.filter((item) => item.value === model_type)[0].text
7675
ModelApi.getProviderByModelType(model_type, loading).then((ok) => {
7776
list_provider.value = ok.data
7877
list_provider.value.sort((a, b) => a.provider.localeCompare(b.provider))
@@ -82,7 +81,7 @@ const checkModelType = (model_type: string) => {
8281
const emit = defineEmits(['change'])
8382
const go_create = (provider: Provider) => {
8483
close()
85-
emit('change', provider)
84+
emit('change', provider, selectModelType.value)
8685
}
8786
defineExpose({ open, close })
8887
</script>

ui/src/views/template/index.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189

190190
<SelectProviderDialog
191191
ref="selectProviderRef"
192-
@change="openCreateModel($event)"
192+
@change="(provider, modelType) => openCreateModel(provider, modelType)"
193193
></SelectProviderDialog>
194194
</LayoutContainer>
195195
</template>
@@ -259,9 +259,11 @@ const clickListHandle = (item: Provider) => {
259259
}
260260
}
261261
262-
const openCreateModel = (provider?: Provider) => {
262+
const openCreateModel = (provider?: Provider, model_type?: string) => {
263+
console.log(provider)
264+
console.log(model_type)
263265
if (provider && provider.provider) {
264-
createModelRef.value?.open(provider)
266+
createModelRef.value?.open(provider, model_type)
265267
} else {
266268
selectProviderRef.value?.open()
267269
}

ui/src/workflow/nodes/ai-chat-node/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
:options="modelOptions"
5050
@submitModel="getModel"
5151
showFooter
52+
:model-type="'LLM'"
5253
></ModelSelect>
5354
</el-form-item>
5455

ui/src/workflow/nodes/base-node/index.vue

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@
108108
v-model="form_data.stt_model_id"
109109
:placeholder="$t('views.application.applicationForm.form.voiceInput.placeholder')"
110110
:options="sttModelOptions"
111+
showFooter
112+
:model-type="'STT'"
111113
></ModelSelect>
112114
</el-form-item>
113115
<el-form-item>
@@ -149,6 +151,8 @@
149151
:placeholder="$t('views.application.applicationForm.form.voicePlay.placeholder')"
150152
:options="ttsModelOptions"
151153
@change="ttsModelChange()"
154+
showFooter
155+
:model-type="'TTS'"
152156
></ModelSelect>
153157

154158
<el-button

ui/src/workflow/nodes/image-generate/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
$t('views.applicationWorkflow.nodes.imageGenerateNode.model.requiredMessage')
5050
"
5151
:options="modelOptions"
52+
showFooter
53+
:model-type="'TTI'"
5254
></ModelSelect>
5355
</el-form-item>
5456

0 commit comments

Comments
 (0)