diff --git a/src/pages/playground/components/ground-left.tsx b/src/pages/playground/components/ground-left.tsx index 74c4b70f..3713cbbf 100644 --- a/src/pages/playground/components/ground-left.tsx +++ b/src/pages/playground/components/ground-left.tsx @@ -187,7 +187,7 @@ const GroundLeft: React.FC = forwardRef((props, ref) => { if (result?.error) { setTokenResult({ error: true, - errorMessage: result?.data?.message + errorMessage: result?.data?.error?.message }); return; } diff --git a/src/pages/playground/components/multiple-chat/model-item.tsx b/src/pages/playground/components/multiple-chat/model-item.tsx index 77f8e27d..fc9d6c8c 100644 --- a/src/pages/playground/components/multiple-chat/model-item.tsx +++ b/src/pages/playground/components/multiple-chat/model-item.tsx @@ -188,7 +188,7 @@ const ModelItem: React.FC = forwardRef( if (result?.error) { setTokenResult({ error: true, - errorMessage: result?.data?.message + errorMessage: result?.data?.error?.message }); return; } diff --git a/src/pages/playground/hooks/use-chat-completion.ts b/src/pages/playground/hooks/use-chat-completion.ts deleted file mode 100644 index e4176348..00000000 --- a/src/pages/playground/hooks/use-chat-completion.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { fetchChunkedData, readStreamData } from '@/utils/fetch-chunk-data'; -import _ from 'lodash'; -import { useRef, useState } from 'react'; -import { CHAT_API } from '../apis'; -import { Roles } from '../config'; - -interface MessageItemProps { - role: string | number; - content: string; - uid: number; -} - -const useChatCompletion = () => { - const [loading, setLoading] = useState(false); - const messageId = useRef(0); - const [messageList, setMessageList] = useState([]); - const contentRef = useRef(''); - const controllerRef = useRef(null); - - const setMessageId = () => { - messageId.current = messageId.current + 1; - }; - - const abortFetch = () => { - controllerRef.current?.abort?.(); - }; - - const joinMessage = (chunk: any) => { - if (!chunk) { - return; - } - if (_.get(chunk, 'choices.0.finish_reason')) { - return; - } - contentRef.current = - contentRef.current + _.get(chunk, 'choices.0.delta.content', ''); - setMessageList([ - ...messageList, - { - role: Roles.Assistant, - content: contentRef.current, - uid: messageId.current - } - ]); - }; - - const submitMessage = async (pramas: { - parameters: Record; - systemMessage: string; - }) => { - const { parameters, systemMessage } = pramas; - if (!parameters.model) return; - try { - setLoading(true); - setMessageId(); - console.log('messagelist=========2=', messageList); - controllerRef.current?.abort?.(); - controllerRef.current = new AbortController(); - const signal = controllerRef.current.signal; - const messages = _.map(messageList, (item: MessageItemProps) => { - return { - role: item.role, - content: item.content - }; - }); - - contentRef.current = ''; - const chatParams = { - messages: systemMessage - ? [ - { - role: Roles.System, - content: systemMessage - }, - ...messages - ] - : [...messages], - ...parameters, - stream: true - }; - const result = await fetchChunkedData({ - data: chatParams, - url: CHAT_API, - signal - }); - - if (!result) { - return; - } - const { reader, decoder } = result; - await readStreamData(reader, decoder, (chunk: any) => { - joinMessage(chunk); - }); - setLoading(false); - } catch (error) { - console.log('error=====', error); - setLoading(false); - } - }; - - return { - loading, - messageList, - setMessageList, - submitMessage, - abortFetch - }; -}; - -export default useChatCompletion;