|
|
@@ -12,7 +12,9 @@ function appendUserMessageToCtx(msg) {
|
|
|
});
|
|
|
}
|
|
|
|
|
|
-function onStreamEvent(elem, data) {
|
|
|
+let renderCnt = 0;
|
|
|
+
|
|
|
+function onStreamEvent(elem, data, forceRender=false) {
|
|
|
let container = document.getElementById('message-container');
|
|
|
let shouldScroll = false;
|
|
|
if (container.scrollTop + container.clientHeight >= container.scrollHeight - 100) {
|
|
|
@@ -22,6 +24,8 @@ function onStreamEvent(elem, data) {
|
|
|
let deltaContent = data.choices?.[0]?.delta?.content;
|
|
|
if (deltaContent === undefined) deltaContent = '';
|
|
|
currentMessage = currentMessage + deltaContent;
|
|
|
+ renderCnt++;
|
|
|
+ if (renderCnt % 10 !== 0 && !forceRender) return;
|
|
|
let renderContent = currentMessage.replace('<think>', '<div class="think">\n\n');
|
|
|
renderContent = renderContent.replace('</think>', '\n\n</div>').trim();
|
|
|
renderContent = renderContent
|
|
|
@@ -38,7 +42,8 @@ function onStreamEvent(elem, data) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-function onStreamEnd() {
|
|
|
+function onStreamEnd(elem) {
|
|
|
+ onStreamEvent(elem, {}, true)
|
|
|
context.push({
|
|
|
role: 'assistant',
|
|
|
content: currentMessage.replace(/<think>[\s\S]*?<\/think>/g, ''),
|
|
|
@@ -51,10 +56,10 @@ function onStreamEnd() {
|
|
|
async function fetchAiStream() {
|
|
|
const headers = {
|
|
|
'Content-Type': 'application/json',
|
|
|
- 'Authorization': `Bearer ${globalConfig.key}`
|
|
|
+ 'Authorization': `Bearer ${globalCurrentModel.key}`
|
|
|
};
|
|
|
const requestBody = {
|
|
|
- model: globalConfig.model,
|
|
|
+ model: globalCurrentModel.model,
|
|
|
messages: context,
|
|
|
stream: true
|
|
|
};
|
|
|
@@ -62,17 +67,19 @@ async function fetchAiStream() {
|
|
|
let container = document.getElementById('message-container');
|
|
|
container.appendChild(elem);
|
|
|
container.scrollTop = container.scrollHeight;
|
|
|
+ elem.innerHTML = '<p>Generating...</p>';
|
|
|
try {
|
|
|
- const response = await fetch(globalConfig.url, {
|
|
|
+ const response = await fetch(globalCurrentModel.url, {
|
|
|
method: 'POST',
|
|
|
headers,
|
|
|
- body: JSON.stringify(requestBody)
|
|
|
+ body: JSON.stringify(requestBody),
|
|
|
});
|
|
|
if (!response.ok) {
|
|
|
throw new Error(`HTTP error! status: ${response.status}`);
|
|
|
}
|
|
|
const decoder = new TextDecoder();
|
|
|
const reader = response.body.getReader();
|
|
|
+ let generationStarted = false;
|
|
|
while (true) {
|
|
|
const { done, value } = await reader.read();
|
|
|
if (done) {
|
|
|
@@ -81,9 +88,13 @@ async function fetchAiStream() {
|
|
|
const chunk = decoder.decode(value);
|
|
|
const lines = chunk.split('\n');
|
|
|
for (const line of lines) {
|
|
|
+ if (!generationStarted) {
|
|
|
+ generationStarted = true;
|
|
|
+ elem.innerHTML = '';
|
|
|
+ }
|
|
|
if (getStopGenerating()) {
|
|
|
resetStopGenerating();
|
|
|
- onStreamEnd();
|
|
|
+ onStreamEnd(elem);
|
|
|
return;
|
|
|
}
|
|
|
if (line === '') continue;
|
|
|
@@ -96,9 +107,10 @@ async function fetchAiStream() {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- onStreamEnd();
|
|
|
+ onStreamEnd(elem);
|
|
|
} catch (error) {
|
|
|
console.error('Error:', error);
|
|
|
+ onStreamEnd(elem);
|
|
|
let p = document.createElement('p');
|
|
|
p.innerHTML = error;
|
|
|
p.style.color = 'red';
|
