Skip to content

Commit 6ce02ab

Browse files
wangdan-fit2cloudwangdan-fit2cloud
committed
feat: model
1 parent 83e9a8c commit 6ce02ab

File tree

21 files changed

+113
-143
lines changed

21 files changed

+113
-143
lines changed

‎ui/src/api/model/model.ts‎

Lines changed: 19 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -22,62 +22,24 @@ Object.defineProperty(prefix, 'value', {
2222
* 获得模型列表
2323
* @params 参数 name, model_type, model_name
2424
*/
25-
const getModel: (
25+
const getModelList: (
2626
data?: ListModelRequest,
2727
loading?: Ref<boolean>,
2828
) => Promise<Result<Array<Model>>> = (data, loading) => {
29-
return get(`${prefix.value}`, data, loading)
30-
}
31-
/**
32-
* 获取工作空间下重排模型列表
33-
* @param loading 加载器
34-
* @returns 重排模型列表
35-
*/
36-
const getRerankerModel: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (loading) => {
37-
return get(`${prefix.value}`, { model_type: 'RERANKER' }, loading)
29+
return get(`${prefix.value}/model`, data, loading)
3830
}
3931

4032
/**
41-
* 获取语音转文本模型列表
42-
* @param loading
43-
* @returns 语音转文本模型列表
33+
* 获得下拉选择框模型列表
34+
* @params 参数 name, model_type, model_name
4435
*/
45-
const getSTTModel: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (loading) => {
46-
return get(`${prefix.value}`, { model_type: 'STT' }, loading)
36+
const getSelectModelList: (
37+
data?: ListModelRequest,
38+
loading?: Ref<boolean>,
39+
) => Promise<Result<Array<Model>>> = (data, loading) => {
40+
return get(`${prefix.value}/model_list`, data, loading)
4741
}
4842

49-
/**
50-
* 获取文本转语音模型列表
51-
* @param loading
52-
* @returns
53-
*/
54-
const getTTSModel: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (loading) => {
55-
return get(`${prefix.value}`, { model_type: 'TTS' }, loading)
56-
}
57-
/**
58-
* 获取图片理解模型列表
59-
* @param loading
60-
* @returns 图片理解模型列表
61-
*/
62-
const getImageModel: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (loading) => {
63-
return get(`${prefix.value}`, { model_type: 'IMAGE' }, loading)
64-
}
65-
/**
66-
* 获取图片生成模型列表
67-
* @param loading
68-
* @returns 图片生成模型列表
69-
*/
70-
const getTTIModel: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (loading) => {
71-
return get(`${prefix.value}`, { model_type: 'TTI' }, loading)
72-
}
73-
/**
74-
* 获取大语言模型列表
75-
* @param loading
76-
* @returns 大语言模型列表
77-
*/
78-
const getLLMModel: (loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (loading) => {
79-
return get(`${prefix.value}`, { model_type: 'LLM' }, loading)
80-
}
8143
/**
8244
* 获取模型参数表单
8345
* @param model_id 模型id
@@ -88,7 +50,7 @@ const getModelParamsForm: (
8850
model_id: string,
8951
loading?: Ref<boolean>,
9052
) => Promise<Result<Array<FormField>>> = (model_id, loading) => {
91-
return get(`${prefix.value}/${model_id}/model_params_form`, {}, loading)
53+
return get(`${prefix.value}/model/${model_id}/model_params_form`, {}, loading)
9254
}
9355

9456
/**
@@ -101,7 +63,7 @@ const createModel: (
10163
request: CreateModelRequest,
10264
loading?: Ref<boolean>,
10365
) => Promise<Result<Model>> = (request, loading) => {
104-
return post(`${prefix.value}`, request, {}, loading)
66+
return post(`${prefix.value}/model`, request, {}, loading)
10567
}
10668

10769
/**
@@ -115,7 +77,7 @@ const updateModel: (
11577
request: EditModelRequest,
11678
loading?: Ref<boolean>,
11779
) => Promise<Result<Model>> = (model_id, request, loading) => {
118-
return put(`${prefix.value}/${model_id}`, request, {}, loading)
80+
return put(`${prefix.value}/model/${model_id}`, request, {}, loading)
11981
}
12082

12183
/**
@@ -129,7 +91,7 @@ const updateModelParamsForm: (
12991
request: any[],
13092
loading?: Ref<boolean>,
13193
) => Promise<Result<Model>> = (model_id, request, loading) => {
132-
return put(`${prefix.value}/${model_id}/model_params_form`, request, {}, loading)
94+
return put(`${prefix.value}/model/${model_id}/model_params_form`, request, {}, loading)
13395
}
13496

13597
/**
@@ -142,7 +104,7 @@ const getModelById: (model_id: string, loading?: Ref<boolean>) => Promise<Result
142104
model_id,
143105
loading,
144106
) => {
145-
return get(`${prefix.value}/${model_id}`, {}, loading)
107+
return get(`${prefix.value}/model/${model_id}`, {}, loading)
146108
}
147109
/**
148110
* 获取模型信息不包括认证信息根据模型id
@@ -154,7 +116,7 @@ const getModelMetaById: (model_id: string, loading?: Ref<boolean>) => Promise<Re
154116
model_id,
155117
loading,
156118
) => {
157-
return get(`${prefix.value}/${model_id}/meta`, {}, loading)
119+
return get(`${prefix.value}/model/${model_id}/meta`, {}, loading)
158120
}
159121
/**
160122
* 暂停下载
@@ -166,16 +128,16 @@ const pauseDownload: (model_id: string, loading?: Ref<boolean>) => Promise<Resul
166128
model_id,
167129
loading,
168130
) => {
169-
return put(`${prefix.value}/${model_id}/pause_download`, undefined, {}, loading)
131+
return put(`${prefix.value}/model/${model_id}/pause_download`, undefined, {}, loading)
170132
}
171133
const deleteModel: (model_id: string, loading?: Ref<boolean>) => Promise<Result<boolean>> = (
172134
model_id,
173135
loading,
174136
) => {
175-
return del(`${prefix.value}/${model_id}`, undefined, {}, loading)
137+
return del(`${prefix.value}/model/${model_id}`, undefined, {}, loading)
176138
}
177139
export default {
178-
getModel,
140+
getModelList,
179141
createModel,
180142
updateModel,
181143
deleteModel,
@@ -184,10 +146,5 @@ export default {
184146
pauseDownload,
185147
getModelParamsForm,
186148
updateModelParamsForm,
187-
getRerankerModel,
188-
getSTTModel,
189-
getTTSModel,
190-
getImageModel,
191-
getTTIModel,
192-
getLLMModel,
149+
getSelectModelList,
193150
}

‎ui/src/api/resource-management/model.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const workspace_id = localStorage.getItem('workspace_id') || 'default'
1616
* 获得模型列表
1717
* @params 参数 name, model_type, model_name
1818
*/
19-
const getModel: (
19+
const getModelList: (
2020
request?: ListModelRequest,
2121
loading?: Ref<boolean>,
2222
) => Promise<Result<Array<Model>>> = (data, loading) => {
@@ -121,7 +121,7 @@ const deleteModel: (model_id: string, loading?: Ref<boolean>) => Promise<Result<
121121
}
122122

123123
export default {
124-
getModel,
124+
getModelList,
125125
createModel,
126126
updateModel,
127127
deleteModel,

‎ui/src/api/shared-workspace.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const getKnowledgeListPage: (
3333
)
3434
}
3535

36-
const getModel: (
36+
const getModelList: (
3737
param: any,
3838
loading?: Ref<boolean>,
3939
) => Promise<Result<Array<any>>> = (param: any, loading) => {
@@ -57,7 +57,7 @@ const getToolListPage: (
5757
export default {
5858
getKnowledgeList,
5959
getKnowledgeListPage,
60-
getModel,
60+
getModelList,
6161
getToolList,
6262
getToolListPage
6363
}

‎ui/src/api/system-shared/model.ts‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,24 @@ const prefix = '/system/shared/model'
1515
* 获得模型列表
1616
* @params 参数 name, model_type, model_name
1717
*/
18-
const getModel: (
18+
const getModelList: (
1919
request?: ListModelRequest,
2020
loading?: Ref<boolean>,
2121
) => Promise<Result<Array<Model>>> = (data, loading) => {
2222
return get(`${prefix}`, data, loading)
2323
}
2424

25+
/**
26+
* 获得下拉选择框模型列表
27+
* @params 参数 name, model_type, model_name
28+
*/
29+
const getSelectModelList: (
30+
data?: ListModelRequest,
31+
loading?: Ref<boolean>,
32+
) => Promise<Result<Array<Model>>> = (data, loading) => {
33+
return get(`${prefix}`, data, loading)
34+
}
35+
2536
/**
2637
* 获取模型参数表单
2738
* @param model_id 模型id
@@ -120,7 +131,7 @@ const deleteModel: (model_id: string, loading?: Ref<boolean>) => Promise<Result<
120131
}
121132

122133
export default {
123-
getModel,
134+
getModelList,
124135
createModel,
125136
updateModel,
126137
deleteModel,
@@ -129,4 +140,5 @@ export default {
129140
pauseDownload,
130141
getModelParamsForm,
131142
updateModelParamsForm,
143+
getSelectModelList,
132144
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ watch(dialogVisible, (bool) => {
133133
134134
const open = (ids: string[], type: string, _knowledgeId?: string) => {
135135
knowledgeId.value = _knowledgeId
136-
getModel()
136+
getModelFn()
137137
idList.value = ids
138138
apiSubmitType.value = type
139139
dialogVisible.value = true
@@ -188,7 +188,7 @@ const submitHandle = async (formEl: FormInstance) => {
188188
})
189189
}
190190
191-
function getModel() {
191+
function getModelFn() {
192192
loading.value = true
193193
loadSharedApi({ type: 'knowledge', systemType: props.apiType })
194194
.getKnowledgeModel()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ watch(dialogVisible, (bool) => {
137137
138138
const open = (ids: string[], type: string, _knowledgeId?: string) => {
139139
knowledgeId.value = _knowledgeId
140-
getModel()
140+
getModelFn()
141141
idList.value = ids
142142
apiType.value = type
143143
dialogVisible.value = true
@@ -186,7 +186,7 @@ const submitHandle = async (formEl: FormInstance) => {
186186
})
187187
}
188188
189-
function getModel() {
189+
function getModelFn() {
190190
loading.value = true
191191
knowledgeApi
192192
.getKnowledgeModel()

‎ui/src/stores/modules-resource-management/model.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import type {ListModelRequest} from '@/api/type/model'
77
const useModelStore = defineStore('mod', {
88
state: () => ({}),
99
actions: {
10-
async asyncGetModel(data?: ListModelRequest, loading?: Ref<boolean>) {
10+
async asyncGetSelectModel(data?: ListModelRequest, loading?: Ref<boolean>) {
1111
return new Promise((resolve, reject) => {
12-
ModelApi.getModel(data, loading)
12+
ModelApi.getModelList(data, loading)
1313
.then((res) => {
1414
resolve(res)
1515
})

‎ui/src/stores/modules/model.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
77
const useModelStore = defineStore('model', {
88
state: () => ({}),
99
actions: {
10-
async asyncGetModel(
11-
data?: ListModelRequest,
10+
async asyncGetSelectModel(
1211
systemType: 'systemShare' | 'workspace' | 'systemManage' = 'workspace',
12+
data?: ListModelRequest,
1313
loading?: Ref<boolean>,
1414
) {
1515
return new Promise((resolve, reject) => {
1616
loadSharedApi({ type: 'model', systemType })
17-
.getModel(data, loading)
17+
.getSelectModelList(data, loading)
1818
.then((res: any) => {
1919
resolve(res)
2020
})

‎ui/src/styles/component.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
width: 280px;
9191
.el-dropdown-menu__item {
9292
padding: 8px 12px;
93-
width: 100%;
9493
&:hover {
9594
background: var(--app-text-color-light-1);
9695
}

‎ui/src/views/application/ApplicationSetting.vue‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
:placeholder="$t('views.application.form.aiModel.placeholder')"
8686
:options="modelOptions"
8787
@change="model_change"
88-
@submitModel="getModel"
88+
@submitModel="getSelectModel"
8989
showFooter
9090
:model-type="'LLM'"
9191
></ModelSelect>
@@ -645,10 +645,10 @@ function getKnowledge() {
645645
})
646646
}
647647
648-
function getModel() {
648+
function getSelectModel() {
649649
loading.value = true
650650
modelAPI
651-
.getLLMModel()
651+
.getSelectModelList({ model_type: 'LLM' })
652652
.then((res: any) => {
653653
modelOptions.value = groupBy(res?.data, 'provider')
654654
loading.value = false
@@ -661,7 +661,7 @@ function getModel() {
661661
function getSTTModel() {
662662
loading.value = true
663663
modelAPI
664-
.getSTTModel()
664+
.getSelectModelList({ model_type: 'STT' })
665665
.then((res: any) => {
666666
sttModelOptions.value = groupBy(res?.data, 'provider')
667667
loading.value = false
@@ -674,7 +674,7 @@ function getSTTModel() {
674674
function getTTSModel() {
675675
loading.value = true
676676
modelAPI
677-
.getTTSModel()
677+
.getSelectModelList({ model_type: 'TTS' })
678678
.then((res: any) => {
679679
ttsModelOptions.value = groupBy(res?.data, 'provider')
680680
loading.value = false
@@ -717,7 +717,7 @@ function refresh() {
717717
}
718718
719719
onMounted(() => {
720-
getModel()
720+
getSelectModel()
721721
getKnowledge()
722722
getDetail()
723723
getSTTModel()

0 commit comments

Comments
 (0)