@lobehub/chat 1.107.6 → 1.108.1

package/src/config/modelProviders/index.ts

@@ -1,6 +1,7 @@
 import { ChatModelCard, ModelProviderCard } from '@/types/llm';
 
 import Ai21Provider from './ai21';
+import Ai302Provider from './ai302';
 import Ai360Provider from './ai360';
 import AiHubMixProvider from './aihubmix';
 import AnthropicProvider from './anthropic';
@@ -169,6 +170,7 @@ export const DEFAULT_MODEL_PROVIDER_LIST = [
   Search1APIProvider,
   InfiniAIProvider,
   QiniuProvider,
+  Ai302Provider,
 ];
 
 export const filterEnabledModels = (provider: ModelProviderCard) => {
@@ -181,6 +183,7 @@ export const isProviderDisableBrowserRequest = (id: string) => {
 };
 
 export { default as Ai21ProviderCard } from './ai21';
+export { default as Ai302ProviderCard } from './ai302';
 export { default as Ai360ProviderCard } from './ai360';
 export { default as AiHubMixProviderCard } from './aihubmix';
 export { default as AnthropicProviderCard } from './anthropic';

package/src/database/models/__tests__/_test_template.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';

package/src/database/models/__tests__/agent.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';

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

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';

package/src/database/models/__tests__/aiProvider.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';

package/src/database/models/__tests__/asyncTask.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';

package/src/database/models/__tests__/chunk.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';

package/src/database/models/__tests__/file.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq, inArray } from 'drizzle-orm/expressions';
+import { eq, inArray } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';

package/src/database/models/__tests__/generationTopic.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';

package/src/database/models/__tests__/knowledgeBase.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { and, eq } from 'drizzle-orm/expressions';
+import { and, eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';

package/src/database/models/__tests__/message.test.ts

@@ -1,5 +1,5 @@
 import dayjs from 'dayjs';
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDB } from '@/database/models/__tests__/_util';

package/src/database/models/__tests__/session.test.ts

@@ -1,4 +1,4 @@
-import { and, eq, inArray } from 'drizzle-orm/expressions';
+import { and, eq, inArray } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';

package/src/database/models/__tests__/sessionGroup.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';

package/src/database/models/__tests__/topic.test.ts

@@ -1,4 +1,4 @@
-import { eq, inArray } from 'drizzle-orm/expressions';
+import { eq, inArray } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { LobeChatDatabase } from '@/database/type';

package/src/database/models/_template.ts

@@ -1,4 +1,4 @@
-import { and, desc, eq } from 'drizzle-orm/expressions';
+import { and, desc, eq } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 

package/src/database/models/agent.ts

@@ -1,4 +1,4 @@
-import { and, desc, eq, inArray } from 'drizzle-orm/expressions';
+import { and, desc, eq, inArray } from 'drizzle-orm';
 
 import {
   agents,

package/src/database/models/aiModel.ts

@@ -1,4 +1,4 @@
-import { and, asc, desc, eq, inArray } from 'drizzle-orm/expressions';
+import { and, asc, desc, eq, inArray } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import {

package/src/database/models/aiProvider.ts

@@ -1,4 +1,4 @@
-import { and, asc, desc, eq } from 'drizzle-orm/expressions';
+import { and, asc, desc, eq } from 'drizzle-orm';
 import { isEmpty } from 'lodash-es';
 
 import { DEFAULT_MODEL_PROVIDER_LIST } from '@/config/modelProviders';

package/src/database/models/apiKey.ts

@@ -1,4 +1,4 @@
-import { and, desc, eq } from 'drizzle-orm/expressions';
+import { and, desc, eq } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import { generateApiKey, isApiKeyExpired, validateApiKeyFormat } from '@/utils/apiKey';

package/src/database/models/asyncTask.ts

@@ -1,4 +1,4 @@
-import { and, eq, inArray, lt } from 'drizzle-orm/expressions';
+import { and, eq, inArray, lt } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import {

package/src/database/models/chunk.ts

@@ -1,5 +1,4 @@
-import { cosineDistance, count, sql } from 'drizzle-orm';
-import { and, asc, desc, eq, inArray, isNull } from 'drizzle-orm/expressions';
+import { and, asc, cosineDistance, count, desc, eq, inArray, isNull, sql } from 'drizzle-orm';
 import { chunk } from 'lodash-es';
 
 import { LobeChatDatabase } from '@/database/type';

package/src/database/models/document.ts

@@ -1,4 +1,4 @@
-import { and, desc, eq } from 'drizzle-orm/expressions';
+import { and, desc, eq } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 

package/src/database/models/embedding.ts

@@ -1,5 +1,4 @@
-import { count } from 'drizzle-orm';
-import { and, eq } from 'drizzle-orm/expressions';
+import { and, count, eq } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 

package/src/database/models/file.ts

@@ -1,5 +1,4 @@
-import { count, sum } from 'drizzle-orm';
-import { and, asc, desc, eq, ilike, inArray, like, notExists, or } from 'drizzle-orm/expressions';
+import { and, asc, count, desc, eq, ilike, inArray, like, notExists, or, sum } from 'drizzle-orm';
 import type { PgTransaction } from 'drizzle-orm/pg-core';
 
 import { LobeChatDatabase, Transaction } from '@/database/type';

package/src/database/models/generationTopic.ts

@@ -1,4 +1,4 @@
-import { and, desc, eq } from 'drizzle-orm/expressions';
+import { and, desc, eq } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import { FileService } from '@/server/services/file';

package/src/database/models/knowledgeBase.ts

@@ -1,4 +1,4 @@
-import { and, desc, eq, inArray } from 'drizzle-orm/expressions';
+import { and, desc, eq, inArray } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import { KnowledgeBaseItem } from '@/types/knowledgeBase';

package/src/database/models/message.ts

@@ -1,7 +1,6 @@
 import type { HeatmapsProps } from '@lobehub/charts';
 import dayjs from 'dayjs';
-import { count, sql } from 'drizzle-orm';
-import { and, asc, desc, eq, gt, inArray, isNotNull, isNull, like } from 'drizzle-orm/expressions';
+import { and, asc, count, desc, eq, gt, inArray, isNotNull, isNull, like, sql } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import {

package/src/database/models/plugin.ts

@@ -1,4 +1,4 @@
-import { and, desc, eq } from 'drizzle-orm/expressions';
+import { and, desc, eq } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import { LobeTool } from '@/types/tool';

package/src/database/models/session.ts

@@ -1,5 +1,18 @@
-import { Column, count, sql } from 'drizzle-orm';
-import { and, asc, desc, eq, gt, inArray, isNull, like, not, or } from 'drizzle-orm/expressions';
+import {
+  Column,
+  and,
+  asc,
+  count,
+  desc,
+  eq,
+  gt,
+  inArray,
+  isNull,
+  like,
+  not,
+  or,
+  sql,
+} from 'drizzle-orm';
 import type { PartialDeep } from 'type-fest';
 
 import { DEFAULT_INBOX_AVATAR } from '@/const/meta';

package/src/database/models/sessionGroup.ts

@@ -1,4 +1,4 @@
-import { and, asc, desc, eq } from 'drizzle-orm/expressions';
+import { and, asc, desc, eq } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import { idGenerator } from '@/database/utils/idGenerator';

package/src/database/models/thread.ts

@@ -1,4 +1,4 @@
-import { and, desc, eq } from 'drizzle-orm/expressions';
+import { and, desc, eq } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import { CreateThreadParams, ThreadStatus } from '@/types/topic';

package/src/database/models/topic.ts

@@ -1,5 +1,4 @@
-import { count, sql } from 'drizzle-orm';
-import { and, desc, eq, gt, ilike, inArray, isNull } from 'drizzle-orm/expressions';
+import { and, count, desc, eq, gt, ilike, inArray, isNull, sql } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import {

package/src/database/models/user.ts

@@ -1,6 +1,6 @@
 import { TRPCError } from '@trpc/server';
 import dayjs from 'dayjs';
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import type { AdapterAccount } from 'next-auth/adapters';
 import type { PartialDeep } from 'type-fest';
 

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

@@ -1,4 +1,4 @@
-import { and, eq, inArray } from 'drizzle-orm/expressions';
+import { and, eq, inArray } from 'drizzle-orm';
 import pMap from 'p-map';
 
 import * as EXPORT_TABLES from '@/database/schemas';

package/src/database/repositories/dataImporter/__tests__/index.test.ts

@@ -1,4 +1,4 @@
-import { eq, inArray } from 'drizzle-orm/expressions';
+import { eq, inArray } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDB } from '@/database/models/__tests__/_util';

package/src/database/repositories/dataImporter/deprecated/__tests__/index.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq, inArray } from 'drizzle-orm/expressions';
+import { eq, inArray } from 'drizzle-orm';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDBInstance } from '@/database/core/dbForTest';

package/src/database/repositories/dataImporter/deprecated/index.ts

@@ -1,5 +1,4 @@
-import { sql } from 'drizzle-orm';
-import { and, eq, inArray } from 'drizzle-orm/expressions';
+import { and, eq, inArray, sql } from 'drizzle-orm';
 
 import {
   agents,

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

@@ -1,4 +1,4 @@
-import { and, eq, inArray } from 'drizzle-orm/expressions';
+import { and, eq, inArray } from 'drizzle-orm';
 
 import * as EXPORT_TABLES from '@/database/schemas';
 import { LobeChatDatabase } from '@/database/type';

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

@@ -1,4 +1,4 @@
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { getTestDBInstance } from '@/database/core/dbForTest';

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

@@ -5,7 +5,7 @@ import type {
   AdapterUser,
   VerificationToken,
 } from '@auth/core/adapters';
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDBInstance } from '@/database/core/dbForTest';

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

@@ -1,6 +1,6 @@
 import { TRPCError } from '@trpc/server';
 import dayjs from 'dayjs';
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { INBOX_SESSION_ID } from '@/const/session';

package/src/database/server/models/ragEval/dataset.ts

@@ -1,4 +1,4 @@
-import { and, desc, eq } from 'drizzle-orm/expressions';
+import { and, desc, eq } from 'drizzle-orm';
 
 import { NewEvalDatasetsItem, evalDatasets } from '@/database/schemas';
 import { serverDB } from '@/database/server';

package/src/database/server/models/ragEval/datasetRecord.ts

@@ -1,4 +1,4 @@
-import { and, eq, inArray } from 'drizzle-orm/expressions';
+import { and, eq, inArray } from 'drizzle-orm';
 
 import { NewEvalDatasetRecordsItem, evalDatasetRecords, files } from '@/database/schemas';
 import { serverDB } from '@/database/server';

package/src/database/server/models/ragEval/evaluation.ts

@@ -1,5 +1,4 @@
-import { SQL, count } from 'drizzle-orm';
-import { and, desc, eq, inArray } from 'drizzle-orm/expressions';
+import { SQL, and, count, desc, eq, inArray } from 'drizzle-orm';
 
 import {
   NewEvalEvaluationItem,

package/src/database/server/models/ragEval/evaluationRecord.ts

@@ -1,4 +1,4 @@
-import { and, eq } from 'drizzle-orm/expressions';
+import { and, eq } from 'drizzle-orm';
 
 import { NewEvaluationRecordsItem, evaluationRecords } from '@/database/schemas';
 import { serverDB } from '@/database/server';

package/src/database/utils/genWhere.ts

@@ -1,6 +1,5 @@
 import dayjs, { Dayjs } from 'dayjs';
-import { SQL } from 'drizzle-orm';
-import { and, gte, lte } from 'drizzle-orm/expressions';
+import { SQL, and, gte, lte } from 'drizzle-orm';
 
 export const genWhere = (sqls: (SQL<any> | undefined)[]): SQL<any> | undefined => {
   const where = sqls.filter(Boolean);

package/src/features/User/UserAvatar.tsx

@@ -2,10 +2,13 @@
 
 import { Avatar, type AvatarProps } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
-import { forwardRef } from 'react';
+import { forwardRef, useMemo } from 'react';
 
 import { BRANDING_NAME } from '@/const/branding';
 import { DEFAULT_USER_AVATAR_URL } from '@/const/meta';
+import { isDesktop } from '@/const/version';
+import { useElectronStore } from '@/store/electron';
+import { electronSyncSelectors } from '@/store/electron/selectors';
 import { useUserStore } from '@/store/user';
 import { authSelectors, userProfileSelectors } from '@/store/user/selectors';
 
@@ -54,11 +57,24 @@ const UserAvatar = forwardRef<HTMLDivElement, UserAvatarProps>(
     ]);
 
     const isSignedIn = useUserStore(authSelectors.isLogin);
+    const remoteServerUrl = useElectronStore(electronSyncSelectors.remoteServerUrl);
+
+    // Process avatar URL for desktop environment
+    const avatarUrl = useMemo(() => {
+      if (!isSignedIn || !avatar) return DEFAULT_USER_AVATAR_URL;
+
+      // If in desktop environment and avatar starts with /, prepend the remote server URL
+      if (isDesktop && avatar.startsWith('/') && remoteServerUrl) {
+        return remoteServerUrl + avatar;
+      }
+
+      return avatar;
+    }, [isSignedIn, avatar, remoteServerUrl]);
 
     return (
       <Avatar
         alt={isSignedIn && !!username ? username : BRANDING_NAME}
-        avatar={isSignedIn && !!avatar ? avatar : DEFAULT_USER_AVATAR_URL}
+        avatar={avatarUrl}
         background={isSignedIn && avatar ? background : 'transparent'}
         className={cx(clickable && styles.clickable, className)}
         ref={ref}

package/src/libs/model-runtime/ai302/index.ts

@@ -0,0 +1,46 @@
+import { AgentRuntimeErrorType } from '../error';
+import { ChatCompletionErrorPayload, ModelProvider } from '../types';
+import { processMultiProviderModelList } from '../utils/modelParse';
+import { createOpenAICompatibleRuntime } from '../utils/openaiCompatibleFactory';
+
+export interface Ai302ModelCard {
+  id: string;
+}
+
+export const Lobe302AI = createOpenAICompatibleRuntime({
+  baseURL: 'https://api.302.ai/v1',
+  chatCompletion: {
+    handleError: (error: any): Omit<ChatCompletionErrorPayload, 'provider'> | undefined => {
+      let errorResponse: Response | undefined;
+      if (error instanceof Response) {
+        errorResponse = error;
+      } else if ('status' in (error as any)) {
+        errorResponse = error as Response;
+      }
+      if (errorResponse && errorResponse.status === 401) {
+        return {
+          error: errorResponse.status,
+          errorType: AgentRuntimeErrorType.InvalidProviderAPIKey,
+        };
+      }
+
+      return {
+        error,
+      };
+    },
+  },
+  debug: {
+    chatCompletion: () => process.env.DEBUG_SILICONCLOUD_CHAT_COMPLETION === '1',
+  },
+  errorType: {
+    bizError: AgentRuntimeErrorType.ProviderBizError,
+    invalidAPIKey: AgentRuntimeErrorType.InvalidProviderAPIKey,
+  },
+  models: async ({ client }) => {
+    const modelsPage = (await client.models.list()) as any;
+    const modelList: Ai302ModelCard[] = modelsPage.data;
+
+    return processMultiProviderModelList(modelList);
+  },
+  provider: ModelProvider.Ai302,
+});

package/src/libs/model-runtime/runtimeMap.ts

@@ -1,4 +1,5 @@
 import { LobeAi21AI } from './ai21';
+import { Lobe302AI } from './ai302';
 import { LobeAi360AI } from './ai360';
 import { LobeAiHubMixAI } from './aihubmix';
 import { LobeAnthropicAI } from './anthropic';
@@ -56,6 +57,7 @@ import { LobeZhipuAI } from './zhipu';
 
 export const providerRuntimeMap = {
   ai21: LobeAi21AI,
+  ai302: Lobe302AI,
   ai360: LobeAi360AI,
   aihubmix: LobeAiHubMixAI,
   anthropic: LobeAnthropicAI,

package/src/libs/model-runtime/types/type.ts

@@ -29,6 +29,7 @@ export interface CreateChatCompletionOptions {
 
 export enum ModelProvider {
   Ai21 = 'ai21',
+  Ai302 = 'ai302',
   Ai360 = 'ai360',
   AiHubMix = 'aihubmix',
   Anthropic = 'anthropic',

package/src/libs/next-auth/adapter/index.ts

@@ -4,7 +4,7 @@ import type {
   AdapterUser,
   VerificationToken,
 } from '@auth/core/adapters';
-import { and, eq } from 'drizzle-orm/expressions';
+import { and, eq } from 'drizzle-orm';
 import type { NeonDatabase } from 'drizzle-orm/neon-serverless';
 import { Adapter, AdapterAccount } from 'next-auth/adapters';
 

package/src/libs/oidc-provider/adapter.ts

@@ -1,6 +1,5 @@
 import debug from 'debug';
-import { sql } from 'drizzle-orm';
-import { eq } from 'drizzle-orm/expressions';
+import { eq, sql } from 'drizzle-orm';
 
 import {
   oidcAccessTokens,

package/src/server/routers/lambda/chunk.ts

@@ -1,5 +1,5 @@
 import { TRPCError } from '@trpc/server';
-import { inArray } from 'drizzle-orm/expressions';
+import { inArray } from 'drizzle-orm';
 import { z } from 'zod';
 
 import { DEFAULT_FILE_EMBEDDING_MODEL_ITEM } from '@/const/settings/knowledge';

package/src/services/session/client.test.ts

@@ -1,4 +1,4 @@
-import { eq, not } from 'drizzle-orm/expressions';
+import { eq, not } from 'drizzle-orm';
 import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { INBOX_SESSION_ID } from '@/const/session';

package/src/styles/antdOverride.ts

@@ -1,4 +1,5 @@
 import { Theme, css } from 'antd-style';
+import { rgba } from 'polished';
 
 export default ({ token }: { prefixCls: string; token: Theme }) => css`
   .${token.prefixCls}-popover {
@@ -15,4 +16,9 @@ export default ({ token }: { prefixCls: string; token: Theme }) => css`
       color: ${token.colorText};
     }
   }
+
+  .${token.prefixCls}-modal-mask, .${token.prefixCls}-drawer-mask {
+    background: ${rgba(token.colorBgLayout, 0.5)} !important;
+    backdrop-filter: blur(2px);
+  }
 `;