Merge branch 'feature/1.6-cx' into 'main'

feat: feature/1.6-Integrate custom model

See merge request apipark/APIPark!256

frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx

@@ -162,7 +162,8 @@ const AiServiceInsideRouterCreate = () => {
                 provider: aiModel?.provider,
                 id: aiModel?.id,
                 config: aiModel.config,
-                type: aiModel?.type
+                type: aiModel?.type,
+                name: aiModel?.name
               }) as AiProviderDefaultConfig & { config: string }
           )
           getDefaultModelConfig({
@@ -216,8 +217,8 @@ const AiServiceInsideRouterCreate = () => {
                   provider: localId,
                   name: aiServiceInfo?.name,
                   config: llmSetting?.defaultConfig || '',
+                  ...(llmSetting ?? {}),
                   type: 'local',
-                  ...(llmSetting ?? {})
                 } as AiProviderDefaultConfig & { config: string }
               })
             }
@@ -259,8 +260,8 @@ const AiServiceInsideRouterCreate = () => {
                   provider: data.provider.id,
                   name: data.provider.name,
                   config: llmSetting?.config || '',
+                  ...(llmSetting ?? {}),
                   type: 'online',
-                  ...(llmSetting ?? {})
                 } as AiProviderDefaultConfig & { config: string }
               })
             }
@@ -385,7 +386,7 @@ const AiServiceInsideRouterCreate = () => {
                 className="flex items-center  h-[24px] ai-setting-svg-container "
                 dangerouslySetInnerHTML={{ __html: defaultLlm?.logo || '' }}
               ></span>
-              <span>{defaultLlm?.id || defaultLlm?.defaultLlm}</span>
+              <span>{defaultLlm?.name || defaultLlm?.id || defaultLlm?.defaultLlm}</span>
               {defaultLlm?.scopes?.map((x) => <Tag>{x?.toLocaleUpperCase()}</Tag>)}
             </div>
           </Button>

frontend/packages/core/src/pages/system/SystemConfig.tsx

@@ -138,7 +138,7 @@ const SystemConfig = forwardRef<SystemConfigHandle>((_, ref) => {
       const { code, data, msg } = response
       if (code === STATUS_CODE.SUCCESS) {
         const localModelList = data.llms?.map((x: any) => {
-          return { ...x, label: x.id, value: x.id }
+          return { ...x, label: x.name || x.id, value: x.id }
         })
         setModelList(localModelList)
         if (setDefaultLlm && localModelList.length > 0) {