@lobehub/chat 1.0.12 → 1.0.14

package/src/libs/agent-runtime/openai/index.test.ts

@@ -49,7 +49,7 @@ describe('LobeOpenAI', () => {
     });
 
     describe('Error', () => {
-      it('should return OpenAIBizError with an openai error response when OpenAI.APIError is thrown', async () => {
+      it('should return ProviderBizError with an openai error response when OpenAI.APIError is thrown', async () => {
         // Arrange
         const apiError = new OpenAI.APIError(
           400,
@@ -79,7 +79,7 @@ describe('LobeOpenAI', () => {
               error: { message: 'Bad Request' },
               status: 400,
             },
-            errorType: 'OpenAIBizError',
+            errorType: 'ProviderBizError',
             provider: 'openai',
           });
         }
@@ -89,11 +89,11 @@ describe('LobeOpenAI', () => {
         try {
           new LobeOpenAI({});
         } catch (e) {
-          expect(e).toEqual({ errorType: 'NoOpenAIAPIKey' });
+          expect(e).toEqual({ errorType: 'InvalidProviderAPIKey' });
         }
       });
 
-      it('should return OpenAIBizError with the cause when OpenAI.APIError is thrown with cause', async () => {
+      it('should return ProviderBizError with the cause when OpenAI.APIError is thrown with cause', async () => {
         // Arrange
         const errorInfo = {
           stack: 'abc',
@@ -119,13 +119,13 @@ describe('LobeOpenAI', () => {
               cause: { message: 'api is undefined' },
               stack: 'abc',
             },
-            errorType: 'OpenAIBizError',
+            errorType: 'ProviderBizError',
             provider: 'openai',
           });
         }
       });
 
-      it('should return OpenAIBizError with an cause response with desensitize Url', async () => {
+      it('should return ProviderBizError with an cause response with desensitize Url', async () => {
         // Arrange
         const errorInfo = {
           stack: 'abc',
@@ -155,7 +155,7 @@ describe('LobeOpenAI', () => {
               cause: { message: 'api is undefined' },
               stack: 'abc',
             },
-            errorType: 'OpenAIBizError',
+            errorType: 'ProviderBizError',
             provider: 'openai',
           });
         }

package/src/libs/agent-runtime/openai/index.ts

@@ -1,4 +1,3 @@
-import { AgentRuntimeErrorType } from '../error';
 import { ModelProvider } from '../types';
 import { LobeOpenAICompatibleFactory } from '../utils/openaiCompatibleFactory';
 
@@ -7,10 +6,5 @@ export const LobeOpenAI = LobeOpenAICompatibleFactory({
   debug: {
     chatCompletion: () => process.env.DEBUG_OPENAI_CHAT_COMPLETION === '1',
   },
-  errorType: {
-    bizError: AgentRuntimeErrorType.OpenAIBizError,
-    invalidAPIKey: AgentRuntimeErrorType.NoOpenAIAPIKey,
-  },
-
   provider: ModelProvider.OpenAI,
 });

package/src/libs/agent-runtime/utils/anthropicHelpers.ts

@@ -112,9 +112,9 @@ export const buildAnthropicMessages = (
 
 export const buildAnthropicTools = (tools?: OpenAI.ChatCompletionTool[]) =>
   tools?.map(
-    (tool): Anthropic.Beta.Tools.Tool => ({
+    (tool): Anthropic.Tool => ({
       description: tool.function.description,
-      input_schema: tool.function.parameters as Anthropic.Beta.Tools.Tool.InputSchema,
+      input_schema: tool.function.parameters as Anthropic.Tool.InputSchema,
       name: tool.function.name,
     }),
   );

package/src/libs/agent-runtime/utils/streams/anthropic.test.ts

@@ -99,27 +99,67 @@ describe('AnthropicStream', () => {
   });
 
   it('should handle tool use event and ReadableStream input', async () => {
-    const toolUseEvent = {
-      type: 'content_block_delta',
-      delta: {
-        type: 'tool_use',
-        tool_use: {
-          id: 'tool_use_1',
-          name: 'example_tool',
-          input: { arg1: 'value1' },
+    const streams = [
+      {
+        type: 'message_start',
+        message: {
+          id: 'msg_017aTuY86wNxth5TE544yqJq',
+          type: 'message',
+          role: 'assistant',
+          model: 'claude-3-sonnet-20240229',
+          content: [],
+          stop_reason: null,
+          stop_sequence: null,
+          usage: { input_tokens: 457, output_tokens: 1 },
         },
       },
-    };
+      { type: 'content_block_start', index: 0, content_block: { type: 'text', text: '' } },
+      { type: 'content_block_delta', index: 0, delta: { type: 'text_delta', text: '好' } },
+      { type: 'content_block_delta', index: 0, delta: { type: 'text_delta', text: '的:' } },
+
+      { type: 'content_block_stop', index: 0 },
+      {
+        type: 'content_block_start',
+        index: 1,
+        content_block: {
+          type: 'tool_use',
+          id: 'toolu_01WdYWxYFQ8iu5iZq1Dy9Saf',
+          name: 'realtime-weather____fetchCurrentWeather',
+          input: {},
+        },
+      },
+      {
+        type: 'content_block_delta',
+        index: 1,
+        delta: { type: 'input_json_delta', partial_json: '' },
+      },
+      {
+        type: 'content_block_delta',
+        index: 1,
+        delta: { type: 'input_json_delta', partial_json: '{"city": "' },
+      },
+      {
+        type: 'content_block_delta',
+        index: 1,
+        delta: { type: 'input_json_delta', partial_json: '杭' },
+      },
+      {
+        type: 'content_block_delta',
+        index: 1,
+        delta: { type: 'input_json_delta', partial_json: '州"}' },
+      },
+      { type: 'content_block_stop', index: 1 },
+      {
+        type: 'message_delta',
+        delta: { stop_reason: 'tool_use', stop_sequence: null },
+        usage: { output_tokens: 83 },
+      },
+    ];
 
     const mockReadableStream = new ReadableStream({
       start(controller) {
-        controller.enqueue({
-          type: 'message_start',
-          message: { id: 'message_1', metadata: {} },
-        });
-        controller.enqueue(toolUseEvent);
-        controller.enqueue({
-          type: 'message_stop',
+        streams.forEach((chunk) => {
+          controller.enqueue(chunk);
         });
         controller.close();
       },
@@ -139,19 +179,53 @@ describe('AnthropicStream', () => {
       chunks.push(decoder.decode(chunk, { stream: true }));
     }
 
-    expect(chunks).toEqual([
-      'id: message_1\n',
-      'event: data\n',
-      `data: {"id":"message_1","metadata":{}}\n\n`,
-      'id: message_1\n',
-      'event: tool_calls\n',
-      `data: [{"function":{"arguments":"{\\"arg1\\":\\"value1\\"}","name":"example_tool"},"id":"tool_use_1","index":0,"type":"function"}]\n\n`,
-      'id: message_1\n',
-      'event: stop\n',
-      `data: "message_stop"\n\n`,
-    ]);
+    expect(chunks).toEqual(
+      [
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: data',
+        'data: {"id":"msg_017aTuY86wNxth5TE544yqJq","type":"message","role":"assistant","model":"claude-3-sonnet-20240229","content":[],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":457,"output_tokens":1}}\n',
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: data',
+        'data: ""\n',
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: text',
+        'data: "好"\n',
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: text',
+        'data: "的:"\n',
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: data',
+        'data: {"type":"content_block_stop","index":0}\n',
+        // Tool calls
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: tool_calls',
+        `data: [{"function":{"arguments":"","name":"realtime-weather____fetchCurrentWeather"},"id":"toolu_01WdYWxYFQ8iu5iZq1Dy9Saf","index":0,"type":"function"}]\n`,
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: tool_calls',
+        `data: [{"function":{"arguments":""},"index":0,"type":"function"}]\n`,
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: tool_calls',
+        `data: [{"function":{"arguments":"{\\"city\\": \\""},"index":0,"type":"function"}]\n`,
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: tool_calls',
+
+        `data: [{"function":{"arguments":"杭"},"index":0,"type":"function"}]\n`,
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: tool_calls',
+
+        `data: [{"function":{"arguments":"州\\"}"},"index":0,"type":"function"}]\n`,
+
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: data',
+        'data: {"type":"content_block_stop","index":1}\n',
+
+        'id: msg_017aTuY86wNxth5TE544yqJq',
+        'event: stop',
+        'data: "tool_use"\n',
+      ].map((item) => `${item}\n`),
+    );
 
-    expect(onToolCallMock).toHaveBeenCalledTimes(1);
+    expect(onToolCallMock).toHaveBeenCalledTimes(5);
   });
 
   it('should handle ReadableStream input', async () => {

package/src/libs/agent-runtime/utils/streams/anthropic.ts

@@ -22,27 +22,39 @@ export const transformAnthropicStream = (
       stack.id = chunk.message.id;
       return { data: chunk.message, id: chunk.message.id, type: 'data' };
     }
+    case 'content_block_start': {
+      if (chunk.content_block.type === 'tool_use') {
+        const toolChunk = chunk.content_block;
 
-    // case 'content_block_start': {
-    //   return { data: chunk.content_block.text, id: stack.id, type: 'data' };
-    // }
+        const toolCall: StreamToolCallChunkData = {
+          function: {
+            arguments: '',
+            name: toolChunk.name,
+          },
+          id: toolChunk.id,
+          index: 0,
+          type: 'function',
+        };
+
+        stack.tool = { id: toolChunk.id, index: 0, name: toolChunk.name };
+
+        return { data: [toolCall], id: stack.id, type: 'tool_calls' };
+      }
+
+      return { data: chunk.content_block.text, id: stack.id, type: 'data' };
+    }
 
     case 'content_block_delta': {
-      switch (chunk.delta.type as string) {
-        default:
+      switch (chunk.delta.type) {
         case 'text_delta': {
           return { data: chunk.delta.text, id: stack.id, type: 'text' };
         }
 
-        // TODO: due to anthropic currently don't support streaming tool calling
-        // we need to add this new `tool_use` type to support streaming
-        // and maybe we need to update it when the feature is available
-        case 'tool_use': {
-          const delta = (chunk.delta as any).tool_use as Anthropic.Beta.Tools.ToolUseBlock;
+        case 'input_json_delta': {
+          const delta = chunk.delta.partial_json;
 
           const toolCall: StreamToolCallChunkData = {
-            function: { arguments: JSON.stringify(delta.input), name: delta.name },
-            id: delta.id,
+            function: { arguments: delta },
             index: 0,
             type: 'function',
           };
@@ -53,7 +65,12 @@ export const transformAnthropicStream = (
             type: 'tool_calls',
           } as StreamProtocolToolCallChunk;
         }
+
+        default: {
+          break;
+        }
       }
+      return { data: chunk, id: stack.id, type: 'data' };
     }
 
     case 'message_delta': {

package/src/libs/agent-runtime/utils/streams/protocol.ts

@@ -2,6 +2,11 @@ import { ChatStreamCallbacks } from '@/libs/agent-runtime';
 
 export interface StreamStack {
   id: string;
+  tool?: {
+    id: string;
+    index: number;
+    name: string;
+  };
 }
 
 export interface StreamProtocolChunk {
@@ -15,7 +20,7 @@ export interface StreamToolCallChunkData {
     arguments?: string;
     name?: string | null;
   };
-  id: string;
+  id?: string;
   index: number;
   type: 'function' | string;
 }

package/src/locales/default/setting.ts

@@ -105,6 +105,7 @@ export default {
       latestTime: '上次更新时间：{{time}}',
       noLatestTime: '暂未获取列表',
     },
+    helpDoc: '配置教程',
     modelList: {
       desc: '选择在会话中展示的模型，选择的模型会在模型列表中展示',
       placeholder: '请从列表中选择模型',

package/src/services/message/server.ts

@@ -44,6 +44,10 @@ export class ServerService implements IMessageService {
     return lambdaClient.message.update.mutate({ id, value: { error } });
   }
 
+  async updateMessagePluginError(id: string, error: ChatMessageError): Promise<any> {
+    return lambdaClient.message.update.mutate({ id, value: { pluginError: error } });
+  }
+
   updateMessage(id: string, message: Partial<ChatMessage>): Promise<any> {
     return lambdaClient.message.update.mutate({ id, value: message });
   }

package/src/services/message/type.ts

@@ -17,7 +17,7 @@ export interface CreateMessageParams
   traceId?: string;
   topicId?: string;
   content: string;
-  error?: ChatMessageError;
+  error?: ChatMessageError | null;
   role: MessageRoleType;
 }
 

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

@@ -19,12 +19,14 @@ import { agentSelectors } from '@/store/agent/selectors';
 import { chatHelpers } from '@/store/chat/helpers';
 import { messageMapKey } from '@/store/chat/slices/message/utils';
 import { ChatStore } from '@/store/chat/store';
-import { ChatMessage, MessageToolCall } from '@/types/message';
+import { ChatMessage, ChatMessageError, MessageToolCall } from '@/types/message';
 import { TraceEventPayloads } from '@/types/trace';
 import { setNamespace } from '@/utils/storeDebug';
 import { nanoid } from '@/utils/uuid';
 
+import type { ChatStoreState } from '../../initialState';
 import { chatSelectors, topicSelectors } from '../../selectors';
+import { preventLeavingFn, toggleBooleanList } from '../../utils';
 import { MessageDispatch, messagesReducer } from './reducer';
 
 const n = setNamespace('m');
@@ -84,6 +86,12 @@ export interface ChatMessageAction {
     id?: string,
     action?: string,
   ) => AbortController | undefined;
+  internal_toggleLoadingArrays: (
+    key: keyof ChatStoreState,
+    loading: boolean,
+    id?: string,
+    action?: string,
+  ) => AbortController | undefined;
   internal_toggleToolCallingStreaming: (id: string, streaming: boolean[] | undefined) => void;
   internal_toggleMessageLoading: (loading: boolean, id: string) => void;
   /**
@@ -123,6 +131,7 @@ export interface ChatMessageAction {
     content: string,
     toolCalls?: MessageToolCall[],
   ) => Promise<void>;
+  internal_updateMessageError: (id: string, error: ChatMessageError | null) => Promise<void>;
   internal_createMessage: (
     params: CreateMessageParams,
     context?: { tempMessageId?: string; skipRefresh?: boolean },
@@ -136,24 +145,6 @@ export interface ChatMessageAction {
 const getAgentConfig = () => agentSelectors.currentAgentConfig(useAgentStore.getState());
 const getAgentChatConfig = () => agentSelectors.currentAgentChatConfig(useAgentStore.getState());
 
-const preventLeavingFn = (e: BeforeUnloadEvent) => {
-  // set returnValue to trigger alert modal
-  // Note: No matter what value is set, the browser will display the standard text
-  e.returnValue = '你有正在生成中的请求，确定要离开吗？';
-};
-
-const toggleBooleanList = (ids: string[], id: string, loading: boolean) => {
-  return produce(ids, (draft) => {
-    if (loading) {
-      draft.push(id);
-    } else {
-      const index = draft.indexOf(id);
-
-      if (index >= 0) draft.splice(index, 1);
-    }
-  });
-};
-
 export const chatMessage: StateCreator<
   ChatStore,
   [['zustand/devtools', never]],
@@ -591,35 +582,7 @@ export const chatMessage: StateCreator<
     };
   },
   internal_toggleChatLoading: (loading, id, action) => {
-    if (loading) {
-      window.addEventListener('beforeunload', preventLeavingFn);
-
-      const abortController = new AbortController();
-      set(
-        {
-          abortController,
-          chatLoadingIds: toggleBooleanList(get().messageLoadingIds, id!, loading),
-        },
-        false,
-        action,
-      );
-
-      return abortController;
-    } else {
-      if (!id) {
-        set({ abortController: undefined, chatLoadingIds: [] }, false, action);
-      } else
-        set(
-          {
-            abortController: undefined,
-            chatLoadingIds: toggleBooleanList(get().messageLoadingIds, id, loading),
-          },
-          false,
-          action,
-        );
-
-      window.removeEventListener('beforeunload', preventLeavingFn);
-    }
+    return get().internal_toggleLoadingArrays('chatLoadingIds', loading, id, action);
   },
   internal_toggleMessageLoading: (loading, id) => {
     set(
@@ -684,6 +647,11 @@ export const chatMessage: StateCreator<
     await internal_coreProcessMessage(contextMessages, latestMsg.id, { traceId });
   },
 
+  internal_updateMessageError: async (id, error) => {
+    get().internal_dispatchMessage({ id, type: 'updateMessages', value: { error } });
+    await messageService.updateMessage(id, { error });
+    await get().refreshMessages();
+  },
   internal_updateMessageContent: async (id, content, toolCalls) => {
     const { internal_dispatchMessage, refreshMessages, internal_transformToolCalls } = get();
 
@@ -762,4 +730,36 @@ export const chatMessage: StateCreator<
         .catch();
     }
   },
+
+  internal_toggleLoadingArrays: (key, loading, id, action) => {
+    if (loading) {
+      window.addEventListener('beforeunload', preventLeavingFn);
+
+      const abortController = new AbortController();
+      set(
+        {
+          abortController,
+          [key]: toggleBooleanList(get()[key] as string[], id!, loading),
+        },
+        false,
+        action,
+      );
+
+      return abortController;
+    } else {
+      if (!id) {
+        set({ abortController: undefined, [key]: [] }, false, action);
+      } else
+        set(
+          {
+            abortController: undefined,
+            [key]: toggleBooleanList(get()[key] as string[], id, loading),
+          },
+          false,
+          action,
+        );
+
+      window.removeEventListener('beforeunload', preventLeavingFn);
+    }
+  },
 });

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

@@ -26,6 +26,7 @@ export interface ChatMessageState {
    */
   messagesInit: boolean;
   messagesMap: Record<string, ChatMessage[]>;
+  pluginApiLoadingIds: string[];
   /**
    * the tool calling stream ids
    */
@@ -41,5 +42,6 @@ export const initialMessageState: ChatMessageState = {
   messageLoadingIds: [],
   messagesInit: false,
   messagesMap: {},
+  pluginApiLoadingIds: [],
   toolCallingStreamIds: {},
 };

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

@@ -129,6 +129,8 @@ const isHasMessageLoading = (s: ChatStore) => s.messageLoadingIds.length > 0;
 const isCreatingMessage = (s: ChatStore) => s.isCreatingMessage;
 
 const isMessageGenerating = (id: string) => (s: ChatStore) => s.chatLoadingIds.includes(id);
+const isPluginApiInvoking = (id: string) => (s: ChatStore) => s.pluginApiLoadingIds.includes(id);
+
 const isToolCallStreaming = (id: string, index: number) => (s: ChatStore) => {
   const isLoading = s.toolCallingStreamIds[id];
 
@@ -155,6 +157,7 @@ export const chatSelectors = {
   isMessageEditing,
   isMessageGenerating,
   isMessageLoading,
+  isPluginApiInvoking,
   isToolCallStreaming,
   latestMessage,
   showInboxWelcome,