From 17aa05bad4db2fc119ac5443e6e4a803a11e9dfc Mon Sep 17 00:00:00 2001 From: shaohuzhang1 Date: Fri, 24 Nov 2023 10:37:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BE=9B=E5=BA=94=E5=95=86=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../azure_model_provider/icon/azure_icon_svg | 11 ++++++++-- .../wenxin_model_provider/icon/azure_icon_svg | 5 ++++- .../wenxin_model_provider.py | 2 +- ui/src/api/model.ts | 7 ++++--- ui/src/api/type/model.ts | 20 +++++++++++++++++- ui/src/views/template/index.vue | 21 +++++++++++-------- 6 files changed, 49 insertions(+), 17 deletions(-) diff --git a/apps/setting/models_provider/impl/azure_model_provider/icon/azure_icon_svg b/apps/setting/models_provider/impl/azure_model_provider/icon/azure_icon_svg index df89a3901..d6499d2ad 100644 --- a/apps/setting/models_provider/impl/azure_model_provider/icon/azure_icon_svg +++ b/apps/setting/models_provider/impl/azure_model_provider/icon/azure_icon_svg @@ -1,2 +1,9 @@ - - \ No newline at end of file + + + + + + + + + diff --git a/apps/setting/models_provider/impl/wenxin_model_provider/icon/azure_icon_svg b/apps/setting/models_provider/impl/wenxin_model_provider/icon/azure_icon_svg index df89a3901..4added84b 100644 --- a/apps/setting/models_provider/impl/wenxin_model_provider/icon/azure_icon_svg +++ b/apps/setting/models_provider/impl/wenxin_model_provider/icon/azure_icon_svg @@ -1,2 +1,5 @@ - + + + + \ No newline at end of file diff --git a/apps/setting/models_provider/impl/wenxin_model_provider/wenxin_model_provider.py b/apps/setting/models_provider/impl/wenxin_model_provider/wenxin_model_provider.py index 1e744c645..22c33cb11 100644 --- a/apps/setting/models_provider/impl/wenxin_model_provider/wenxin_model_provider.py +++ b/apps/setting/models_provider/impl/wenxin_model_provider/wenxin_model_provider.py @@ -129,6 +129,6 @@ class WenxinModelProvider(IModelProvider): raise AppApiException(500, f'不支持的模型:{model_name}') def get_model_provide_info(self): - return ModelProvideInfo(provider='model_wenxin_provider', name='Azure OpenAI', icon=get_file_content( + return ModelProvideInfo(provider='model_wenxin_provider', name='千帆大模型', icon=get_file_content( os.path.join(PROJECT_DIR, "apps", "setting", 'models_provider', 'impl', 'wenxin_model_provider', 'icon', 'azure_icon_svg'))) diff --git a/ui/src/api/model.ts b/ui/src/api/model.ts index 8cd95287a..950b3765a 100644 --- a/ui/src/api/model.ts +++ b/ui/src/api/model.ts @@ -1,6 +1,7 @@ import { Result } from '@/request/Result' import { get, post, del, put } from '@/request/index' -import type { modelRequest } from '@/api/type/model' +import { type Ref } from 'vue' +import type { modelRequest, Provider } from '@/api/type/model' const prefix = '/model' const prefix_provider = '/provider' @@ -14,8 +15,8 @@ const getModel: (data?: modelRequest) => Promise> = (data) => { /** * 获得供应商列表 */ -const getProvider: () => Promise> = () => { - return get(`${prefix_provider}`) +const getProvider: (loading?: Ref) => Promise>> = (loading) => { + return get(`${prefix_provider}`, {}, loading) } export default { diff --git a/ui/src/api/type/model.ts b/ui/src/api/type/model.ts index e33c4bf32..b4abade16 100644 --- a/ui/src/api/type/model.ts +++ b/ui/src/api/type/model.ts @@ -1,6 +1,24 @@ +import { SrvRecord } from 'dns' + interface modelRequest { name: string model_type: string model_name: string } -export type { modelRequest } + +interface Provider { + /** + * 供应商代号 + */ + provider: string + /** + * 供应商名称 + */ + name: string + /** + * 供应商icon + */ + icon: string +} + +export type { modelRequest, Provider } diff --git a/ui/src/views/template/index.vue b/ui/src/views/template/index.vue index 4e7bfa467..2480c6bd5 100644 --- a/ui/src/views/template/index.vue +++ b/ui/src/views/template/index.vue @@ -3,10 +3,10 @@

供应商

- + @@ -22,16 +22,19 @@