@lobehub/chat 1.142.1 → 1.142.2

package/packages/types/src/message/common/base.ts

@@ -3,9 +3,6 @@ import type { ILobeAgentRuntimeErrorType } from '@lobechat/model-runtime';
 import type { IPluginErrorType } from '@lobehub/chat-plugin-sdk';
 
 import { ErrorType } from '../../fetch';
-import { GroundingSearch } from '../../search';
-import { ChatToolPayload, MessageToolCall } from '../tools';
-import { ChatImageItem } from './image';
 
 /**
  * 聊天消息错误对象
@@ -28,146 +25,3 @@ export interface ModelReasoning {
   duration?: number;
   signature?: string;
 }
-
-export interface ModelTokensUsage {
-  // Input tokens breakdown
-  /**
-   * user prompt input
-   */
-  // Input cache tokens
-  inputCachedTokens?: number;
-  inputCacheMissTokens?: number;
-  inputWriteCacheTokens?: number;
-
-  inputTextTokens?: number;
-  /**
-   * user prompt image
-   */
-  inputImageTokens?: number;
-  inputAudioTokens?: number;
-  /**
-   * currently only pplx has citation_tokens
-   */
-  inputCitationTokens?: number;
-
-  // Output tokens breakdown
-  outputTextTokens?: number;
-  outputImageTokens?: number;
-  outputAudioTokens?: number;
-  outputReasoningTokens?: number;
-
-  // Prediction tokens
-  acceptedPredictionTokens?: number;
-  rejectedPredictionTokens?: number;
-
-  // Total tokens
-  // TODO: make all following fields required
-  totalInputTokens?: number;
-  totalOutputTokens?: number;
-  totalTokens?: number;
-}
-
-export interface ModelUsage extends ModelTokensUsage {
-  /**
-   * dollar
-   */
-  cost?: number;
-}
-
-export interface ModelSpeed {
-  /**
-   * tokens per second
-   */
-  tps?: number;
-  /**
-   * time to first token
-   */
-  ttft?: number;
-  /**
-   * from output start to output finish
-   */
-  duration?: number;
-  /**
-   * from input start to output finish
-   */
-  latency?: number;
-}
-
-export interface MessageMetadata extends ModelUsage, ModelSpeed {}
-
-export type MessageRoleType = 'user' | 'system' | 'assistant' | 'tool' | 'supervisor';
-
-export interface MessageItem {
-  agentId: string | null;
-  clientId: string | null;
-  content: string | null;
-  createdAt: Date;
-  error: any | null;
-  favorite: boolean | null;
-  id: string;
-  metadata?: MessageMetadata | null;
-  model: string | null;
-  observationId: string | null;
-  parentId: string | null;
-  provider: string | null;
-  quotaId: string | null;
-  reasoning: ModelReasoning | null;
-  role: string;
-  search: GroundingSearch | null;
-  sessionId: string | null;
-  threadId: string | null;
-  tools: any | null;
-  topicId: string | null;
-  // jsonb type
-  traceId: string | null;
-  updatedAt: Date;
-  userId: string;
-}
-
-export interface NewMessage {
-  agentId?: string | null;
-  clientId?: string | null;
-  content?: string | null;
-  createdAt?: Date;
-  // optional because it has a default value
-  error?: any | null;
-  favorite?: boolean;
-  id?: string;
-  model?: string | null;
-  observationId?: string | null;
-  parentId?: string | null;
-  provider?: string | null;
-  quotaId?: string | null;
-  // optional because it has a default function
-  role: 'user' | 'system' | 'assistant' | 'tool';
-  // required because it's notNull
-  sessionId?: string | null;
-  threadId?: string | null;
-  tools?: any | null;
-  topicId?: string | null;
-  traceId?: string | null;
-  // optional because it's generated
-  updatedAt?: Date;
-  userId: string; // optional because it's generated
-}
-
-export interface UpdateMessageParams {
-  content?: string;
-  error?: ChatMessageError | null;
-  imageList?: ChatImageItem[];
-  metadata?: MessageMetadata;
-  model?: string;
-  provider?: string;
-  reasoning?: ModelReasoning;
-  role?: string;
-  search?: GroundingSearch;
-  toolCalls?: MessageToolCall[];
-  tools?: ChatToolPayload[] | null;
-}
-
-export interface NewMessageQueryParams {
-  embeddingsId: string;
-  messageId: string;
-  rewriteQuery: string;
-  userQuery: string;
-}

package/packages/types/src/message/common/index.ts

@@ -1,3 +1,5 @@
 export * from './base';
 export * from './image';
+export * from './metadata';
+export * from './tools';
 export * from './translate';

package/packages/types/src/message/common/metadata.ts

@@ -0,0 +1,67 @@
+/* eslint-disable sort-keys-fix/sort-keys-fix , typescript-sort-keys/interface */
+
+export interface ModelTokensUsage {
+  // Input tokens breakdown
+  /**
+   * user prompt input
+   */
+  // Input cache tokens
+  inputCachedTokens?: number;
+  inputCacheMissTokens?: number;
+  inputWriteCacheTokens?: number;
+
+  inputTextTokens?: number;
+  /**
+   * user prompt image
+   */
+  inputImageTokens?: number;
+  inputAudioTokens?: number;
+  /**
+   * currently only pplx has citation_tokens
+   */
+  inputCitationTokens?: number;
+
+  // Output tokens breakdown
+  outputTextTokens?: number;
+  outputImageTokens?: number;
+  outputAudioTokens?: number;
+  outputReasoningTokens?: number;
+
+  // Prediction tokens
+  acceptedPredictionTokens?: number;
+  rejectedPredictionTokens?: number;
+
+  // Total tokens
+  // TODO: make all following fields required
+  totalInputTokens?: number;
+  totalOutputTokens?: number;
+  totalTokens?: number;
+}
+
+export interface ModelUsage extends ModelTokensUsage {
+  /**
+   * dollar
+   */
+  cost?: number;
+}
+
+export interface ModelSpeed {
+  /**
+   * tokens per second
+   */
+  tps?: number;
+  /**
+   * time to first token
+   */
+  ttft?: number;
+  /**
+   * from output start to output finish
+   */
+  duration?: number;
+  /**
+   * from input start to output finish
+   */
+  latency?: number;
+}
+
+export interface MessageMetadata extends ModelUsage, ModelSpeed {}

package/packages/types/src/message/{tools.ts → common/tools.ts}

@@ -2,7 +2,7 @@ import { IPluginErrorType } from '@lobehub/chat-plugin-sdk';
 import type { PartialDeep } from 'type-fest';
 import { z } from 'zod';
 
-import { LobeToolRenderType } from '../tool';
+import { LobeToolRenderType } from '../../tool';
 
 export interface ChatPluginPayload {
   apiName: string;

package/packages/types/src/message/common/translate.ts

@@ -2,3 +2,7 @@ export interface Translate {
   from?: string;
   to: string;
 }
+
+export interface ChatTranslate extends Translate {
+  content?: string;
+}

package/packages/types/src/message/db/index.ts

@@ -0,0 +1,2 @@
+export * from './item';
+export * from './params';

package/packages/types/src/message/db/item.ts

@@ -0,0 +1,29 @@
+import { GroundingSearch } from '../../search';
+import { MessageMetadata, ModelReasoning } from '../common';
+
+export interface DBMessageItem {
+  agentId: string | null;
+  clientId: string | null;
+  content: string | null;
+  createdAt: Date;
+  error: any | null;
+  favorite: boolean | null;
+  id: string;
+  metadata?: MessageMetadata | null;
+  model: string | null;
+  observationId: string | null;
+  parentId: string | null;
+  provider: string | null;
+  quotaId: string | null;
+  reasoning: ModelReasoning | null;
+  role: string;
+  search: GroundingSearch | null;
+  sessionId: string | null;
+  threadId: string | null;
+  tools: any | null;
+  topicId: string | null;
+  // jsonb type
+  traceId: string | null;
+  updatedAt: Date;
+  userId: string;
+}

package/packages/types/src/message/db/params.ts

@@ -0,0 +1,57 @@
+import { GroundingSearch } from '../../search';
+import {
+  ChatImageItem,
+  ChatMessageError,
+  ChatToolPayload,
+  MessageMetadata,
+  MessageToolCall,
+  ModelReasoning,
+} from '../common';
+
+export interface NewMessage {
+  agentId?: string | null;
+  clientId?: string | null;
+  content?: string | null;
+  createdAt?: Date;
+  // optional because it has a default value
+  error?: any | null;
+  favorite?: boolean;
+  id?: string;
+  model?: string | null;
+  observationId?: string | null;
+  parentId?: string | null;
+  provider?: string | null;
+  quotaId?: string | null;
+  // optional because it has a default function
+  role: 'user' | 'system' | 'assistant' | 'tool';
+  // required because it's notNull
+  sessionId?: string | null;
+  threadId?: string | null;
+  tools?: any | null;
+  topicId?: string | null;
+  traceId?: string | null;
+  // optional because it's generated
+  updatedAt?: Date;
+  userId: string; // optional because it's generated
+}
+
+export interface UpdateMessageParams {
+  content?: string;
+  error?: ChatMessageError | null;
+  imageList?: ChatImageItem[];
+  metadata?: MessageMetadata;
+  model?: string;
+  provider?: string;
+  reasoning?: ModelReasoning;
+  role?: string;
+  search?: GroundingSearch;
+  toolCalls?: MessageToolCall[];
+  tools?: ChatToolPayload[] | null;
+}
+
+export interface NewMessageQueryParams {
+  embeddingsId: string;
+  messageId: string;
+  rewriteQuery: string;
+  userQuery: string;
+}

package/packages/types/src/message/index.ts

@@ -1,5 +1,5 @@
 export * from './common';
-export * from './tools';
+export * from './db';
 export * from './ui';
 
 export interface ModelRankItem {

package/packages/types/src/message/ui/chat.ts

@@ -2,26 +2,13 @@ import { UploadFileItem } from '../../files';
 import { MetaData } from '../../meta';
 import { MessageSemanticSearchChunk } from '../../rag';
 import { GroundingSearch } from '../../search';
-import type {
-  ChatMessageError,
-  MessageMetadata,
-  MessageRoleType,
-  ModelReasoning,
-} from '../common/base';
-import { ChatImageItem } from '../common/image';
-import { Translate } from '../common/translate';
-import { ChatPluginPayload, ChatToolPayload } from '../tools';
+import { ChatImageItem, ChatMessageError, MessageMetadata, ModelReasoning } from '../common';
+import { ChatPluginPayload, ChatToolPayload } from '../common/tools';
+import { ChatMessageExtra } from './extra';
+import { ChatFileChunk } from './rag';
 import { ChatVideoItem } from './video';
 
-export interface ChatTranslate extends Translate {
-  content?: string;
-}
-
-export interface ChatTTS {
-  contentMd5?: string;
-  file?: string;
-  voice?: string;
-}
+export type UIMessageRoleType = 'user' | 'system' | 'assistant' | 'tool' | 'supervisor';
 
 export interface ChatFileItem {
   content?: string;
@@ -32,25 +19,6 @@ export interface ChatFileItem {
   url: string;
 }
 
-export interface ChatFileChunk {
-  fileId: string;
-  fileType: string;
-  fileUrl: string;
-  filename: string;
-  id: string;
-  similarity?: number;
-  text: string;
-}
-
-export interface ChatMessageExtra {
-  fromModel?: string;
-  fromProvider?: string;
-  // 翻译
-  translate?: ChatTranslate | false | null;
-  // TTS
-  tts?: ChatTTS;
-}
-
 export interface AssistantContentBlock {
   content: string;
   fileList?: ChatFileItem[];
@@ -59,7 +27,7 @@ export interface AssistantContentBlock {
   tools?: ChatToolPayload[];
 }
 
-export interface ChatMessage {
+export interface UIChatMessage {
   // Group chat fields (alphabetically before other fields)
   agentId?: string | 'supervisor';
   /**
@@ -109,7 +77,7 @@ export interface ChatMessage {
   /**
    * message role type
    */
-  role: MessageRoleType;
+  role: UIMessageRoleType;
   search?: GroundingSearch | null;
   sessionId?: string;
   /**
@@ -132,7 +100,7 @@ export interface ChatMessage {
 }
 
 export interface CreateMessageParams
-  extends Partial<Omit<ChatMessage, 'content' | 'role' | 'topicId' | 'chunksList'>> {
+  extends Partial<Omit<UIChatMessage, 'content' | 'role' | 'topicId' | 'chunksList'>> {
   content: string;
   error?: ChatMessageError | null;
   fileChunks?: MessageSemanticSearchChunk[];
@@ -140,7 +108,7 @@ export interface CreateMessageParams
   fromModel?: string;
   fromProvider?: string;
   groupId?: string;
-  role: MessageRoleType;
+  role: UIMessageRoleType;
   sessionId: string;
   targetId?: string | null;
   threadId?: string | null;

package/packages/types/src/message/ui/extra.ts

@@ -0,0 +1,16 @@
+import { ChatTranslate } from '../common';
+
+export interface ChatTTS {
+  contentMd5?: string;
+  file?: string;
+  voice?: string;
+}
+
+export interface ChatMessageExtra {
+  fromModel?: string;
+  fromProvider?: string;
+  // 翻译
+  translate?: ChatTranslate | false | null;
+  // TTS
+  tts?: ChatTTS;
+}

package/packages/types/src/message/ui/index.ts

@@ -1,3 +1,4 @@
 export * from './chat';
+export * from './extra';
 export * from './rag';
 export * from './video';

package/packages/types/src/message/ui/rag.ts

@@ -2,6 +2,16 @@ import { z } from 'zod';
 
 import { MessageSemanticSearchChunk } from '../../rag';
 
+export interface ChatFileChunk {
+  fileId: string;
+  fileType: string;
+  fileUrl: string;
+  filename: string;
+  id: string;
+  similarity?: number;
+  text: string;
+}
+
 export const SemanticSearchChunkSchema = z.object({
   id: z.string(),
   similarity: z.number(),

package/src/app/[variants]/(main)/chat/(workspace)/features/ShareButton/index.tsx

@@ -8,7 +8,6 @@ import { useTranslation } from 'react-i18next';
 
 import { DESKTOP_HEADER_ICON_SIZE, MOBILE_HEADER_ICON_SIZE } from '@/const/layoutTokens';
 import { useWorkspaceModal } from '@/hooks/useWorkspaceModal';
-import { useChatStore } from '@/store/chat';
 
 const ShareModal = dynamic(() => import('@/features/ShareModal'));
 
@@ -21,13 +20,11 @@ interface ShareButtonProps {
 const ShareButton = memo<ShareButtonProps>(({ mobile, setOpen, open }) => {
   const [isModalOpen, setIsModalOpen] = useWorkspaceModal(open, setOpen);
   const { t } = useTranslation('common');
-  const [shareLoading] = useChatStore((s) => [s.shareLoading]);
 
   return (
     <>
       <ActionIcon
         icon={Share2}
-        loading={shareLoading}
         onClick={() => setIsModalOpen(true)}
         size={mobile ? MOBILE_HEADER_ICON_SIZE : DESKTOP_HEADER_ICON_SIZE}
         title={t('share')}

package/src/app/[variants]/(main)/settings/provider/features/CreateNewProvider/index.tsx

@@ -18,8 +18,8 @@ import { Flexbox } from 'react-layout-kit';
 import { useAiInfraStore } from '@/store/aiInfra/store';
 import { CreateAiProviderParams } from '@/types/aiProvider';
 
-import { CUSTOM_PROVIDER_SDK_OPTIONS } from '../customProviderSdkOptions';
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey, LLMProviderBaseUrlKey } from '../../const';
+import { CUSTOM_PROVIDER_SDK_OPTIONS } from '../customProviderSdkOptions';
 
 interface CreateNewProviderProps {
   onClose?: () => void;
@@ -142,7 +142,6 @@ const CreateNewProvider = memo<CreateNewProviderProps>(({ onClose, open }) => {
   return (
     <FormModal
       destroyOnHidden
-      height={'90%'}
       items={[
         {
           children: basicItems,

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

@@ -1,4 +1,4 @@
-import { ChatMessage } from '@lobechat/types';
+import { UIChatMessage } from '@lobechat/types';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { CreateMessageParams, MessageModel } from '../message';
@@ -63,7 +63,7 @@ describe('MessageModel', () => {
 
   describe('batchCreate', () => {
     it('should batch create message records', async () => {
-      const messagesToCreate = [messageData, messageData] as ChatMessage[];
+      const messagesToCreate = [messageData, messageData] as UIChatMessage[];
       const results = await MessageModel.batchCreate(messagesToCreate);
 
       expect(results.success).toBeTruthy();
@@ -87,7 +87,7 @@ describe('MessageModel', () => {
   describe('query', () => {
     it('should query messages with pagination', async () => {
       // 创建多条消息以测试查询方法
-      await MessageModel.batchCreate([messageData, messageData] as ChatMessage[]);
+      await MessageModel.batchCreate([messageData, messageData] as UIChatMessage[]);
 
       const queriedMessages = await MessageModel.query({
         pageSize: 1,
@@ -101,7 +101,7 @@ describe('MessageModel', () => {
 
     it('should query correctly without topic id', async () => {
       // 创建多条消息以测试查询方法
-      await MessageModel.batchCreate([messageData, messageData] as ChatMessage[]);
+      await MessageModel.batchCreate([messageData, messageData] as UIChatMessage[]);
 
       const queriedMessages = await MessageModel.query({ sessionId: messageData.sessionId });
 
@@ -113,7 +113,7 @@ describe('MessageModel', () => {
       await MessageModel.batchCreate([
         messageData,
         { ...messageData, topicId: undefined },
-      ] as ChatMessage[]);
+      ] as UIChatMessage[]);
 
       const queriedMessages = await MessageModel.query({ sessionId: messageData.sessionId });
 
@@ -121,7 +121,7 @@ describe('MessageModel', () => {
     });
 
     it('should should have correct order', async () => {
-      const data: ChatMessage[] = [
+      const data: UIChatMessage[] = [
         {
           role: 'user',
           content: '1',

package/src/database/_deprecated/models/message.ts

@@ -1,4 +1,4 @@
-import { ChatMessage } from '@lobechat/types';
+import { UIChatMessage } from '@lobechat/types';
 import type { PartialDeep } from 'type-fest';
 
 import { BaseModel } from '@/database/_deprecated/core';
@@ -11,8 +11,8 @@ import { nanoid } from '@/utils/uuid';
  * @deprecated
  */
 export interface CreateMessageParams
-  extends Partial<Omit<ChatMessage, 'content' | 'role'>>,
-    Pick<ChatMessage, 'content' | 'role'> {
+  extends Partial<Omit<UIChatMessage, 'content' | 'role'>>,
+    Pick<UIChatMessage, 'content' | 'role'> {
   files?: string[];
   fromModel?: string;
   fromProvider?: string;
@@ -39,7 +39,7 @@ class _MessageModel extends BaseModel {
     topicId,
     pageSize = 9999,
     current = 0,
-  }: QueryMessageParams): Promise<ChatMessage[]> {
+  }: QueryMessageParams): Promise<UIChatMessage[]> {
     const offset = current * pageSize;
 
     const query = !!topicId
@@ -57,15 +57,15 @@ class _MessageModel extends BaseModel {
 
     const messages = dbMessages.map((msg) => this.mapToChatMessage(msg));
 
-    const finalList: ChatMessage[] = [];
+    const finalList: UIChatMessage[] = [];
 
-    const addItem = (item: ChatMessage) => {
+    const addItem = (item: UIChatMessage) => {
       const isExist = finalList.some((i) => item.id === i.id);
       if (!isExist) {
         finalList.push(item);
       }
     };
-    const messageMap = new Map<string, ChatMessage>();
+    const messageMap = new Map<string, UIChatMessage>();
     for (const item of messages) messageMap.set(item.id, item);
 
     for (const item of messages) {
@@ -110,18 +110,18 @@ class _MessageModel extends BaseModel {
   async create(data: CreateMessageParams) {
     const id = nanoid();
 
-    const messageData: DB_Message = this.mapChatMessageToDBMessage(data as ChatMessage);
+    const messageData: DB_Message = this.mapChatMessageToDBMessage(data as UIChatMessage);
 
     return this._addWithSync(messageData, id);
   }
 
-  async batchCreate(messages: ChatMessage[]) {
+  async batchCreate(messages: UIChatMessage[]) {
     const data: DB_Message[] = messages.map((m) => this.mapChatMessageToDBMessage(m));
 
     return this._batchAdd(data);
   }
 
-  async duplicateMessages(messages: ChatMessage[]): Promise<ChatMessage[]> {
+  async duplicateMessages(messages: UIChatMessage[]): Promise<UIChatMessage[]> {
     const duplicatedMessages = await this.createDuplicateMessages(messages);
     // 批量添加复制后的消息到数据库
     await this.batchCreate(duplicatedMessages);
@@ -230,7 +230,7 @@ class _MessageModel extends BaseModel {
 
   // **************** Helper *************** //
 
-  private async createDuplicateMessages(messages: ChatMessage[]): Promise<ChatMessage[]> {
+  private async createDuplicateMessages(messages: UIChatMessage[]): Promise<UIChatMessage[]> {
     // 创建一个映射来存储原始消息ID和复制消息ID之间的关系
     const idMapping = new Map<string, string>();
 
@@ -252,7 +252,7 @@ class _MessageModel extends BaseModel {
     return duplicatedMessages;
   }
 
-  private mapChatMessageToDBMessage(message: ChatMessage): DB_Message {
+  private mapChatMessageToDBMessage(message: UIChatMessage): DB_Message {
     const { extra, ...messageData } = message;
 
     return { ...messageData, ...extra } as DB_Message;
@@ -270,7 +270,7 @@ class _MessageModel extends BaseModel {
       extra: { fromModel, fromProvider, translate, tts },
       meta: {},
       topicId: item.topicId ?? undefined,
-    } as ChatMessage;
+    } as UIChatMessage;
   };
 }
 

package/src/features/Conversation/Error/OllamaBizError/index.tsx

@@ -1,4 +1,4 @@
-import { ChatMessage } from '@lobechat/types';
+import { UIChatMessage } from '@lobechat/types';
 import { Skeleton } from 'antd';
 import dynamic from 'next/dynamic';
 import { memo } from 'react';
@@ -24,7 +24,7 @@ interface OllamaErrorResponse {
 
 const UNRESOLVED_MODEL_REGEXP = /model "([\w+,-_]+)" not found/;
 
-const OllamaBizError = memo<ChatMessage>(({ error, id }) => {
+const OllamaBizError = memo<UIChatMessage>(({ error, id }) => {
   const errorBody: OllamaErrorResponse = (error as any)?.body;
 
   const errorMessage = errorBody.error?.message;