@lobehub/chat 0.151.2 → 0.151.4

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 0.151.4](https://github.com/lobehub/lobe-chat/compare/v0.151.3...v0.151.4)
+
+<sup>Released on **2024-04-29**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Move app page to the `(main)` layout group.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Move app page to the `(main)` layout group, closes [#2297](https://github.com/lobehub/lobe-chat/issues/2297) ([6cc2c38](https://github.com/lobehub/lobe-chat/commit/6cc2c38))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 0.151.3](https://github.com/lobehub/lobe-chat/compare/v0.151.2...v0.151.3)
+
+<sup>Released on **2024-04-29**</sup>
+
+#### 💄 Styles
+
+- **misc**: Patching models info.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Patching models info, closes [#2269](https://github.com/lobehub/lobe-chat/issues/2269) [#22802280](https://github.com/lobehub/lobe-chat/issues/22802280) ([03bcb06](https://github.com/lobehub/lobe-chat/commit/03bcb06))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.151.2](https://github.com/lobehub/lobe-chat/compare/v0.151.1...v0.151.2)
 
 <sup>Released on **2024-04-29**</sup>

package/README.md

@@ -626,7 +626,7 @@ Every bit counts and your one-time donation sparkles in our galaxy of support! Y
 
 </details>
 
-Copyright © 2023 [LobeHub][profile-link]. <br />
+Copyright © 2024 [LobeHub][profile-link]. <br />
 This project is [MIT](./LICENSE) licensed.
 
 <!-- LINK GROUP -->

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.151.2",
+  "version": "0.151.4",
   "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",

package/src/app/{chat → (main)/chat}/(desktop)/features/SideBar/index.tsx

@@ -3,7 +3,6 @@ import { createStyles } from 'antd-style';
 import dynamic from 'next/dynamic';
 import { memo } from 'react';
 
-import TopicListContent from '@/app/chat/features/TopicListContent';
 import SafeSpacing from '@/components/SafeSpacing';
 import { CHAT_SIDEBAR_WIDTH } from '@/const/layoutTokens';
 import { useGlobalStore } from '@/store/global';
@@ -11,6 +10,8 @@ import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfi
 import { useSessionStore } from '@/store/session';
 import { sessionSelectors } from '@/store/session/selectors';
 
+import TopicListContent from '../../../features/TopicListContent';
+
 const SystemRole = dynamic(() => import('./SystemRole'));
 
 const useStyles = createStyles(({ css, token }) => ({

package/src/app/{chat → (main)/chat}/settings/(desktop)/Header.tsx

@@ -3,7 +3,7 @@ import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import HeaderContent from '@/app/chat/settings/features/HeaderContent';
+import HeaderContent from '@/app/(main)/chat/settings/features/HeaderContent';
 import { pathString } from '@/utils/url';
 
 const Header = memo(() => {

package/src/app/{market → (main)/market}/features/TagList/index.tsx

@@ -2,7 +2,7 @@ import { Skeleton } from 'antd';
 import { Suspense, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import Inner from '@/app/market/features/TagList/Inner';
+import Inner from './Inner';
 
 const TagList = memo(() => {
   return (

package/src/app/{settings → (main)/settings}/about/Analytics.tsx

@@ -3,10 +3,11 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import { useStyles } from '@/app/settings/about/style';
 import { useUserStore } from '@/store/user';
 import { preferenceSelectors } from '@/store/user/selectors';
 
+import { useStyles } from './style';
+
 const Analytics = memo(() => {
   const { t } = useTranslation('setting');
   const { styles } = useStyles();

package/src/app/{settings → (main)/settings}/common/Common.tsx

@@ -6,7 +6,7 @@ import { signIn, signOut } from 'next-auth/react';
 import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useSyncSettings } from '@/app/settings/hooks/useSyncSettings';
+import { useSyncSettings } from '@/app/(main)/settings/hooks/useSyncSettings';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import { DEFAULT_SETTINGS } from '@/const/settings';
 import { useOAuthSession } from '@/hooks/useOAuthSession';

package/src/app/{settings → (main)/settings}/common/Theme.tsx

@@ -5,7 +5,7 @@ import { Monitor, Moon, Palette, Sun } from 'lucide-react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useSyncSettings } from '@/app/settings/hooks/useSyncSettings';
+import { useSyncSettings } from '@/app/(main)/settings/hooks/useSyncSettings';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import { imageUrl } from '@/const/url';
 import AvatarWithUpload from '@/features/AvatarWithUpload';

package/src/app/{settings → (main)/settings}/llm/components/ProviderConfig/index.tsx

@@ -4,13 +4,13 @@ import { debounce } from 'lodash-es';
 import { ReactNode, memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useSyncSettings } from '@/app/settings/hooks/useSyncSettings';
+import { useSyncSettings } from '@/app/(main)/settings/hooks/useSyncSettings';
 import {
   LLMProviderApiTokenKey,
   LLMProviderBaseUrlKey,
   LLMProviderConfigKey,
   LLMProviderModelListKey,
-} from '@/app/settings/llm/const';
+} from '@/app/(main)/settings/llm/const';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import { useUserStore } from '@/store/user';
 import { modelConfigSelectors } from '@/store/user/selectors';

package/src/app/{settings → (main)/settings}/sync/WebRTC/ChannelNameInput.tsx

@@ -5,7 +5,7 @@ import { LucideDices } from 'lucide-react';
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { generateRandomRoomName } from '@/app/settings/sync/util';
+import { generateRandomRoomName } from '../util';
 
 interface ChannelNameInputProps extends Omit<InputProps, 'form'> {
   form: FormInstance;

package/src/app/{welcome → (main)/welcome}/(desktop)/features/Showcase.tsx

@@ -4,7 +4,7 @@ import { GridShowcase } from '@lobehub/ui';
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
-import Banner from '@/app/welcome/features/Banner';
+import Banner from '@/app/(main)/welcome/features/Banner';
 
 const Showcase = memo(() => (
   <Flexbox

package/src/app/{welcome → (main)/welcome}/(mobile)/index.tsx

@@ -1,7 +1,7 @@
 import { memo } from 'react';
 import { Center, Flexbox } from 'react-layout-kit';
 
-import Banner from '@/app/welcome/features/Banner';
+import Banner from '../features/Banner';
 
 const Showcase = memo(() => (
   <Flexbox align={'center'} justify={'center'} style={{ height: 'calc(100% - 44px)' }}>

package/src/app/page.tsx

@@ -2,17 +2,19 @@ import { Metadata } from 'next';
 
 import { getCanonicalUrl } from '@/const/url';
 
-import Page from './home';
-import Redirect from './home/Redirect';
+import Client from './(loading)/Client';
+import Redirect from './(loading)/Redirect';
 
-const Index = () => (
-  <>
-    <Page />
-    <Redirect />
-  </>
-);
+const Page = () => {
+  return (
+    <>
+      <Client />
+      <Redirect />
+    </>
+  );
+};
 
-export default Index;
+export default Page;
 
 export const metadata: Metadata = {
   alternates: { canonical: getCanonicalUrl('/') },

package/src/config/modelProviders/anthropic.ts

@@ -1,6 +1,6 @@
 import { ModelProviderCard } from '@/types/llm';
 
-// ref https://docs.anthropic.com/claude/docs/models-overview
+// ref https://docs.anthropic.com/claude/docs/models-overview#model-comparison
 const Anthropic: ModelProviderCard = {
   chatModels: [
     {

package/src/config/modelProviders/azure.ts

@@ -1,5 +1,6 @@
 import { ModelProviderCard } from '@/types/llm';
 
+// ref https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models
 const Azure: ModelProviderCard = {
   chatModels: [
     {

package/src/config/modelProviders/bedrock.ts

@@ -56,14 +56,14 @@ const Bedrock: ModelProviderCard = {
       displayName: 'Llama 2 Chat 13B',
       enabled: true,
       id: 'meta.llama2-13b-chat-v1',
-      tokens: 4000,
+      tokens: 4096,
     },
     {
       description: 'Llama 2 Chat 70B v1，上下文大小为 4k，Llama 2 模型的对话用例优化变体。',
       displayName: 'Llama 2 Chat 70B',
       enabled: true,
       id: 'meta.llama2-70b-chat-v1',
-      tokens: 4000,
+      tokens: 4096,
     },
   ],
   id: 'bedrock',

package/src/config/modelProviders/google.ts

@@ -1,6 +1,7 @@
 import { ModelProviderCard } from '@/types/llm';
 
 // ref https://ai.google.dev/models/gemini
+// api https://ai.google.dev/api/rest/v1beta/models/list
 const Google: ModelProviderCard = {
   chatModels: [
     {
@@ -8,13 +9,14 @@ const Google: ModelProviderCard = {
       displayName: 'PaLM 2 Chat (Legacy)',
       id: 'chat-bison-001',
       maxOutput: 1024,
+      // tokens: 4096 + 1024, // none tokens test
     },
     {
       description: 'A legacy model that understands text and generates text as an output',
       displayName: 'PaLM 2 (Legacy)',
       id: 'text-bison-001',
       maxOutput: 1024,
-      tokens: 9220,
+      tokens: 8196 + 1024,
     },
     {
       description: 'The best model for scaling across a wide range of tasks',
@@ -22,14 +24,14 @@ const Google: ModelProviderCard = {
       enabled: true,
       id: 'gemini-pro',
       maxOutput: 2048,
-      tokens: 32_768,
+      tokens: 30_720 + 2048,
     },
     {
       description: 'The best image understanding model to handle a broad range of applications',
       displayName: 'Gemini 1.0 Pro Vision',
       id: 'gemini-1.0-pro-vision-latest',
       maxOutput: 4096,
-      tokens: 16_384,
+      tokens: 12_288 + 4096,
       vision: true,
     },
     {
@@ -38,7 +40,7 @@ const Google: ModelProviderCard = {
       enabled: true,
       id: 'gemini-pro-vision',
       maxOutput: 4096,
-      tokens: 16_384,
+      tokens: 12_288 + 4096,
       vision: true,
     },
     {
@@ -47,7 +49,7 @@ const Google: ModelProviderCard = {
       displayName: 'Gemini 1.0 Pro 001 (Tuning)',
       id: 'gemini-1.0-pro-001',
       maxOutput: 2048,
-      tokens: 32_768,
+      tokens: 30_720 + 2048,
     },
     {
       description:
@@ -55,7 +57,7 @@ const Google: ModelProviderCard = {
       displayName: 'Gemini 1.0 Pro Latest',
       id: 'gemini-1.0-pro-latest',
       maxOutput: 2048,
-      tokens: 32_768,
+      tokens: 30_720 + 2048,
     },
     {
       description: 'Mid-size multimodal model that supports up to 1 million tokens',
@@ -63,7 +65,7 @@ const Google: ModelProviderCard = {
       enabled: true,
       id: 'gemini-1.5-pro-latest',
       maxOutput: 8192,
-      tokens: 1_056_768,
+      tokens: 1_048_576 + 8192,
       vision: true,
     },
     {

package/src/config/modelProviders/groq.ts

@@ -29,7 +29,6 @@ const Groq: ModelProviderCard = {
     },
     {
       displayName: 'LLaMA2-70b-chat',
-      enabled: true,
       id: 'llama2-70b-4096',
       tokens: 4096,
     },

package/src/config/modelProviders/minimax.ts

@@ -1,7 +1,22 @@
 import { ModelProviderCard } from '@/types/llm';
 
+// ref https://www.minimaxi.com/document/guides/chat-model/pro/api
 const Minimax: ModelProviderCard = {
   chatModels: [
+    {
+      description: '复杂场景，例如应用题计算、科学计算等场景',
+      displayName: 'abab6.5',
+      enabled: true,
+      id: 'abab6.5-chat',
+      tokens: 8192,
+    },
+    {
+      description: '通用场景',
+      displayName: 'abab6.5s',
+      enabled: true,
+      id: 'abab6.5s-chat',
+      tokens: 245_760,
+    },
     {
       description: '更复杂的格式化文本生成',
       displayName: 'abab6',

package/src/config/modelProviders/mistral.ts

@@ -1,6 +1,6 @@
 import { ModelProviderCard } from '@/types/llm';
 
-// ref https://docs.mistral.ai/platform/pricing/#chat-completions-api
+// ref https://docs.mistral.ai/getting-started/models/
 const Mistral: ModelProviderCard = {
   chatModels: [
     {

package/src/config/modelProviders/moonshot.ts

@@ -1,5 +1,6 @@
 import { ModelProviderCard } from '@/types/llm';
 
+// ref https://platform.moonshot.cn/docs/intro#模型列表
 const Moonshot: ModelProviderCard = {
   chatModels: [
     {

package/src/config/modelProviders/ollama.ts

@@ -6,7 +6,7 @@ const Ollama: ModelProviderCard = {
       displayName: 'Llama3 8B',
       enabled: true,
       id: 'llama3',
-      tokens: 8000,
+      tokens: 8000, // https://huggingface.co/blog/zh/llama3#llama-3-的新进展
     },
     {
       displayName: 'Llama3 70B',
@@ -17,48 +17,48 @@ const Ollama: ModelProviderCard = {
       displayName: 'Command R 35B',
       enabled: true,
       id: 'command-r',
-      tokens: 128_000,
+      tokens: 131_072, // https://huggingface.co/CohereForAI/c4ai-command-r-v01/blob/main/config.json
     },
     {
       displayName: 'Command R+ 104B (Q2_K)',
       id: 'command-r-plus:104b-q2_K',
-      tokens: 128_000,
+      tokens: 131_072, // https://huggingface.co/CohereForAI/c4ai-command-r-plus/blob/main/config.json
     },
     {
       displayName: 'Gemma 7B',
       enabled: true,
       id: 'gemma',
-      tokens: 4000,
+      tokens: 8192, // https://huggingface.co/google/gemma-7b-it/discussions/73#65e9678c0cda621164a95bad
     },
     {
       displayName: 'Gemma 2B',
       id: 'gemma:2b',
-      tokens: 4000,
+      tokens: 8192,
     },
     {
       displayName: 'Llama2 Chat 13B',
       id: 'llama2:13b',
-      tokens: 4000,
+      tokens: 4096, // https://llama.meta.com/llama2/
     },
     {
       displayName: 'Llama2 Chat 7B',
       id: 'llama2',
-      tokens: 4000,
+      tokens: 4096,
     },
     {
       displayName: 'Llama2 Chat 70B',
       id: 'llama2:70b',
-      tokens: 4000,
+      tokens: 4096,
     },
     {
       displayName: 'Llama2 CN 13B',
       id: 'llama2-chinese:13b',
-      tokens: 4000,
+      tokens: 4096,
     },
     {
       displayName: 'Llama2 CN 7B',
       id: 'llama2-chinese',
-      tokens: 4000,
+      tokens: 4096,
     },
     {
       displayName: 'WizardLM 2 7B',
@@ -74,45 +74,45 @@ const Ollama: ModelProviderCard = {
     {
       displayName: 'Code Llama 7B',
       id: 'codellama',
-      tokens: 16_000,
+      tokens: 16_384, // https://huggingface.co/codellama/CodeLlama-7b-hf/blob/main/config.json
     },
     {
       displayName: 'Code Llama 34B',
       id: 'codellama:34b',
-      tokens: 16_000,
+      tokens: 16_384,
     },
     {
       displayName: 'Code Llama 70B',
       id: 'codellama:70b',
-      tokens: 16_000,
+      tokens: 16_384,
     },
     {
       displayName: 'Code Llama 7B (Python)',
       id: 'codellama:python',
-      tokens: 16_000,
+      tokens: 16_384,
     },
     {
       displayName: 'Phi3-Instruct 3.8B',
       enabled: true,
       id: 'phi3:instruct',
-      tokens: 128_000,
+      tokens: 131_072, // https://huggingface.co/microsoft/Phi-3-mini-128k-instruct/blob/main/config.json
     },
     {
       displayName: 'Mistral',
       enabled: true,
       id: 'mistral',
-      tokens: 4800,
+      tokens: 32_768, // https://huggingface.co/mistralai/Mistral-7B-Instruct-v0.2/blob/main/config.json
     },
     {
       displayName: 'Mixtral 8x7B',
       enabled: true,
       id: 'mixtral',
-      tokens: 32_000,
+      tokens: 32_768,
     },
     {
       displayName: 'Mixtral 8x22B',
       id: 'mixtral:8x22b',
-      tokens: 64_000,
+      tokens: 65_536, // https://huggingface.co/mistralai/Mixtral-8x22B-v0.1/blob/main/config.json
     },
     {
       displayName: 'Qwen Chat 4B',
@@ -138,19 +138,19 @@ const Ollama: ModelProviderCard = {
     {
       displayName: 'LLaVA 7B',
       id: 'llava',
-      tokens: 4000,
+      tokens: 4096, // https://huggingface.co/llava-hf/llava-1.5-7b-hf/blob/main/config.json
       vision: true,
     },
     {
       displayName: 'LLaVA 13B',
       id: 'llava:13b',
-      tokens: 4000,
+      tokens: 4096,
       vision: true,
     },
     {
       displayName: 'LLaVA 34B',
       id: 'llava:34b',
-      tokens: 4000,
+      tokens: 4096,
       vision: true,
     },
   ],

package/src/config/modelProviders/openai.ts

@@ -1,6 +1,6 @@
 import { ModelProviderCard } from '@/types/llm';
 
-// refs to: https://platform.openai.com/docs/models/gpt-4-turbo-and-gpt-4
+// ref https://platform.openai.com/docs/models
 const OpenAI: ModelProviderCard = {
   chatModels: [
     {

package/src/config/modelProviders/togetherai.ts

@@ -1,6 +1,6 @@
 import { ModelProviderCard } from '@/types/llm';
 
-// ref https://api.together.xyz/models
+// ref https://docs.together.ai/docs/inference-models
 const TogetherAI: ModelProviderCard = {
   chatModels: [
     {

package/src/config/modelProviders/zeroone.ts

@@ -1,5 +1,6 @@
 import { ModelProviderCard } from '@/types/llm';
 
+// ref https://platform.lingyiwanwu.com/
 const ZeroOne: ModelProviderCard = {
   chatModels: [
     {
@@ -7,7 +8,7 @@ const ZeroOne: ModelProviderCard = {
       displayName: 'YI 34B Chat',
       enabled: true,
       id: 'yi-34b-chat-0205',
-      tokens: 4000,
+      tokens: 4096, // https://huggingface.co/01-ai/Yi-34B-Chat/blob/main/config.json
     },
     {
       description:
@@ -15,7 +16,7 @@ const ZeroOne: ModelProviderCard = {
       displayName: 'YI Vision Plus',
       enabled: true,
       id: 'yi-vl-plus',
-      tokens: 4000,
+      tokens: 4096,
       vision: true,
     },
     {
@@ -23,7 +24,7 @@ const ZeroOne: ModelProviderCard = {
       displayName: 'YI 34B Chat 200k',
       enabled: true,
       id: 'yi-34b-chat-200k',
-      tokens: 200_000,
+      tokens: 200_000, // https://huggingface.co/01-ai/Yi-34B-200K/blob/main/config.json
     },
   ],
   id: 'zeroone',

package/src/config/modelProviders/zhipu.ts

@@ -1,8 +1,10 @@
 import { ModelProviderCard } from '@/types/llm';
 
 // TODO: 等待 ZhiPu 修复 API 问题后开启 functionCall
-// refs: https://github.com/lobehub/lobe-chat/discussions/737#discussioncomment-8315815
 // 暂时不透出 GLM 系列的 function_call 功能
+// refs https://github.com/lobehub/lobe-chat/discussions/737#discussioncomment-8315815
+
+// ref https://open.bigmodel.cn/dev/howuse/model
 const ZhiPu: ModelProviderCard = {
   chatModels: [
     {
@@ -19,7 +21,7 @@ const ZhiPu: ModelProviderCard = {
       displayName: 'GLM-4 Vision',
       enabled: true,
       id: 'glm-4v',
-      tokens: 128_000,
+      tokens: 2000,
       vision: true,
     },
     {

package/src/migrations/FromV3ToV4/fixtures/ollama-output-v4.json

@@ -48,7 +48,7 @@
               "displayName": "LLaVA 7B",
               "enabled": true,
               "id": "llava",
-              "tokens": 4000,
+              "tokens": 4096,
               "vision": true
             }
           ]

package/src/store/user/slices/settings/actions/llm.test.ts

@@ -109,7 +109,7 @@ describe('LLMSettingsSliceAction', () => {
         displayName: 'LLaVA 7B',
         enabled: true,
         id: 'llava',
-        tokens: 4000,
+        tokens: 4096,
         vision: true,
       });
     });

package/src/types/llm.ts

@@ -32,7 +32,7 @@ export interface ChatModelCard {
   legacy?: boolean;
   maxOutput?: number;
   /**
-   * the context window
+   * the context window (or input + output tokens limit)
    */
   tokens?: number;
   /**