@lobehub/chat 1.45.2 → 1.45.4

package/src/app/(main)/settings/provider/(detail)/github/page.tsx

@@ -43,16 +43,16 @@ const useProviderCard = (): ProviderItem => {
         ) : (
           <Input.Password
             autoComplete={'new-password'}
-            placeholder={t(`${providerKey}.personalAccessToken.placeholder`)}
+            placeholder={t(`github.personalAccessToken.placeholder`)}
           />
         ),
         desc: (
           <Markdown className={styles.markdown} fontSize={12} variant={'chat'}>
-            {t(`${providerKey}.personalAccessToken.desc`)}
+            {t(`github.personalAccessToken.desc`)}
           </Markdown>
         ),
-        label: t(`${providerKey}.personalAccessToken.title`),
-        name: [KeyVaultsConfigKey, providerKey, LLMProviderApiTokenKey],
+        label: t(`github.personalAccessToken.title`),
+        name: [KeyVaultsConfigKey, LLMProviderApiTokenKey],
       },
     ],
   };

package/src/app/(main)/settings/provider/(detail)/huggingface/page.tsx

@@ -43,16 +43,16 @@ const useProviderCard = (): ProviderItem => {
         ) : (
           <Input.Password
             autoComplete={'new-password'}
-            placeholder={t(`${providerKey}.accessToken.placeholder`)}
+            placeholder={t(`huggingface.accessToken.placeholder`)}
           />
         ),
         desc: (
           <Markdown className={styles.markdown} fontSize={12} variant={'chat'}>
-            {t(`${providerKey}.accessToken.desc`)}
+            {t(`huggingface.accessToken.desc`)}
           </Markdown>
         ),
-        label: t(`${providerKey}.accessToken.title`),
-        name: [KeyVaultsConfigKey, providerKey, LLMProviderApiTokenKey],
+        label: t(`huggingface.accessToken.title`),
+        name: [KeyVaultsConfigKey, LLMProviderApiTokenKey],
       },
     ],
   };

package/src/database/repositories/aiInfra/index.ts

@@ -81,13 +81,16 @@ export class AiInfraRepos {
           .map<EnabledAiModel & { enabled?: boolean | null }>((item) => {
             const user = allModels.find((m) => m.id === item.id && m.providerId === provider.id);
 
-            const enabled = !!user ? user.enabled : item.enabled;
-
             return {
-              ...item,
-              abilities: item.abilities || {},
-              enabled,
+              abilities: !!user ? user.abilities : item.abilities || {},
+              config: !!user ? user.config : item.config,
+              contextWindowTokens: !!user ? user.contextWindowTokens : item.contextWindowTokens,
+              displayName: user?.displayName || item.displayName,
+              enabled: !!user ? user.enabled : item.enabled,
+              id: item.id,
               providerId: provider.id,
+              sort: !!user ? user.sort : undefined,
+              type: item.type,
             };
           })
           .filter((i) => i.enabled);

package/src/database/server/models/__tests__/aiModel.test.ts

@@ -248,7 +248,7 @@ describe('AiModelModel', () => {
 
       const allModels = await aiProviderModel.query();
       expect(allModels).toHaveLength(2);
-      expect(allModels.find((m) => m.id === 'existing-model')?.displayName).toBe('Updated Name');
+      expect(allModels.find((m) => m.id === 'existing-model')?.displayName).toBe('Old Name');
       expect(allModels.find((m) => m.id === 'new-model')?.displayName).toBe('New Model');
     });
   });

package/src/database/server/models/aiModel.ts

@@ -1,5 +1,4 @@
 import { and, asc, desc, eq, inArray } from 'drizzle-orm/expressions';
-import pMap from 'p-map';
 
 import { LobeChatDatabase } from '@/database/type';
 import {
@@ -131,51 +130,21 @@ export class AiModelModel {
   };
 
   batchUpdateAiModels = async (providerId: string, models: AiProviderModelListItem[]) => {
-    return this.db.transaction(async (trx) => {
-      const records = models.map(({ id, ...model }) => ({
-        ...model,
-        id,
-        providerId,
-        updatedAt: new Date(),
-        userId: this.userId,
-      }));
+    const records = models.map(({ id, ...model }) => ({
+      ...model,
+      id,
+      providerId,
+      updatedAt: new Date(),
+      userId: this.userId,
+    }));
 
-      // 第一步：尝试插入所有记录，忽略冲突
-      const insertedRecords = await trx
-        .insert(aiModels)
-        .values(records)
-        .onConflictDoNothing({
-          target: [aiModels.id, aiModels.userId, aiModels.providerId],
-        })
-        .returning();
-      // 第二步：找出需要更新的记录（即插入时发生冲突的记录）
-      // 找出未能插入的记录（需要更新的记录）
-      const insertedIds = new Set(insertedRecords.map((r) => r.id));
-      const recordsToUpdate = records.filter((r) => !insertedIds.has(r.id));
-
-      // 第三步：更新已存在的记录
-      if (recordsToUpdate.length > 0) {
-        await pMap(
-          recordsToUpdate,
-          async (record) => {
-            await trx
-              .update(aiModels)
-              .set({
-                ...record,
-                updatedAt: new Date(),
-              })
-              .where(
-                and(
-                  eq(aiModels.id, record.id),
-                  eq(aiModels.userId, this.userId),
-                  eq(aiModels.providerId, providerId),
-                ),
-              );
-          },
-          { concurrency: 10 }, // 限制并发数为 10
-        );
-      }
-    });
+    return this.db
+      .insert(aiModels)
+      .values(records)
+      .onConflictDoNothing({
+        target: [aiModels.id, aiModels.userId, aiModels.providerId],
+      })
+      .returning();
   };
 
   batchToggleAiModels = async (providerId: string, models: string[], enabled: boolean) => {

package/src/locales/default/models.ts

@@ -1,4 +1,4 @@
-import { LOBE_DEFAULT_MODEL_LIST } from '@/config/modelProviders';
+import { LOBE_DEFAULT_MODEL_LIST } from '@/config/aiModels';
 
 const locales: {
   [key: string]: {
@@ -6,7 +6,7 @@ const locales: {
   };
 } = {};
 
-LOBE_DEFAULT_MODEL_LIST.flat().forEach((model) => {
+LOBE_DEFAULT_MODEL_LIST.forEach((model) => {
   if (!model.description) return;
   locales[model.id] = {
     description: model.description,