Merge remote-tracking branch 'origin/feature/1.6-cx' into feature/1.6-liujian

frontend/packages/core/src/const/ai-service/const.tsx

@@ -19,11 +19,11 @@ export const AI_SERVICE_ROUTER_TABLE_COLUMNS: PageProColumns<AiServiceRouterTabl
   },
   {
     title: '模型',
-    dataIndex: ['model', 'logo'],
+    dataIndex: ['model', 'name'],
     ellipsis: true,
     render: (_: React.ReactNode, entity: AiServiceRouterTableListItem) => (
       <div className="flex items-center gap-[2px] ">
-        <span>{entity.model.id}</span>
+        <span>{entity.model.name}</span>
       </div>
     )
   },

frontend/packages/core/src/const/ai-service/type.ts

@@ -104,6 +104,7 @@ export type AiServiceRouterTableListItem = {
     model:{
         id:string
         logo:string
+        name:string
     }
 };
 

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

@@ -80,7 +80,7 @@ const AiServiceInsideRouterCreate = () => {
             timeout,
             retry,
             aiPrompt: { variables: variables, prompt: prompt },
-            aiModel: { id: defaultLlm?.id, provider: defaultLlm?.provider, config: defaultLlm?.config, type: defaultLlm?.type },
+            aiModel: { id: defaultLlm?.id, provider: defaultLlm?.provider, config: defaultLlm?.config, type: defaultLlm?.type, name: defaultLlm?.name },
             disabled
           }
           return fetchData<BasicResponse<null>>('service/ai-router', {
@@ -230,7 +230,8 @@ const AiServiceInsideRouterCreate = () => {
                 return {
                   ...prev,
                   logo: llmSetting?.logo,
-                  scopes: llmSetting?.scopes
+                  scopes: llmSetting?.scopes,
+                  name: llmSetting?.name
                 } as AiProviderDefaultConfig & { config: string }
               })
             }
@@ -273,7 +274,8 @@ const AiServiceInsideRouterCreate = () => {
                 return {
                   ...prev,
                   logo: llmSetting?.logo,
-                  scopes: llmSetting?.scopes
+                  scopes: llmSetting?.scopes,
+                  name: llmSetting?.name
                 } as AiProviderDefaultConfig & { config: string }
               })
             }

frontend/packages/core/src/pages/aiSetting/contexts/ModelsDetailTable.tsx

@@ -156,7 +156,7 @@ const ModelsDetailTable = (props: { providerID?: string }) => {
         const tableData = response.data.llms.map((item) => {
           return {
             ...item,
-            modelValue: `${response.data.provider.id}/${item.id}`
+            modelValue: `${response.data.provider.id}/${item.name}`
           }
         })
         return {