@mujian/js-sdk 0.1.0-beta.0 → 0.1.0-beta.2

package/dist/react/chat/useChat/index.d.ts

@@ -4,13 +4,11 @@ export type { Message };
 /**
  * Use chat
  * @param {object} body - The body of the chat.
- * @param {function} onError - The function to call when an error occurs.
  * @param {function} onFinish - The function to call when the chat is finished.
  * @returns {UseChatReturn} The chat.
  */
 export type UseChatProps = {
     body?: object;
-    onError?: (e: unknown) => void;
     onFinish?: (message: Message) => void;
     /** 消息分页大小，不传时不分页 */
     pageSize?: number;
@@ -37,7 +35,6 @@ export type UseChatProps = {
 export type UseChatReturn = {
     messages: Message[];
     status: 'uninitialized' | 'ready' | 'streaming' | 'error';
-    error?: unknown;
     /** 提交用户输入，让AI回答 */
     append: (query: string) => Promise<void>;
     /** 重新生成最后一条回答 */
@@ -54,6 +51,7 @@ export type UseChatReturn = {
     deleteMessage: (messageId: string) => Promise<void>;
     loadMoreMessage: () => Promise<void>;
     messagesStatus: 'all-loaded' | 'loading' | 'has-more' | 'error';
+    refresh: () => Promise<void>;
 };
 /**
  * Use chat common
@@ -67,7 +65,6 @@ export type UseChatCommon = {
  * Use chat
  * @param {UseChatProps} props - The props of the chat.
  * @param {object} props.body - The body of the chat.
- * @param {function} props.onError - The function to call when an error occurs.
  * @param {function} props.onFinish - The function to call when the chat is finished.
  * @param {number} props.pageSize - The page size of the chat.
  * @returns {UseChatReturn} The chat.
@@ -78,4 +75,4 @@ export type UseChatCommon = {
  *   },
  * });
  */
-export declare const useChat: ({ body, onError, onFinish, pageSize, }: UseChatProps) => UseChatReturn;
+export declare const useChat: ({ body, onFinish, pageSize, }: UseChatProps) => UseChatReturn;

package/dist/react/chat/useChat/inner/chatStreaming.d.ts

@@ -4,7 +4,6 @@ import type { UseChatCommon } from '..';
 import type { Message } from '../message';
 interface ChatStreamingProps {
     common: UseChatCommon;
-    setError: (error: unknown) => void;
     setMessages: Dispatch<SetStateAction<Message[]>>;
     getMessages: () => Message[];
     setInput: (input: string) => void;
@@ -12,7 +11,7 @@ interface ChatStreamingProps {
     conversationVersion: RefObject<number>;
 }
 export declare const NOT_SAVED_MSG_ID_PREFIX = "not_saved";
-export declare const useChatStreaming: ({ common, setError, setMessages, getMessages, setInput, mujian, conversationVersion: conversationVersionRef, }: ChatStreamingProps) => {
+export declare const useChatStreaming: ({ common, setMessages, getMessages, setInput, mujian, conversationVersion: conversationVersionRef, }: ChatStreamingProps) => {
     chatStreaming: ({ query, regenerate, is_continue, conversationVersion, }: {
         /** 用户输入 */
         query?: string;

package/dist/react.js

@@ -1,5 +1,6 @@
 import { useInfiniteScroll, useLatest, useRequest, useUnmount, useUpdateEffect } from "ahooks";
 import react, { createContext, forwardRef, useCallback, useContext, useEffect, useRef, useState } from "react";
+import { z } from "zod";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import css_tools from "@adobe/css-tools";
 import dompurify from "dompurify";
@@ -9,7 +10,6 @@ import postmate from "postmate";
 import { Virtualizer } from "virtua";
 import { get } from "lodash-es";
 import { produce } from "immer";
-import { z } from "zod";
 const adjustIframeHeight = (iframeId)=>`
 (function () {
   let scheduled = false;
@@ -1119,13 +1119,6 @@ const errorMessages = [
 function isNetworkError(message) {
     return errorMessages.some((m)=>message.includes(m));
 }
-class SendMessageError extends Error {
-    constructor(message, cause){
-        super(message);
-        this.name = this.constructor.name;
-        this.cause = cause;
-    }
-}
 async function* callSdk(mujian, content, type = 'generate', conversationVersion, assisMsgId) {
     const queue = [];
     let resolveWait = null;
@@ -1172,15 +1165,21 @@ async function* callSdk(mujian, content, type = 'generate', conversationVersion,
         resolveWait = resolve;
     });
 }
+const errorSchema = z.object({
+    message: z.string()
+});
+function isError(e) {
+    const { success } = errorSchema.safeParse(e);
+    return success;
+}
 const NOT_SAVED_MSG_ID_PREFIX = 'not_saved';
-const useChatStreaming = ({ common, setError, setMessages, getMessages, setInput, mujian, conversationVersion: conversationVersionRef })=>{
+const useChatStreaming = ({ common, setMessages, getMessages, setInput, mujian, conversationVersion: conversationVersionRef })=>{
     const { body } = common;
     const [isStreaming, setIsStreaming] = useState(false);
     const chatStreaming = useCallback(async ({ query, regenerate, is_continue, conversationVersion })=>{
+        const backupMessages = getMessages();
         try {
-            setError(void 0);
             setIsStreaming(true);
-            const backupMessages = getMessages();
             const userMessage = {
                 id: `${NOT_SAVED_MSG_ID_PREFIX}_user_${Date.now()}`,
                 isUser: true,
@@ -1204,12 +1203,14 @@ const useChatStreaming = ({ common, setError, setMessages, getMessages, setInput
                 isGenerating: true
             };
             if (regenerate) setMessages(produce((draft)=>{
-                const lastMessage = draft[draft.length - 1];
+                const lastMessage = draft.at(-1);
                 lastMessage.activeSwipeId = lastMessage.swipes.length;
                 lastMessage.swipes.push({
                     content: ''
                 });
                 lastMessage.isGenerating = true;
+                lastMessage.finishReason = void 0;
+                lastMessage.error = void 0;
             }));
             else is_continue ? setMessages((prev)=>[
                     ...prev,
@@ -1220,50 +1221,62 @@ const useChatStreaming = ({ common, setError, setMessages, getMessages, setInput
                     aiMessage
                 ]);
             const stream = callSdk(mujian, query || '', is_continue ? 'continue' : regenerate ? 'regenerate' : 'generate', conversationVersion);
-            try {
-                for await (const chunk of stream){
-                    if (!chunk) return;
-                    if ('meta' === chunk.type) {
-                        if (!regenerate) setMessages(produce((draft)=>{
-                            if (!is_continue) {
-                                const userMsg = draft[draft.length - 2];
-                                userMsg.id = chunk.userMsgId;
-                            }
-                            const lastMessage = draft[draft.length - 1];
-                            lastMessage.id = chunk.assisMsgId;
-                        }));
-                        conversationVersionRef.current = chunk.newConversationVersion;
-                    } else if ('data' === chunk.type) {
-                        setMessages(produce((draft)=>{
-                            const lastMessage = draft[draft.length - 1];
-                            lastMessage.swipes[lastMessage.activeSwipeId] = {
-                                content: chunk.content,
-                                mjv: chunk.mjv
-                            };
-                            if (chunk.finishReason) lastMessage.finishReason = chunk.finishReason;
-                            if (chunk.error) lastMessage.error = chunk.error;
-                        }));
-                        await new Promise((resolve)=>setTimeout(resolve, 10));
-                    }
+            for await (const chunk of stream){
+                if (!chunk) return;
+                if ('meta' === chunk.type) {
+                    if (!regenerate) setMessages(produce((draft)=>{
+                        if (!is_continue) {
+                            const userMsg = draft[draft.length - 2];
+                            userMsg.id = chunk.userMsgId;
+                        }
+                        const lastMessage = draft[draft.length - 1];
+                        lastMessage.id = chunk.assisMsgId;
+                    }));
+                    conversationVersionRef.current = chunk.newConversationVersion;
+                } else if ('data' === chunk.type) {
+                    setMessages(produce((draft)=>{
+                        const lastMessage = draft.at(-1);
+                        lastMessage.swipes[lastMessage.activeSwipeId] = {
+                            content: chunk.content,
+                            mjv: chunk.mjv
+                        };
+                        if (chunk.finishReason) lastMessage.finishReason = chunk.finishReason;
+                        if (chunk.error) lastMessage.error = chunk.error;
+                    }));
+                    await new Promise((resolve)=>setTimeout(resolve, 10));
                 }
-            } catch (error) {
-                Log.e('Stream error', error);
-                if ('object' == typeof error && error && 'message' in error && 'string' == typeof error.message) if ('code' in error && 2011030001 === error.code) {
-                    setMessages(backupMessages);
-                    if (!regenerate && !is_continue && query) setInput(query);
-                } else isNetworkError(error.message) ? setError(new SendMessageError('E_NETWORK_ERROR')) : setError(new SendMessageError(error.message));
-                else setError(error);
-            } finally{
-                setMessages(produce((draft)=>{
-                    const lastMessage = draft[draft.length - 1];
-                    lastMessage.isGenerating = false;
-                }));
             }
         } catch (error) {
-            console.error('Error:', error);
-            setError(new SendMessageError('Send message failed', error));
-            setMessages((prev)=>prev.slice(0, -1));
+            Log.e('Stream error', error);
+            setMessages(produce((draft)=>{
+                const lastMessage = draft.at(-1);
+                if (isError(error) && isNetworkError(error.message)) lastMessage.error = {
+                    code: -10000,
+                    message: 'E_NETWORK_ERROR'
+                };
+                else lastMessage.error = {
+                    code: 1000000005,
+                    message: String(error)
+                };
+            }));
         } finally{
+            setMessages(produce((draft)=>{
+                const lastMessage = draft[draft.length - 1];
+                lastMessage.isGenerating = false;
+                if (lastMessage.error?.code === 2011030009) {
+                    const backup = backupMessages.find((m)=>m.id === lastMessage.id);
+                    if (backup) {
+                        lastMessage.swipes = backup.swipes;
+                        lastMessage.activeSwipeId = backup.activeSwipeId;
+                    } else {
+                        lastMessage.activeSwipeId -= 1;
+                        lastMessage.swipes.length = lastMessage.swipes.length - 1;
+                    }
+                } else if (lastMessage.error?.code === 2011030001) {
+                    setMessages(backupMessages);
+                    query && setInput(query);
+                }
+            }));
             setIsStreaming(false);
         }
     }, [
@@ -1288,13 +1301,20 @@ const useChatStreaming = ({ common, setError, setMessages, getMessages, setInput
             }
         } catch (error) {
             Log.e('Stream error', error);
-            if ('object' == typeof error && error && 'message' in error && 'string' == typeof error.message) isNetworkError(error.message) ? setError(new SendMessageError('E_NETWORK_ERROR')) : setError(new SendMessageError(error.message));
-            else setError(error);
+            setMessages(produce((draft)=>{
+                const lastMessage = draft.at(-1);
+                if (isError(error) && isNetworkError(error.message)) lastMessage.error = {
+                    code: -10000,
+                    message: 'E_NETWORK_ERROR'
+                };
+                else lastMessage.error = {
+                    code: 1000000005,
+                    message: String(error)
+                };
+            }));
         } finally{
-            console.log('finally');
             setMessages(produce((draft)=>{
                 const msg = draft.find((m)=>m.id === messageId);
-                console.log('finally', msg);
                 if (!msg) return;
                 msg.isGenerating = false;
             }));
@@ -1308,17 +1328,12 @@ const useChatStreaming = ({ common, setError, setMessages, getMessages, setInput
         recoverStreaming
     };
 };
-const useChat = ({ body, onError, onFinish, pageSize = 10 })=>{
-    const [error, _setError] = useState();
+const useChat = ({ body, onFinish, pageSize = 10 })=>{
     const [input, setInput] = useState('');
     const conversationVersion = useRef(0);
     const mujian = useMujian();
-    const setError = (error)=>{
-        _setError(error);
-        if (error) onError?.(error);
-    };
     const isLoadingMore = useRef(false);
-    const { data, loadMoreAsync, loadingMore, loading, mutate, error: messageLoadError } = useInfiniteScroll(async (current)=>{
+    const { data, loadMoreAsync, loadingMore, loading, mutate, error: messageLoadError, reloadAsync } = useInfiniteScroll(async (current)=>{
         isLoadingMore.current = true;
         if (current?.noMore) return {
             noMore: true,
@@ -1328,7 +1343,6 @@ const useChat = ({ body, onError, onFinish, pageSize = 10 })=>{
             const resp = await mujian.ai.chat.message.getPage(current?.cursor, pageSize);
             conversationVersion.current = resp.conversationVersion;
             const lastMessage = resp.messages.at(-1);
-            console.log(lastMessage);
             if (lastMessage?.isGenerating) recoverStreaming(lastMessage.id, conversationVersion.current);
             return {
                 cursor: resp.nextCursor,
@@ -1341,6 +1355,9 @@ const useChat = ({ body, onError, onFinish, pageSize = 10 })=>{
     }, {
         direction: 'top'
     });
+    const refresh = async ()=>{
+        await reloadAsync();
+    };
     const loadMoreMessage = async ()=>{
         if (isLoadingMore.current) return;
         try {
@@ -1370,7 +1387,6 @@ const useChat = ({ body, onError, onFinish, pageSize = 10 })=>{
         common: {
             body
         },
-        setError,
         setMessages,
         getMessages,
         setInput,
@@ -1387,15 +1403,10 @@ const useChat = ({ body, onError, onFinish, pageSize = 10 })=>{
     ]);
     const append = useCallback(async (query)=>{
         if (isStreaming) throw new Error('useChat is streaming already.');
-        try {
-            await chatStreaming({
-                query,
-                conversationVersion: conversationVersion.current
-            });
-        } catch (e) {
-            setError(e);
-            throw e;
-        }
+        await chatStreaming({
+            query,
+            conversationVersion: conversationVersion.current
+        });
     }, [
         isStreaming,
         chatStreaming
@@ -1403,17 +1414,12 @@ const useChat = ({ body, onError, onFinish, pageSize = 10 })=>{
     const regenerate = useCallback(async ()=>{
         if (isStreaming) throw new Error('useChat is streaming already.');
         const lastMessage = messages.findLast((message)=>message.isUser);
-        try {
-            const query = lastMessage ? lastMessage.swipes[lastMessage.activeSwipeId].content : '';
-            await chatStreaming({
-                query,
-                regenerate: true,
-                conversationVersion: conversationVersion.current
-            });
-        } catch (e) {
-            setError(e);
-            throw e;
-        }
+        const query = lastMessage ? lastMessage.swipes[lastMessage.activeSwipeId].content : '';
+        await chatStreaming({
+            query,
+            regenerate: true,
+            conversationVersion: conversationVersion.current
+        });
     }, [
         isStreaming,
         messages,
@@ -1421,16 +1427,11 @@ const useChat = ({ body, onError, onFinish, pageSize = 10 })=>{
     ]);
     const continueGenerate = useCallback(async ()=>{
         if (isStreaming) throw new Error('useChat is streaming already.');
-        try {
-            await chatStreaming({
-                query: '',
-                is_continue: true,
-                conversationVersion: conversationVersion.current
-            });
-        } catch (e) {
-            setError(e);
-            throw e;
-        }
+        await chatStreaming({
+            query: '',
+            is_continue: true,
+            conversationVersion: conversationVersion.current
+        });
     }, [
         isStreaming,
         chatStreaming
@@ -1442,10 +1443,10 @@ const useChat = ({ body, onError, onFinish, pageSize = 10 })=>{
     };
     const setSwipe = async (messageId, swipeId)=>{
         if (swipeId < 0) return;
-        setMessages((prev)=>prev.map((msg)=>msg.id === messageId && swipeId < msg.swipes.length ? {
-                    ...msg,
-                    activeSwipeId: swipeId
-                } : msg));
+        setMessages(produce((draft)=>{
+            const msg = draft.find((m)=>m.id === messageId);
+            if (msg) msg.activeSwipeId = swipeId;
+        }));
         const resp = await mujian.ai.chat.message.swipe(messageId, swipeId);
         const schema = z.object({
             newConversationVersion: z.number()
@@ -1460,20 +1461,10 @@ const useChat = ({ body, onError, onFinish, pageSize = 10 })=>{
         });
         const { data, success } = schema.safeParse(resp);
         if (success && data.newConversationVersion) conversationVersion.current = data.newConversationVersion;
-        const patchMessage = (msg)=>{
-            const newMsg = {
-                ...msg,
-                content
-            };
-            if (!newMsg.isUser) {
-                newMsg.swipes = [
-                    ...newMsg.swipes
-                ];
-                newMsg.swipes[newMsg.activeSwipeId].content = content;
-            }
-            return newMsg;
-        };
-        setMessages((prev)=>prev.map((msg)=>msg.id === messageId ? patchMessage(msg) : msg));
+        setMessages(produce((draft)=>{
+            const msg = draft.find((msg)=>msg.id === messageId);
+            if (msg) msg.swipes[msg.activeSwipeId].content = content;
+        }));
     };
     const deleteMessage = async (messageId)=>{
         if (!messageId.startsWith(NOT_SAVED_MSG_ID_PREFIX)) try {
@@ -1495,11 +1486,9 @@ const useChat = ({ body, onError, onFinish, pageSize = 10 })=>{
         stop,
         messages: messages,
         status: (()=>{
-            if (error) return 'error';
             if (isStreaming) return 'streaming';
             return 'ready';
         })(),
-        error,
         setMessages: setMessages,
         input,
         setInput,
@@ -1510,7 +1499,8 @@ const useChat = ({ body, onError, onFinish, pageSize = 10 })=>{
         editMessage,
         deleteMessage,
         loadMoreMessage,
-        messagesStatus: messageLoadError ? 'error' : loadingMore || loading ? 'loading' : data?.noMore ? 'all-loaded' : 'has-more'
+        messagesStatus: messageLoadError ? 'error' : loadingMore || loading ? 'loading' : data?.noMore ? 'all-loaded' : 'has-more',
+        refresh
     };
 };
 export { MdRenderer, MujianProvider, MujianSpinner, Thread, useChat, useChatContext, useMjEngine, useMujian };