@lobehub/chat 1.13.0 → 1.13.2

package/CHANGELOG.md

@@ -2,6 +2,57 @@
 
 # Changelog
 
+### [Version 1.13.2](https://github.com/lobehub/lobe-chat/compare/v1.13.1...v1.13.2)
+
+<sup>Released on **2024-08-27**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Bypass vercel deployment protection, fix can send message on uploading files.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Bypass vercel deployment protection, closes [#3627](https://github.com/lobehub/lobe-chat/issues/3627) ([47da20d](https://github.com/lobehub/lobe-chat/commit/47da20d))
+- **misc**: Fix can send message on uploading files, closes [#3618](https://github.com/lobehub/lobe-chat/issues/3618) ([fe4329a](https://github.com/lobehub/lobe-chat/commit/fe4329a))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.13.1](https://github.com/lobehub/lobe-chat/compare/v1.13.0...v1.13.1)
+
+<sup>Released on **2024-08-27**</sup>
+
+#### 💄 Styles
+
+- **misc**: Update Qwen models.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Update Qwen models, closes [#3626](https://github.com/lobehub/lobe-chat/issues/3626) ([4393386](https://github.com/lobehub/lobe-chat/commit/4393386))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 1.13.0](https://github.com/lobehub/lobe-chat/compare/v1.12.20...v1.13.0)
 
 <sup>Released on **2024-08-27**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.13.0",
+  "version": "1.13.2",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",
@@ -100,6 +100,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^5.4.0",
+    "@ant-design/pro-components": "^2.7.10",
     "@anthropic-ai/sdk": "^0.24.3",
     "@auth/core": "0.28.0",
     "@aws-sdk/client-bedrock-runtime": "^3.637.0",
@@ -123,6 +124,7 @@
     "@lobehub/ui": "^1.149.2",
     "@neondatabase/serverless": "^0.9.4",
     "@next/third-parties": "^14.2.6",
+    "@react-spring/web": "^9.7.3",
     "@sentry/nextjs": "^7.119.0",
     "@t3-oss/env-nextjs": "^0.11.0",
     "@tanstack/react-query": "^5.52.1",
@@ -147,6 +149,7 @@
     "drizzle-zod": "^0.5.1",
     "fast-deep-equal": "^3.1.3",
     "file-type": "^19.4.1",
+    "framer-motion": "^11.2.6",
     "gpt-tokenizer": "^2.2.1",
     "i18next": "^23.14.0",
     "i18next-browser-languagedetector": "^7.2.1",
@@ -172,6 +175,7 @@
     "officeparser": "^4.1.1",
     "ollama": "^0.5.8",
     "openai": "^4.56.0",
+    "openapi-fetch": "^0.9.7",
     "partial-json": "^0.1.7",
     "pdf-parse": "^1.1.1",
     "pdfjs-dist": "4.4.168",
@@ -183,6 +187,7 @@
     "query-string": "^9.1.0",
     "random-words": "^2.0.1",
     "react": "^18.3.1",
+    "react-confetti": "^6.1.0",
     "react-dom": "^18.3.1",
     "react-fast-marquee": "^1.6.5",
     "react-hotkeys-hook": "^4.5.0",
@@ -199,6 +204,7 @@
     "rtl-detect": "^1.1.2",
     "semver": "^7.6.3",
     "sharp": "^0.33.5",
+    "stripe": "^15.8.0",
     "superjson": "^2.2.1",
     "svix": "^1.30.0",
     "swr": "^2.2.5",
@@ -270,12 +276,14 @@
     "markdown-table": "^3.0.3",
     "node-fetch": "^3.3.2",
     "node-gyp": "^10.2.0",
+    "openapi-typescript": "^6.7.6",
     "p-map": "^7.0.2",
     "prettier": "^3.3.3",
     "remark-cli": "^11.0.0",
     "remark-parse": "^10.0.2",
     "semantic-release": "^21.1.2",
     "stylelint": "^15.11.0",
+    "supports-color": "8",
     "tsx": "^4.17.0",
     "typescript": "^5.5.4",
     "unified": "^11.0.5",

package/src/app/(main)/settings/_layout/Desktop/index.tsx

@@ -6,8 +6,8 @@ import { memo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import SettingContainer from '@/features/Setting//SettingContainer';
 import Footer from '@/features/Setting/Footer';
+import SettingContainer from '@/features/Setting/SettingContainer';
 import { useActiveSettingsKey } from '@/hooks/useActiveSettingsKey';
 import { SettingsTabs } from '@/store/global/initialState';
 

package/src/components/ModelIcon/index.tsx

@@ -1,8 +1,8 @@
 import {
-  AiMass,
   Adobe,
   Ai21,
   Ai360,
+  AiMass,
   Aws,
   Aya,
   Azure,
@@ -49,6 +49,7 @@ const ModelIcon = memo<ModelProviderIconProps>(({ model: originModel, size = 12
   const model = originModel.toLowerCase();
 
   // currently supported models, maybe not in its own provider
+  if (model.includes('text-embedding-')) return <OpenAI.Avatar size={size} />;
   if (model.includes('gpt-3')) return <OpenAI.Avatar size={size} type={'gpt3'} />;
   if (model.includes('gpt-4')) return <OpenAI.Avatar size={size} type={'gpt4'} />;
   if (model.includes('glm-') || model.includes('chatglm')) return <ChatGLM.Avatar size={size} />;
@@ -63,7 +64,13 @@ const ModelIcon = memo<ModelProviderIconProps>(({ model: originModel, size = 12
   if (model.includes('moonshot')) return <Moonshot.Avatar size={size} />;
   if (model.includes('qwen')) return <Tongyi.Avatar background={Tongyi.colorPrimary} size={size} />;
   if (model.includes('minmax') || model.includes('abab')) return <Minimax.Avatar size={size} />;
-  if (model.includes('mistral') || model.includes('mixtral') || model.includes('codestral') || model.includes('mathstral')) return <Mistral.Avatar size={size} />;
+  if (
+    model.includes('mistral') ||
+    model.includes('mixtral') ||
+    model.includes('codestral') ||
+    model.includes('mathstral')
+  )
+    return <Mistral.Avatar size={size} />;
   if (model.includes('pplx') || model.includes('sonar')) return <Perplexity.Avatar size={size} />;
   if (model.includes('yi-')) return <Yi.Avatar size={size} />;
   if (model.startsWith('openrouter')) return <OpenRouter.Avatar size={size} />; // only for Cinematika and Auto
@@ -98,7 +105,8 @@ const ModelIcon = memo<ModelProviderIconProps>(({ model: originModel, size = 12
   )
     return <Stability.Avatar size={size} />;
 
-  if (model.includes('phi3') || model.includes('phi-3') || model.includes('wizardlm')) return <Azure.Avatar size={size} />;
+  if (model.includes('phi3') || model.includes('phi-3') || model.includes('wizardlm'))
+    return <Azure.Avatar size={size} />;
   if (model.includes('firefly')) return <Adobe.Avatar size={size} />;
   if (model.includes('jamba') || model.includes('j2-')) return <Ai21.Avatar size={size} />;
 });

package/src/config/modelProviders/qwen.ts

@@ -60,7 +60,7 @@ const Qwen: ModelProviderCard = {
       displayName: 'Qwen VL Plus',
       enabled: true,
       id: 'qwen-vl-plus',
-      tokens: 6144,
+      tokens: 8192,
       vision: true,
     },
     {
@@ -69,7 +69,41 @@ const Qwen: ModelProviderCard = {
       displayName: 'Qwen VL Max',
       enabled: true,
       id: 'qwen-vl-max',
-      tokens: 6144,
+      tokens: 8192,
+      vision: true,
+    },
+    {
+      description:
+        '以 Qwen-7B 语言模型初始化，添加图像模型，图像输入分辨率为448的预训练模型。',
+      displayName: 'Qwen VL',
+      enabled: true,
+      id: 'qwen-vl-v1',
+      tokens: 8192,
+      vision: true,
+    },
+    {
+      description:
+        '通义千问VL支持灵活的交互方式，包括多图、多轮问答、创作等能力的模型。',
+      displayName: 'Qwen VL Chat',
+      enabled: true,
+      id: 'qwen-vl-chat-v1',
+      tokens: 8192,
+      vision: true,
+    },
+    {
+      description: 'Qwen2-Math 模型具有强大的数学解题能力',
+      displayName: 'Qwen2 Math 72B',
+      enabled: true,
+      id: 'qwen2-math-72b-instruct',
+      tokens: 4096,
+    },
+    {
+      description:
+        '抢先体验即将升级的 qwen-vl-max 大模型。',
+      displayName: 'Qwen VL Max 0809',
+      enabled: true,
+      id: 'qwen-vl-max-0809',
+      tokens: 32_768,
       vision: true,
     },
   ],

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

@@ -570,4 +570,37 @@ describe('FileModel', () => {
     const data = await fileModel.countFilesByHash('hash1');
     expect(data).toEqual(2);
   });
+
+  describe('countUsage', () => {
+    const sharedFileList = [
+      {
+        name: 'document.pdf',
+        url: 'https://example.com/document.pdf',
+        size: 1000,
+        fileType: 'application/pdf',
+        userId,
+      },
+      {
+        name: 'image.jpg',
+        url: 'https://example.com/image.jpg',
+        size: 500,
+        fileType: 'image/jpeg',
+        userId,
+      },
+      {
+        name: 'audio.mp3',
+        url: 'https://example.com/audio.mp3',
+        size: 2000,
+        fileType: 'audio/mpeg',
+        userId,
+      },
+    ];
+
+    it('should get total size of files for the user', async () => {
+      await serverDB.insert(files).values(sharedFileList);
+      const size = await fileModel.countUsage();
+
+      expect(size).toBe(3500);
+    });
+  });
 });

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

@@ -1,4 +1,4 @@
-import { eq } from 'drizzle-orm';
+import { count, eq } from 'drizzle-orm';
 import { and } from 'drizzle-orm/expressions';
 
 import { serverDB } from '@/database/server';
@@ -47,4 +47,15 @@ export class EmbeddingModel {
       where: and(eq(embeddings.id, id), eq(embeddings.userId, this.userId)),
     });
   };
+
+  countUsage = async () => {
+    const result = await serverDB
+      .select({
+        count: count(),
+      })
+      .from(embeddings)
+      .where(eq(embeddings.userId, this.userId));
+
+    return result[0].count;
+  };
 }

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

@@ -1,4 +1,4 @@
-import { asc, count, eq, ilike, inArray, notExists } from 'drizzle-orm';
+import { asc, count, eq, ilike, inArray, notExists, sum } from 'drizzle-orm';
 import { and, desc } from 'drizzle-orm/expressions';
 
 import { serverDBEnv } from '@/config/db';
@@ -91,6 +91,17 @@ export class FileModel {
     return serverDB.delete(globalFiles).where(eq(globalFiles.hashId, hashId));
   };
 
+  countUsage = async () => {
+    const result = await serverDB
+      .select({
+        totalSize: sum(files.size),
+      })
+      .from(files)
+      .where(eq(files.userId, this.userId));
+
+    return parseInt(result[0].totalSize!) || 0;
+  };
+
   deleteMany = async (ids: string[]) => {
     const fileList = await this.findByIds(ids);
     const hashList = fileList.map((file) => file.fileHash!);

package/src/features/ChatInput/useSend.ts

@@ -18,10 +18,24 @@ export const useSendMessage = () => {
 
   const clearChatUploadFileList = useFileStore((s) => s.clearChatUploadFileList);
 
+  const isUploadingFiles = useFileStore(fileChatSelectors.isUploadingFiles);
+  const isSendButtonDisabledByMessage = useChatStore(chatSelectors.isSendButtonDisabledByMessage);
+
+  const canSend = !isUploadingFiles && !isSendButtonDisabledByMessage;
+
   const send = useCallback((params: UseSendMessageParams = {}) => {
     const store = useChatStore.getState();
     if (chatSelectors.isAIGenerating(store)) return;
 
+    // if uploading file or send button is disabled by message, then we should not send the message
+    const isUploadingFiles = fileChatSelectors.isUploadingFiles(useFileStore.getState());
+    const isSendButtonDisabledByMessage = chatSelectors.isSendButtonDisabledByMessage(
+      useChatStore.getState(),
+    );
+
+    const canSend = !isUploadingFiles && !isSendButtonDisabledByMessage;
+    if (!canSend) return;
+
     const fileList = fileChatSelectors.chatUploadFileList(useFileStore.getState());
     // if there is no message and no image, then we should not send the message
     if (!store.inputMessage && fileList.length === 0) return;
@@ -44,10 +58,5 @@ export const useSendMessage = () => {
     // }
   }, []);
 
-  const isUploadingFiles = useFileStore(fileChatSelectors.isUploadingFiles);
-  const isSendButtonDisabledByMessage = useChatStore(chatSelectors.isSendButtonDisabledByMessage);
-
-  const canSend = !isUploadingFiles && !isSendButtonDisabledByMessage;
-
   return useMemo(() => ({ canSend, send }), [canSend]);
 };

package/src/features/Setting/SettingContainer.tsx

@@ -4,32 +4,37 @@ import { useResponsive } from 'antd-style';
 import { PropsWithChildren, ReactNode, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-const SettingContainer = memo<
-  PropsWithChildren<{ addonAfter?: ReactNode; addonBefore?: ReactNode }>
->(({ children, addonAfter, addonBefore }) => {
-  const { mobile = false } = useResponsive();
-  return (
-    <Flexbox
-      align={'center'}
-      height={'100%'}
-      paddingBlock={mobile ? undefined : 32}
-      style={{ overflowX: 'hidden', overflowY: 'auto' }}
-      width={'100%'}
-    >
-      {addonBefore}
+interface SettingContainerProps {
+  addonAfter?: ReactNode;
+  addonBefore?: ReactNode;
+  fullWidth?: boolean;
+}
+const SettingContainer = memo<PropsWithChildren<SettingContainerProps>>(
+  ({ children, addonAfter, addonBefore, fullWidth }) => {
+    const { mobile = false } = useResponsive();
+    return (
       <Flexbox
-        gap={64}
-        paddingInline={mobile ? undefined : 24}
-        style={{
-          maxWidth: 1024,
-        }}
+        align={'center'}
+        height={'100%'}
+        paddingBlock={mobile ? undefined : 32}
+        style={{ overflowX: 'hidden', overflowY: 'auto' }}
         width={'100%'}
       >
-        {children}
+        {addonBefore}
+        <Flexbox
+          gap={64}
+          paddingInline={mobile ? undefined : 24}
+          style={{
+            maxWidth: fullWidth ? undefined : 1024,
+          }}
+          width={'100%'}
+        >
+          {children}
+        </Flexbox>
+        {addonAfter}
       </Flexbox>
-      {addonAfter}
-    </Flexbox>
-  );
-});
+    );
+  },
+);
 
 export default SettingContainer;

package/src/server/context.ts

@@ -4,7 +4,6 @@ import { User } from 'next-auth';
 import { NextRequest } from 'next/server';
 
 import { JWTPayload, LOBE_CHAT_AUTH_HEADER, enableClerk, enableNextAuth } from '@/const/auth';
-import NextAuthEdge from '@/libs/next-auth/edge';
 
 type ClerkAuth = ReturnType<typeof getAuth>;
 
@@ -55,6 +54,8 @@ export const createContext = async (request: NextRequest): Promise<Context> => {
 
   if (enableNextAuth) {
     try {
+      const { default: NextAuthEdge } = await import('@/libs/next-auth/edge');
+
       const session = await NextAuthEdge.auth();
       if (session && session?.user?.id) {
         auth = session.user;

package/src/server/routers/async/caller.ts

@@ -11,14 +11,17 @@ import type { AsyncRouter } from './index';
 
 export const createAsyncServerClient = async (userId: string, payload: JWTPayload) => {
   const gateKeeper = await KeyVaultsGateKeeper.initWithEnvKey();
-
+  const headers: Record<string, string> = {
+    Authorization: `Bearer ${serverDBEnv.KEY_VAULTS_SECRET}`,
+    [LOBE_CHAT_AUTH_HEADER]: await gateKeeper.encrypt(JSON.stringify({ payload, userId })),
+  };
+  if (process.env.VERCEL_AUTOMATION_BYPASS_SECRET) {
+    headers['x-vercel-protection-bypass'] = process.env.VERCEL_AUTOMATION_BYPASS_SECRET;
+  }
   return createTRPCClient<AsyncRouter>({
     links: [
       httpBatchLink({
-        headers: {
-          Authorization: `Bearer ${serverDBEnv.KEY_VAULTS_SECRET}`,
-          [LOBE_CHAT_AUTH_HEADER]: await gateKeeper.encrypt(JSON.stringify({ payload, userId })),
-        },
+        headers,
         transformer: superjson,
         url: urlJoin(appEnv.APP_URL!, '/trpc/async'),
       }),

package/src/store/chat/slices/message/selectors.ts

@@ -175,7 +175,6 @@ const isHasMessageLoading = (s: ChatStore) => s.messageLoadingIds.length > 0;
 
 /**
  * this function is used to determine whether the send button should be disabled
- * @param s
  */
 const isSendButtonDisabledByMessage = (s: ChatStore) =>
   // 1. when there is message loading

package/src/utils/format.ts

@@ -46,3 +46,11 @@ export const formatTime = (timeInSeconds: number): string => {
     return `${(timeInSeconds / 3600).toFixed(2)} h`;
   }
 };
+
+/**
+ * format number with comma
+ * @param num
+ */
+export const formatNumber = (num: any) => {
+  return new Intl.NumberFormat('en-US').format(num);
+};