@lobehub/chat 0.117.2 → 0.117.3

package/CHANGELOG.md

@@ -2,6 +2,33 @@
 
 # Changelog
 
+### [Version 0.117.3](https://github.com/lobehub/lobe-chat/compare/v0.117.2...v0.117.3)
+
+<sup>Released on **2023-12-28**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix tool calls at end, fix vision model max tokens, improve vision model checker.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix tool calls at end ([b0b615a](https://github.com/lobehub/lobe-chat/commit/b0b615a))
+- **misc**: Fix vision model max tokens ([8b704a0](https://github.com/lobehub/lobe-chat/commit/8b704a0))
+- **misc**: Improve vision model checker ([da7d177](https://github.com/lobehub/lobe-chat/commit/da7d177))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.117.2](https://github.com/lobehub/lobe-chat/compare/v0.117.1...v0.117.2)
 
 <sup>Released on **2023-12-28**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.117.2",
+  "version": "0.117.3",
   "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/chains/__tests__/summaryTitle.test.ts

@@ -1,6 +1,5 @@
 import { Mock, describe, expect, it, vi } from 'vitest';
 
-import { ModelTokens } from '@/const/modelTokens';
 import { chatHelpers } from '@/store/chat/helpers';
 import { globalHelpers } from '@/store/global/helpers';
 import { LanguageModel } from '@/types/llm';

package/src/const/llm.ts

@@ -14,4 +14,19 @@ export const LanguageModelWhiteList = [
 export const DEFAULT_OPENAI_MODEL_LIST: string[] = Object.values(LanguageModel);
 
 // vision model white list, these models will change the content from string to array
-export const VISION_MODEL_WHITE_LIST = ['gpt-4-vision-preview'];
+// refs: https://github.com/lobehub/lobe-chat/issues/790
+export const isVisionModel = (model?: string) => !!model && model.includes('vision');
+
+// refs: https://github.com/lobehub/lobe-chat/issues/837
+export const GPT4_VISION_MODEL_DEFAULT_MAX_TOKENS = 2048;
+
+// refs to: https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo
+export const ModelTokens: Record<LanguageModel, number> = {
+  [LanguageModel.GPT3_5]: 4096,
+  [LanguageModel.GPT3_5_1106]: 16_385,
+  [LanguageModel.GPT3_5_16K]: 16_385,
+  [LanguageModel.GPT4]: 8196,
+  [LanguageModel.GPT4_PREVIEW]: 128_000,
+  [LanguageModel.GPT4_VISION_PREVIEW]: 128_000,
+  [LanguageModel.GPT4_32K]: 32_768,
+};

package/src/const/message.ts

@@ -3,4 +3,13 @@ export const LOADING_FLAT = '...';
 //  start with this，it should be a function message
 export const FUNCTION_MESSAGE_FLAG = '{"tool_calls"';
 
-export const FUNCTION_LOADING = 'FUNCTION_LOADING';
+export const isFunctionMessageAtStart = (content: string) => {
+  return content.startsWith(FUNCTION_MESSAGE_FLAG);
+};
+
+export const testFunctionMessageAtEnd = (content: string) => {
+  const regExp = /{"tool_calls":.*?}}/;
+  const match = content.match(regExp);
+
+  return { content: match ? match[0] : '', valid: match };
+};

package/src/const/settings.ts

@@ -27,8 +27,6 @@ export const DEFAUTT_AGENT_TTS_CONFIG: LobeAgentTTSConfig = {
   },
 };
 
-export const VISION_MODEL_DEFAULT_MAX_TOKENS = 1000;
-
 export const COOKIE_CACHE_DAYS = 30;
 
 export const DEFAULT_AGENT_CONFIG: LobeAgentConfig = {

package/src/features/AgentSetting/AgentPrompt/index.tsx

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { FORM_STYLE } from '@/const/layoutTokens';
-import { ModelTokens } from '@/const/modelTokens';
+import { ModelTokens } from '@/const/llm';
 import { useTokenCount } from '@/hooks/useTokenCount';
 import { LanguageModel } from '@/types/llm';
 

package/src/features/ChatInput/ActionBar/Token/TokenTag.tsx

@@ -2,7 +2,7 @@ import { TokenTag, Tooltip } from '@lobehub/ui';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { ModelTokens } from '@/const/modelTokens';
+import { ModelTokens } from '@/const/llm';
 import { useTokenCount } from '@/hooks/useTokenCount';
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';

package/src/features/Conversation/ChatList/Messages/Assistant.tsx

@@ -1,9 +1,9 @@
 import { ReactNode, memo } from 'react';
 
+import { isFunctionMessageAtStart } from '@/const/message';
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
 import { ChatMessage } from '@/types/message';
-import { isFunctionMessageAtStart } from '@/utils/message';
 
 import Inspector from '../Plugins/Inspector';
 import { DefaultMessage } from './Default';

package/src/features/PluginDevModal/UrlManifestForm.tsx

@@ -12,24 +12,27 @@ import { useToolStore } from '@/store/tool';
 import { pluginSelectors } from '@/store/tool/selectors';
 import { PluginInstallError } from '@/types/tool/plugin';
 
-const ProxyChecker = memo<{ onChange?: (value: boolean) => void; value?: boolean }>(
-  ({ value, onChange }) => {
-    const { t } = useTranslation('plugin');
+interface ProxyCheckerProps {
+  onChange?: (value: boolean) => void;
+  value?: boolean;
+}
 
-    return (
-      <Flexbox
-        gap={8}
-        horizontal
-        onClick={() => {
-          onChange?.(!value);
-        }}
-        style={{ cursor: 'pointer' }}
-      >
-        <Checkbox checked={value} /> {t('dev.customParams.useProxy.label')}
-      </Flexbox>
-    );
-  },
-);
+const ProxyChecker = memo<ProxyCheckerProps>(({ value, onChange }) => {
+  const { t } = useTranslation('plugin');
+
+  return (
+    <Flexbox
+      gap={8}
+      horizontal
+      onClick={() => {
+        onChange?.(!value);
+      }}
+      style={{ cursor: 'pointer' }}
+    >
+      <Checkbox checked={value} /> {t('dev.customParams.useProxy.label')}
+    </Flexbox>
+  );
+});
 
 const UrlManifestForm = memo<{ form: FormInstance; isEditMode: boolean }>(
   ({ form, isEditMode }) => {

package/src/services/__tests__/chat.test.ts

@@ -2,7 +2,6 @@ import { LobeChatPluginManifest } from '@lobehub/chat-plugin-sdk';
 import { act } from '@testing-library/react';
 import { describe, expect, it, vi } from 'vitest';
 
-import { VISION_MODEL_WHITE_LIST } from '@/const/llm';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { useFileStore } from '@/store/file';
 import { useToolStore } from '@/store/tool';
@@ -74,7 +73,7 @@ describe('ChatService', () => {
     it('should not use tools for models in the vision model whitelist', async () => {
       const getChatCompletionSpy = vi.spyOn(chatService, 'getChatCompletion');
       const messages = [{ content: 'Hello', role: 'user' }] as ChatMessage[];
-      const modelInWhitelist = VISION_MODEL_WHITE_LIST[0];
+      const modelInWhitelist = 'gpt-4-vision-preview';
 
       await chatService.createAssistantMessage({
         messages,

package/src/services/chat.ts

@@ -2,7 +2,7 @@ import { PluginRequestPayload, createHeadersWithPluginSettings } from '@lobehub/
 import { produce } from 'immer';
 import { merge } from 'lodash-es';
 
-import { VISION_MODEL_WHITE_LIST } from '@/const/llm';
+import { isVisionModel } from '@/const/llm';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { filesSelectors, useFileStore } from '@/store/file';
 import { useToolStore } from '@/store/tool';
@@ -15,8 +15,6 @@ import { fetchAIFactory, getMessageError } from '@/utils/fetch';
 import { createHeaderWithOpenAI } from './_header';
 import { OPENAI_URLS, PLUGINS_URLS } from './_url';
 
-const isVisionModel = (model?: string) => model && VISION_MODEL_WHITE_LIST.includes(model);
-
 interface FetchOptions {
   signal?: AbortSignal | undefined;
 }

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

@@ -5,9 +5,8 @@ import { template } from 'lodash-es';
 import useSWR, { SWRResponse, mutate } from 'swr';
 import { StateCreator } from 'zustand/vanilla';
 
-import { VISION_MODEL_WHITE_LIST } from '@/const/llm';
-import { LOADING_FLAT } from '@/const/message';
-import { VISION_MODEL_DEFAULT_MAX_TOKENS } from '@/const/settings';
+import { GPT4_VISION_MODEL_DEFAULT_MAX_TOKENS } from '@/const/llm';
+import { LOADING_FLAT, isFunctionMessageAtStart, testFunctionMessageAtEnd } from '@/const/message';
 import { CreateMessageParams } from '@/database/models/message';
 import { DB_Message } from '@/database/schemas/message';
 import { chatService } from '@/services/chat';
@@ -19,7 +18,6 @@ import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
 import { ChatMessage } from '@/types/message';
 import { fetchSSE } from '@/utils/fetch';
-import { isFunctionMessageAtStart, testFunctionMessageAtEnd } from '@/utils/message';
 import { setNamespace } from '@/utils/storeDebug';
 
 import { chatSelectors } from '../../selectors';
@@ -339,11 +337,12 @@ export const chatMessage: StateCreator<
     config.params.max_tokens = config.enableMaxTokens ? config.params.max_tokens : undefined;
 
     // 5. handle config for the vision model
-    // Due to vision model's default max_tokens is very small
+    // Due to the gpt-4-vision-preview model's default max_tokens is very small
     // we need to set the max_tokens a larger one.
-    if (VISION_MODEL_WHITE_LIST.includes(config.model)) {
+    if (config.model === 'gpt-4-vision-preview') {
       /* eslint-disable unicorn/no-lonely-if */
-      if (!config.params.max_tokens) config.params.max_tokens = VISION_MODEL_DEFAULT_MAX_TOKENS;
+      if (!config.params.max_tokens)
+        config.params.max_tokens = GPT4_VISION_MODEL_DEFAULT_MAX_TOKENS;
     }
 
     const fetcher = () =>

package/src/store/session/slices/agent/selectors.ts

@@ -1,7 +1,7 @@
 import { VoiceList } from '@lobehub/tts';
 import { t } from 'i18next';
 
-import { DEFAULT_OPENAI_MODEL_LIST, VISION_MODEL_WHITE_LIST } from '@/const/llm';
+import { DEFAULT_OPENAI_MODEL_LIST, isVisionModel } from '@/const/llm';
 import { DEFAULT_AVATAR, DEFAULT_BACKGROUND_COLOR, DEFAULT_INBOX_AVATAR } from '@/const/meta';
 import { DEFAULT_AGENT_CONFIG, DEFAUTT_AGENT_TTS_CONFIG } from '@/const/settings';
 import { useGlobalStore } from '@/store/global';
@@ -109,7 +109,7 @@ const hasSystemRole = (s: SessionStore) => {
 };
 const modelHasVisionAbility = (s: SessionStore): boolean => {
   const model = currentAgentModel(s);
-  return VISION_MODEL_WHITE_LIST.includes(model);
+  return isVisionModel(model);
 };
 
 export const agentSelectors = {

package/src/const/modelTokens.ts

@@ -1,12 +0,0 @@
-import { LanguageModel } from '@/types/llm';
-
-// refs to: https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo
-export const ModelTokens: Record<LanguageModel, number> = {
-  [LanguageModel.GPT3_5]: 4096,
-  [LanguageModel.GPT3_5_1106]: 16_385,
-  [LanguageModel.GPT3_5_16K]: 16_385,
-  [LanguageModel.GPT4]: 8196,
-  [LanguageModel.GPT4_PREVIEW]: 128_000,
-  [LanguageModel.GPT4_VISION_PREVIEW]: 128_000,
-  [LanguageModel.GPT4_32K]: 32_768,
-};

package/src/utils/message.ts

@@ -1,28 +0,0 @@
-import { FUNCTION_MESSAGE_FLAG } from '@/const/message';
-
-export const isFunctionMessageAtStart = (content: string) => {
-  return content.startsWith(FUNCTION_MESSAGE_FLAG);
-};
-
-export const testFunctionMessageAtEnd = (content: string) => {
-  const regExp = /{"function_call":.*?}}/;
-  const match = content.match(regExp);
-
-  return { content: match ? match[0] : '', valid: match };
-};
-
-// export const createFunctionCallMessage = () => {
-//   return [
-//     {
-//       content: '',
-//       function_call: { arguments: '{\n  "city": "杭州"\n}', name: 'realtimeWeather' },
-//       role: 'assistant',
-//     },
-//     {
-//       content:
-//         '{"status":"1","count":"1","info":"OK","infocode":"10000","forecasts":[{"city":"杭州市","adcode":"300","province":"浙江","reporttime":"2023-07-28 20:32:48","casts":[{"date":"2023-07-28","week":"5","dayweather"小雨","nightweather":"小雨-中雨","daytemp":"32","nighttemp":"26","daywind":"东","nightwind":"东","daypower":"6power":"6","daytemp_float":"32.0","nighttemp_float":"26.0"},{"date":"2023-07-29","week":"6","dayweather":"小雨雨","nightweather":"小雨","daytemp":"30","nighttemp":"25","daywind":"东南","nightwind":"东南","daypower":"4","wer":"4","daytemp_float":"30.0","nighttemp_float":"25.0"},{"date":"2023-07-30","week":"7","dayweather":"小雨",ightweather":"雷阵雨","daytemp":"31","nighttemp":"25","daywind":"东南","nightwind":"东南","daypower":"4","nigh:"4","daytemp_float":"31.0","nighttemp_float":"25.0"},{"date":"2023-07-31","week":"1","dayweather":"雷阵雨","ntweather":"雷阵雨","daytemp":"33","nighttemp":"25","daywind":"东","nightwind":"东","daypower":"4","nightpower""daytemp_float":"33.0","nighttemp_float":"25.0"}]}]}',
-//       name: 'realtimeWeather',
-//       role: 'function',
-//     },
-//   ];
-// };