🐛 fix: fix custom ai provider sdk type (#6712)

* fix issue * update locale
lobehub · Mar 5, 2025 · 7f8c379 · 7f8c379
1 parent c814c31
commit 7f8c379
Show file tree

Hide file tree

Showing 24 changed files with 118 additions and 27 deletions.
diff --git a/locales/ar/modelProvider.json b/locales/ar/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "تحديث التكوين الأساسي للمزود",
     "updateSuccess": "تم التحديث بنجاح"
   },
+  "updateCustomAiProvider": {
+    "title": "تحديث إعدادات مزود الذكاء الاصطناعي المخصص"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "أدخل مفاتيح Vertex AI الخاصة بك",

diff --git a/locales/bg-BG/modelProvider.json b/locales/bg-BG/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Актуализиране на основната конфигурация на доставчика",
     "updateSuccess": "Актуализацията е успешна"
   },
+  "updateCustomAiProvider": {
+    "title": "Актуализиране на конфигурацията на доставчика на персонализирани AI услуги"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Въведете вашите ключове за Vertex AI",

diff --git a/locales/de-DE/modelProvider.json b/locales/de-DE/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Aktualisieren Sie die grundlegenden Anbieterinformationen",
     "updateSuccess": "Aktualisierung erfolgreich"
   },
+  "updateCustomAiProvider": {
+    "title": "Konfiguration des benutzerdefinierten KI-Anbieters aktualisieren"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Geben Sie Ihre Vertex AI-Schlüssel ein",

diff --git a/locales/en-US/modelProvider.json b/locales/en-US/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Update provider basic configuration",
     "updateSuccess": "Update successful"
   },
+  "updateCustomAiProvider": {
+    "title": "Update Custom AI Provider Configuration"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Enter your Vertex AI Keys",

diff --git a/locales/es-ES/modelProvider.json b/locales/es-ES/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Actualizar configuración básica del proveedor",
     "updateSuccess": "Actualización exitosa"
   },
+  "updateCustomAiProvider": {
+    "title": "Actualizar la configuración del proveedor de IA personalizado"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Introduce tus claves de Vertex AI",

diff --git a/locales/fa-IR/modelProvider.json b/locales/fa-IR/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "به‌روزرسانی پیکربندی پایه ارائه‌دهنده",
     "updateSuccess": "به‌روزرسانی با موفقیت انجام شد"
   },
+  "updateCustomAiProvider": {
+    "title": "به‌روزرسانی تنظیمات ارائه‌دهنده AI سفارشی"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "کلیدهای Vertex AI خود را وارد کنید",

diff --git a/locales/fr-FR/modelProvider.json b/locales/fr-FR/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Mettre à jour la configuration de base du fournisseur",
     "updateSuccess": "Mise à jour réussie"
   },
+  "updateCustomAiProvider": {
+    "title": "Mettre à jour la configuration du fournisseur de services AI personnalisé"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Entrez vos clés Vertex AI",

diff --git a/locales/it-IT/modelProvider.json b/locales/it-IT/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Aggiorna la configurazione di base del fornitore",
     "updateSuccess": "Aggiornamento avvenuto con successo"
   },
+  "updateCustomAiProvider": {
+    "title": "Aggiorna la configurazione del fornitore di AI personalizzato"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Inserisci le tue chiavi Vertex AI",

diff --git a/locales/ja-JP/modelProvider.json b/locales/ja-JP/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "サービスプロバイダーの基本設定を更新",
     "updateSuccess": "更新に成功しました"
   },
+  "updateCustomAiProvider": {
+    "title": "カスタム AI プロバイダー設定の更新"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "あなたの Vertex AI キーを入力してください",

diff --git a/locales/ko-KR/modelProvider.json b/locales/ko-KR/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "서비스 제공자 기본 설정 업데이트",
     "updateSuccess": "업데이트 성공"
   },
+  "updateCustomAiProvider": {
+    "title": "사용자 정의 AI 서비스 제공자 구성 업데이트"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "당신의 Vertex AI 키를 입력하세요",

diff --git a/locales/nl-NL/modelProvider.json b/locales/nl-NL/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Werk basisconfiguratie van provider bij",
     "updateSuccess": "Bijwerking geslaagd"
   },
+  "updateCustomAiProvider": {
+    "title": "Bijwerken van de configuratie van de aangepaste AI-provider"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Vul je Vertex AI-sleutels in",

diff --git a/locales/pl-PL/modelProvider.json b/locales/pl-PL/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Aktualizuj podstawowe ustawienia dostawcy",
     "updateSuccess": "Aktualizacja zakończona sukcesem"
   },
+  "updateCustomAiProvider": {
+    "title": "Aktualizuj konfigurację dostawcy AI"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Wprowadź swoje klucze Vertex AI",

diff --git a/locales/pt-BR/modelProvider.json b/locales/pt-BR/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Atualizar configurações básicas do provedor",
     "updateSuccess": "Atualização bem-sucedida"
   },
+  "updateCustomAiProvider": {
+    "title": "Atualizar configuração do provedor de IA personalizado"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Insira suas Chaves do Vertex AI",

diff --git a/locales/ru-RU/modelProvider.json b/locales/ru-RU/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Обновить базовую конфигурацию провайдера",
     "updateSuccess": "Обновление успешно"
   },
+  "updateCustomAiProvider": {
+    "title": "Обновить настройки поставщика пользовательского ИИ"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Введите ваши ключи Vertex AI",

diff --git a/locales/tr-TR/modelProvider.json b/locales/tr-TR/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Hizmet sağlayıcının temel yapılandırmasını güncelle",
     "updateSuccess": "Güncelleme başarılı"
   },
+  "updateCustomAiProvider": {
+    "title": "Özel AI Sağlayıcı Yapılandırmasını Güncelle"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Vertex AI Anahtarlarınızı buraya girin",

diff --git a/locales/vi-VN/modelProvider.json b/locales/vi-VN/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "Cập nhật cấu hình cơ bản của nhà cung cấp",
     "updateSuccess": "Cập nhật thành công"
   },
+  "updateCustomAiProvider": {
+    "title": "Cập nhật cấu hình nhà cung cấp AI tùy chỉnh"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "Nhập khóa Vertex AI của bạn",

diff --git a/locales/zh-CN/modelProvider.json b/locales/zh-CN/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "更新服务商基础配置",
     "updateSuccess": "更新成功"
   },
+  "updateCustomAiProvider": {
+    "title": "更新自定义 AI 服务商配置"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "填入你的 Vertex Ai Keys",

diff --git a/locales/zh-TW/modelProvider.json b/locales/zh-TW/modelProvider.json
@@ -322,6 +322,9 @@
     "tooltip": "更新服務商基礎配置",
     "updateSuccess": "更新成功"
   },
+  "updateCustomAiProvider": {
+    "title": "更新自訂 AI 服務商配置"
+  },
   "vertexai": {
     "apiKey": {
       "desc": "填入你的 Vertex AI 金鑰",

diff --git a/src/app/[variants]/(main)/settings/provider/features/CreateNewProvider/index.tsx b/src/app/[variants]/(main)/settings/provider/features/CreateNewProvider/index.tsx
@@ -107,7 +107,7 @@ const CreateNewProvider = memo<CreateNewProviderProps>(({ onClose, open }) => {
       ),
       label: t('createNewAiProvider.sdkType.title'),
       minWidth: 400,
-      name: 'sdkType',
+      name: ['settings', 'sdkType'],
       rules: [{ message: t('createNewAiProvider.sdkType.required'), required: true }],
     },
     {

diff --git a/...nts]/(main)/settings/provider/features/ProviderConfig/UpdateProviderInfo/SettingModal.tsx b/...nts]/(main)/settings/provider/features/ProviderConfig/UpdateProviderInfo/SettingModal.tsx
@@ -1,6 +1,7 @@
+import { ProviderIcon } from '@lobehub/icons';
 import { FormModal, Icon } from '@lobehub/ui';
 import type { FormItemProps } from '@lobehub/ui/es/Form/components/FormItem';
-import { App, Button, Input } from 'antd';
+import { App, Button, Input, Select } from 'antd';
 import { BrainIcon } from 'lucide-react';
 import { useRouter } from 'next/navigation';
 import { memo, useState } from 'react';
@@ -78,6 +79,33 @@ const CreateNewProvider = memo<CreateNewProviderProps>(({ onClose, open, initial
     },
   ];
 
+  const configItems: FormItemProps[] = [
+    {
+      children: (
+        <Select
+          optionRender={({ label, value }) => (
+            <Flexbox align={'center'} gap={8} horizontal>
+              <ProviderIcon provider={value as string} size={18} />
+              {label}
+            </Flexbox>
+          )}
+          options={[
+            { label: 'OpenAI', value: 'openai' },
+            { label: 'Anthropic', value: 'anthropic' },
+            { label: 'Ollama', value: 'ollama' },
+            // { label: 'Azure AI', value: 'azureai' },
+          ]}
+          placeholder={t('createNewAiProvider.sdkType.placeholder')}
+          variant={'filled'}
+        />
+      ),
+      label: t('createNewAiProvider.sdkType.title'),
+      minWidth: 400,
+      name: ['settings', 'sdkType'],
+      rules: [{ message: t('createNewAiProvider.sdkType.required'), required: true }],
+    },
+  ];
+
   return (
     <FormModal
       footer={
@@ -118,6 +146,10 @@ const CreateNewProvider = memo<CreateNewProviderProps>(({ onClose, open, initial
           children: basicItems,
           title: t('createNewAiProvider.basicTitle'),
         },
+        {
+          children: configItems,
+          title: t('createNewAiProvider.configTitle'),
+        },
       ]}
       onCancel={onClose}
       onFinish={onFinish}
@@ -127,7 +159,7 @@ const CreateNewProvider = memo<CreateNewProviderProps>(({ onClose, open, initial
       title={
         <Flexbox gap={8} horizontal>
           <Icon icon={BrainIcon} />
-          {t('createNewAiProvider.title')}
+          {t('updateCustomAiProvider.title')}
         </Flexbox>
       }
     />

diff --git a/src/app/[variants]/(main)/settings/provider/features/ProviderConfig/index.tsx b/src/app/[variants]/(main)/settings/provider/features/ProviderConfig/index.tsx
@@ -324,19 +324,21 @@ const ProviderConfig = memo<ProviderConfigProps>(
               {name}
             </Flexbox>
           ) : (
-            <ProviderCombine provider={id} size={24} />
+            <>
+              <ProviderCombine provider={id} size={24} />
+              <Tooltip title={t('providerModels.config.helpDoc')}>
+                <Link
+                  href={urlJoin(BASE_PROVIDER_DOC_URL, id)}
+                  onClick={(e) => e.stopPropagation()}
+                  target={'_blank'}
+                >
+                  <Center className={styles.help} height={20} width={20}>
+                    ?
+                  </Center>
+                </Link>
+              </Tooltip>
+            </>
           )}
-          <Tooltip title={t('providerModels.config.helpDoc')}>
-            <Link
-              href={urlJoin(BASE_PROVIDER_DOC_URL, id)}
-              onClick={(e) => e.stopPropagation()}
-              target={'_blank'}
-            >
-              <Center className={styles.help} height={20} width={20}>
-                ?
-              </Center>
-            </Link>
-          </Tooltip>
         </Flexbox>
       ),
     };

diff --git a/src/features/Conversation/Extras/Usage/UsageDetail/ModelCard.tsx b/src/features/Conversation/Extras/Usage/UsageDetail/ModelCard.tsx
@@ -96,6 +96,12 @@ const ModelCard = memo<ModelCardProps>(({ pricing, id, provider, displayName })
           <div />
           <Flexbox align={'center'} className={styles.pricing} gap={8} horizontal>
             {t('messages.modelCard.creditPricing')}:
+            <Tooltip title={t('messages.modelCard.pricing.inputTokens', { amount: inputPrice })}>
+              <Flexbox gap={2} horizontal>
+                <Icon icon={ArrowUpFromDot} />
+                {inputPrice}
+              </Flexbox>
+            </Tooltip>
             {pricing?.cachedInput && (
               <Tooltip
                 title={t('messages.modelCard.pricing.inputCachedTokens', {
@@ -108,12 +114,6 @@ const ModelCard = memo<ModelCardProps>(({ pricing, id, provider, displayName })
                 </Flexbox>
               </Tooltip>
             )}
-            <Tooltip title={t('messages.modelCard.pricing.inputTokens', { amount: inputPrice })}>
-              <Flexbox gap={2} horizontal>
-                <Icon icon={ArrowUpFromDot} />
-                {inputPrice}
-              </Flexbox>
-            </Tooltip>
             <Tooltip title={t('messages.modelCard.pricing.outputTokens', { amount: outputPrice })}>
               <Flexbox gap={2} horizontal>
                 <Icon icon={ArrowDownToDot} />

diff --git a/src/features/Conversation/Extras/Usage/UsageDetail/index.tsx b/src/features/Conversation/Extras/Usage/UsageDetail/index.tsx
@@ -67,19 +67,19 @@ const TokenDetail = memo<TokenDetailProps>(({ usage, model, provider }) => {
   ].filter(Boolean) as TokenProgressItem[];
 
   const totalDetail = [
-    !!detailTokens.cachedInput && {
-      color: theme.orange,
-      id: 'cachedInput',
-      title: t('messages.tokenDetails.inputCached'),
-      value: isShowCredit ? detailTokens.cachedInput.credit : detailTokens.cachedInput.token,
-    },
     !!detailTokens.uncachedInput && {
       color: theme.colorFill,
 
       id: 'uncachedInput',
       title: t('messages.tokenDetails.inputUncached'),
       value: isShowCredit ? detailTokens.uncachedInput.credit : detailTokens.uncachedInput.token,
     },
+    !!detailTokens.cachedInput && {
+      color: theme.orange,
+      id: 'cachedInput',
+      title: t('messages.tokenDetails.inputCached'),
+      value: isShowCredit ? detailTokens.cachedInput.credit : detailTokens.cachedInput.token,
+    },
     !!detailTokens.totalOutput && {
       color: theme.colorSuccess,
       id: 'output',

diff --git a/src/locales/default/modelProvider.ts b/src/locales/default/modelProvider.ts
@@ -325,6 +325,9 @@ export default {
     tooltip: '更新服务商基础配置',
     updateSuccess: '更新成功',
   },
+  updateCustomAiProvider: {
+    title: '更新自定义 AI 服务商配置',
+  },
   vertexai: {
     apiKey: {
       desc: '填入你的 Vertex Ai Keys',