@lobehub/chat 0.115.3 → 0.115.4

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.115.4](https://github.com/lobehub/lobe-chat/compare/v0.115.3...v0.115.4)
+
+<sup>Released on **2023-12-23**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor the ChatMessage type.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor the ChatMessage type ([40375bd](https://github.com/lobehub/lobe-chat/commit/40375bd))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.115.3](https://github.com/lobehub/lobe-chat/compare/v0.115.2...v0.115.3)
 
 <sup>Released on **2023-12-23**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.115.3",
+  "version": "0.115.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/settings/llm/LLM/Checker.tsx

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { chatService } from '@/services/chat';
-import { ChatMessageError } from '@/types/chatMessage';
+import { ChatMessageError } from '@/types/message';
 
 import { getModelList } from './getModelList';
 

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

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import { CreateMessageParams, MessageModel } from '../message';
 

package/src/database/models/message.ts

@@ -3,7 +3,7 @@ import { DeepPartial } from 'utility-types';
 import { BaseModel } from '@/database/core';
 import { DBModel } from '@/database/core/types/db';
 import { DB_Message, DB_MessageSchema } from '@/database/schemas/message';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { nanoid } from '@/utils/uuid';
 
 export interface CreateMessageParams

package/src/features/AgentSetting/AgentTTS/SelectWithTTSPreview.tsx

@@ -8,7 +8,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useTTS } from '@/hooks/useTTS';
 import { TTSServer } from '@/types/agent';
-import { ChatMessageError } from '@/types/chatMessage';
+import { ChatMessageError } from '@/types/message';
 import { getMessageError } from '@/utils/fetch';
 
 interface SelectWithTTSPreviewProps extends SelectProps {

package/src/features/ChatInput/STT/index.tsx

@@ -8,7 +8,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useSTT } from '@/hooks/useSTT';
 import { useChatStore } from '@/store/chat';
-import { ChatMessageError } from '@/types/chatMessage';
+import { ChatMessageError } from '@/types/message';
 import { getMessageError } from '@/utils/fetch';
 
 const useStyles = createStyles(({ css, token }) => ({

package/src/features/Conversation/ChatList/Extras/Assistant.test.tsx

@@ -3,7 +3,7 @@ import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import { AssistantMessageExtra } from './Assistant';
 

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

@@ -6,7 +6,7 @@ import { Flexbox } from 'react-layout-kit';
 import { useChatStore } from '@/store/chat';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import ExtraContainer from './ExtraContainer';
 import TTS from './TTS';

package/src/features/Conversation/ChatList/Extras/TTS/InitPlayer.tsx

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { useTTS } from '@/hooks/useTTS';
 import { useChatStore } from '@/store/chat';
 import { useFileStore } from '@/store/file';
-import { ChatMessageError, ChatTTS } from '@/types/chatMessage';
+import { ChatMessageError, ChatTTS } from '@/types/message';
 import { getMessageError } from '@/utils/fetch';
 
 import Player from './Player';

package/src/features/Conversation/ChatList/Extras/TTS/Player.tsx

@@ -6,7 +6,7 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import { ChatMessageError } from '@/types/chatMessage';
+import { ChatMessageError } from '@/types/message';
 
 interface PlayerProps extends AudioPlayerProps {
   error?: ChatMessageError;

package/src/features/Conversation/ChatList/Extras/Translate.tsx

@@ -8,7 +8,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
-import { ChatTranslate } from '@/types/chatMessage';
+import { ChatTranslate } from '@/types/message';
 
 import BubblesLoading from '../Loading';
 

package/src/features/Conversation/ChatList/Extras/User.tsx

@@ -1,7 +1,7 @@
 import { memo } from 'react';
 
 import { useChatStore } from '@/store/chat';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import ExtraContainer from './ExtraContainer';
 import TTS from './TTS';

package/src/features/Conversation/ChatList/Extras/type.ts

@@ -1,5 +1,5 @@
 import { FC } from 'react';
 
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 export type RenderMessageExtra = FC<ChatMessage>;

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

@@ -2,7 +2,7 @@ import { ReactNode, memo } from 'react';
 
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { isFunctionMessageAtStart } from '@/utils/message';
 
 import Inspector from '../Plugins/Inspector';

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

@@ -1,7 +1,7 @@
 import { ReactNode, memo } from 'react';
 
 import { LOADING_FLAT } from '@/const/message';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import BubblesLoading from '../Loading';
 

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

@@ -4,7 +4,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import Inspector from '../Plugins/Inspector';
 import PluginRender from '../Plugins/Render';

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

@@ -3,7 +3,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import FileList from '@/components/FileList';
 import { LOADING_FLAT } from '@/const/message';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import BubblesLoading from '../Loading';
 

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

@@ -6,7 +6,7 @@ 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';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { OpenAIChatStreamPayload } from '@/types/openai/chat';
 import { LobeTool } from '@/types/tool';
 

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

@@ -7,7 +7,7 @@ import {
   ChatPluginPayload,
   ChatTTS,
   ChatTranslate,
-} from '@/types/chatMessage';
+} from '@/types/message';
 
 import { messageService } from '../message';
 

package/src/services/chat.ts

@@ -7,7 +7,7 @@ import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { filesSelectors, useFileStore } from '@/store/file';
 import { useToolStore } from '@/store/tool';
 import { pluginSelectors, toolSelectors } from '@/store/tool/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import type { OpenAIChatMessage, OpenAIChatStreamPayload } from '@/types/openai/chat';
 import { UserMessageContentPart } from '@/types/openai/chat';
 import { fetchAIFactory, getMessageError } from '@/utils/fetch';

package/src/services/config.ts

@@ -5,8 +5,8 @@ import { useGlobalStore } from '@/store/global';
 import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionExportSelectors, sessionSelectors } from '@/store/session/selectors';
-import { ChatMessage } from '@/types/chatMessage';
 import { ConfigFile } from '@/types/exportConfig';
+import { ChatMessage } from '@/types/message';
 import { LobeSessions } from '@/types/session';
 import { GlobalSettings } from '@/types/settings';
 import { ChatTopic } from '@/types/topic';

package/src/services/message.ts

@@ -1,13 +1,13 @@
 import { CreateMessageParams, MessageModel } from '@/database/models/message';
 import { DB_Message } from '@/database/schemas/message';
+import { LLMRoleType } from '@/types/llm';
 import {
   ChatMessage,
   ChatMessageError,
   ChatPluginPayload,
   ChatTTS,
   ChatTranslate,
-} from '@/types/chatMessage';
-import { LLMRoleType } from '@/types/llm';
+} from '@/types/message';
 
 export class MessageService {
   async create(data: CreateMessageParams) {

package/src/store/chat/helpers.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest';
 
 import { LobeAgentConfig } from '@/types/agent';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { OpenAIChatMessage } from '@/types/openai/chat';
 import { encodeAsync } from '@/utils/tokenizer';
 import * as tokenizerObj from '@/utils/tokenizer';

package/src/store/chat/helpers.ts

@@ -1,5 +1,5 @@
 import { LobeAgentConfig } from '@/types/agent';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { OpenAIChatMessage } from '@/types/openai/chat';
 import { encodeAsync } from '@/utils/tokenizer';
 

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

@@ -7,7 +7,7 @@ import { chatService } from '@/services/chat';
 import { messageService } from '@/services/message';
 import { topicService } from '@/services/topic';
 import { chatSelectors } from '@/store/chat/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import { useChatStore } from '../../store';
 

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

@@ -17,7 +17,7 @@ import { chatHelpers } from '@/store/chat/helpers';
 import { ChatStore } from '@/store/chat/store';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { fetchSSE } from '@/utils/fetch';
 import { isFunctionMessageAtStart, testFunctionMessageAtEnd } from '@/utils/message';
 import { setNamespace } from '@/utils/storeDebug';

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

@@ -1,4 +1,4 @@
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 export interface ChatMessageState {
   abortController?: AbortController;

package/src/store/chat/slices/message/reducer.test.ts

@@ -1,4 +1,4 @@
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import { MessageDispatch, messagesReducer } from './reducer';
 

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

@@ -1,7 +1,7 @@
 import isEqual from 'fast-deep-equal';
 import { produce } from 'immer';
 
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { merge } from '@/utils/merge';
 
 interface UpdateMessage {

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

@@ -5,7 +5,7 @@ import { INBOX_SESSION_ID } from '@/const/session';
 import { ChatStore } from '@/store/chat';
 import { initialState } from '@/store/chat/initialState';
 import { useSessionStore } from '@/store/session';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { MetaData } from '@/types/meta';
 import { merge } from '@/utils/merge';
 

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

@@ -6,7 +6,7 @@ import { INBOX_SESSION_ID } from '@/const/session';
 import { useGlobalStore } from '@/store/global';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { MetaData } from '@/types/meta';
 import { merge } from '@/utils/merge';
 

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

@@ -7,7 +7,7 @@ import { messageService } from '@/services/message';
 import { ChatStore } from '@/store/chat/store';
 import { useToolStore } from '@/store/tool';
 import { pluginSelectors } from '@/store/tool/selectors';
-import { ChatPluginPayload } from '@/types/chatMessage';
+import { ChatPluginPayload } from '@/types/message';
 import { OpenAIFunctionCall } from '@/types/openai/functionCall';
 import { setNamespace } from '@/utils/storeDebug';
 

package/src/store/chat/slices/topic/action.test.ts

@@ -6,7 +6,7 @@ import { LOADING_FLAT } from '@/const/message';
 import { chatService } from '@/services/chat';
 import { messageService } from '@/services/message';
 import { topicService } from '@/services/topic';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { ChatTopic } from '@/types/topic';
 
 import { useChatStore } from '../../store';

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

@@ -12,7 +12,7 @@ import { chatService } from '@/services/chat';
 import { messageService } from '@/services/message';
 import { topicService } from '@/services/topic';
 import { ChatStore } from '@/store/chat';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { ChatTopic } from '@/types/topic';
 import { setNamespace } from '@/utils/storeDebug';
 

package/src/types/exportConfig.ts

@@ -1,4 +1,4 @@
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { LobeSessions } from '@/types/session';
 import { GlobalSettings } from '@/types/settings';
 import { ChatTopic } from '@/types/topic';

package/src/types/{chatMessage.ts → message/index.ts}

@@ -1,8 +1,8 @@
 import { ErrorType } from '@/types/fetch';
 import { Translate } from '@/types/translate';
 
-import { LLMRoleType } from './llm';
-import { BaseDataModel } from './meta';
+import { LLMRoleType } from '../llm';
+import { BaseDataModel } from '../meta';
 
 /**
  * 聊天消息错误对象

package/src/utils/fetch.ts

@@ -1,7 +1,7 @@
 import { t } from 'i18next';
 
-import { ChatMessageError } from '@/types/chatMessage';
 import { ErrorResponse, ErrorType } from '@/types/fetch';
+import { ChatMessageError } from '@/types/message';
 
 export const getMessageError = async (response: Response) => {
   let chatMessageError: ChatMessageError;