theluyuan/RWKV-Runner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve sse fetch

Browse Source
This commit is contained in:
josc146 2023-07-25 15:59:37 +08:00
parent 5ae683e915
commit 211ae342af
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/pages/Chat.tsx
View File

@ -184,7 +184,9 @@ const ChatPanel: FC = observer(() => {
const bodyRef = useRef<HTMLDivElement>(null); const bodyRef = useRef<HTMLDivElement>(null);
const inputRef = useRef<HTMLTextAreaElement>(null); const inputRef = useRef<HTMLTextAreaElement>(null);
const mq = useMediaQuery('(min-width: 640px)'); const mq = useMediaQuery('(min-width: 640px)');
const port = commonStore.getCurrentModelConfig().apiParameters.apiPort; const currentConfig = commonStore.getCurrentModelConfig();
const apiParams = currentConfig.apiParameters;
const port = apiParams.apiPort;
let lastMessageId: string; let lastMessageId: string;
let generating: boolean = false; let generating: boolean = false;
@ -308,12 +310,14 @@ const ChatPanel: FC = observer(() => {
body: JSON.stringify({ body: JSON.stringify({
messages, messages,
stream: true, stream: true,
model: commonStore.settings.apiChatModelName // 'gpt-3.5-turbo' model: commonStore.settings.apiChatModelName, // 'gpt-3.5-turbo'
temperature: apiParams.temperature,
top_p: apiParams.topP
}), }),
signal: chatSseController?.signal, signal: chatSseController?.signal,
onmessage(e) { onmessage(e) {
scrollToBottom(); scrollToBottom();
if (e.data === '[DONE]') { if (e.data.trim() === '[DONE]') {
commonStore.conversation[answerId!].done = true; commonStore.conversation[answerId!].done = true;
commonStore.conversation[answerId!].content = commonStore.conversation[answerId!].content.trim(); commonStore.conversation[answerId!].content = commonStore.conversation[answerId!].content.trim();
commonStore.setConversation(commonStore.conversation); commonStore.setConversation(commonStore.conversation);

6
frontend/src/pages/Completion.tsx
View File

@ -219,7 +219,7 @@ const CompletionPanel: FC = observer(() => {
signal: completionSseController?.signal, signal: completionSseController?.signal,
onmessage(e) { onmessage(e) {
scrollToBottom(); scrollToBottom();
if (e.data === '[DONE]') { if (e.data.trim() === '[DONE]') {
commonStore.setCompletionGenerating(false); commonStore.setCompletionGenerating(false);
return; return;
} }
@ -231,8 +231,8 @@ const CompletionPanel: FC = observer(() => {
return; return;
} }
if (data.choices && Array.isArray(data.choices) && data.choices.length > 0) { if (data.choices && Array.isArray(data.choices) && data.choices.length > 0) {
answer += data.choices[0].text; answer += data.choices[0]?.text || data.choices[0]?.delta?.content || '';
setPrompt(prompt + answer.trim() + params.injectEnd.replaceAll('\\n', '\n')); setPrompt(prompt + answer.replace(/\s+$/, '') + params.injectEnd.replaceAll('\\n', '\n'));
} }
}, },
async onopen(response) { async onopen(response) {