rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Null safety for streaming processor

This commit is contained in:
Cohee 2024-07-25 08:40:24 +03:00
parent 83f458fe49
commit c12a283efc
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
public/script.js
View File

@ -2800,6 +2800,8 @@ class StreamingProcessor {
this.messageDom = null; this.messageDom = null;
this.messageTextDom = null; this.messageTextDom = null;
this.messageTimerDom = null; this.messageTimerDom = null;
this.messageTokenCounterDom = null;
/** @type {HTMLTextAreaElement} */
this.sendTextarea = document.querySelector('#send_textarea'); this.sendTextarea = document.querySelector('#send_textarea');
this.type = type; this.type = type;
this.force_name2 = force_name2; this.force_name2 = force_name2;
@ -2815,6 +2817,15 @@ class StreamingProcessor {
this.messageLogprobs = []; this.messageLogprobs = [];
} }
#checkDomElements(messageId) {
if (this.messageDom === null) {
this.messageDom = document.querySelector(`#chat .mes[mesid="${messageId}"]`);
this.messageTextDom = this.messageDom?.querySelector('.mes_text');
this.messageTimerDom = this.messageDom?.querySelector('.mes_timer');
this.messageTokenCounterDom = this.messageDom?.querySelector('.tokenCounterDisplay');
}
}
showMessageButtons(messageId) { showMessageButtons(messageId) {
if (messageId == -1) { if (messageId == -1) {
return; return;
@ -2843,9 +2854,7 @@ class StreamingProcessor {
else { else {
await saveReply(this.type, text, true); await saveReply(this.type, text, true);
messageId = chat.length - 1; messageId = chat.length - 1;
this.messageDom = document.querySelector(`#chat .mes[mesid="${messageId}"]`); this.#checkDomElements(messageId);
this.messageTextDom = this.messageDom.querySelector('.mes_text');
this.messageTimerDom = this.messageDom.querySelector('.mes_timer');
this.showMessageButtons(messageId); this.showMessageButtons(messageId);
} }
@ -2881,9 +2890,9 @@ class StreamingProcessor {
this.sendTextarea.dispatchEvent(new Event('input', { bubbles: true })); this.sendTextarea.dispatchEvent(new Event('input', { bubbles: true }));
} }
else { else {
let currentTime = new Date(); const currentTime = new Date();
// Don't waste time calculating token count for streaming // Don't waste time calculating token count for streaming
let currentTokenCount = isFinal && power_user.message_token_count_enabled ? getTokenCount(processedText, 0) : 0; const currentTokenCount = isFinal && power_user.message_token_count_enabled ? getTokenCount(processedText, 0) : 0;
const timePassed = formatGenerationTimer(this.timeStarted, currentTime, currentTokenCount); const timePassed = formatGenerationTimer(this.timeStarted, currentTime, currentTokenCount);
chat[messageId]['mes'] = processedText; chat[messageId]['mes'] = processedText;
chat[messageId]['gen_started'] = this.timeStarted; chat[messageId]['gen_started'] = this.timeStarted;
@ -2895,8 +2904,9 @@ class StreamingProcessor {
} }
chat[messageId]['extra']['token_count'] = currentTokenCount; chat[messageId]['extra']['token_count'] = currentTokenCount;
const tokenCounter = $(`#chat .mes[mesid="${messageId}"] .tokenCounterDisplay`); if (this.messageTokenCounterDom instanceof HTMLElement) {
tokenCounter.text(`${currentTokenCount}t`); this.messageTokenCounterDom.textContent = `${currentTokenCount}t`;
}
} }
if ((this.type == 'swipe' || this.type === 'continue') && Array.isArray(chat[messageId]['swipes'])) { if ((this.type == 'swipe' || this.type === 'continue') && Array.isArray(chat[messageId]['swipes'])) {
@ -2904,16 +2914,21 @@ class StreamingProcessor {
chat[messageId]['swipe_info'][chat[messageId]['swipe_id']] = { 'send_date': chat[messageId]['send_date'], 'gen_started': chat[messageId]['gen_started'], 'gen_finished': chat[messageId]['gen_finished'], 'extra': JSON.parse(JSON.stringify(chat[messageId]['extra'])) }; chat[messageId]['swipe_info'][chat[messageId]['swipe_id']] = { 'send_date': chat[messageId]['send_date'], 'gen_started': chat[messageId]['gen_started'], 'gen_finished': chat[messageId]['gen_finished'], 'extra': JSON.parse(JSON.stringify(chat[messageId]['extra'])) };
} }
let formattedText = messageFormatting( const formattedText = messageFormatting(
processedText, processedText,
chat[messageId].name, chat[messageId].name,
chat[messageId].is_system, chat[messageId].is_system,
chat[messageId].is_user, chat[messageId].is_user,
messageId, messageId,
); );
this.messageTextDom.innerHTML = formattedText; this.#checkDomElements(messageId);
this.messageTimerDom.textContent = timePassed.timerValue; if (this.messageTextDom instanceof HTMLElement) {
this.messageTimerDom.title = timePassed.timerTitle; this.messageTextDom.innerHTML = formattedText;
}
if (this.messageTimerDom instanceof HTMLElement) {
this.messageTimerDom.textContent = timePassed.timerValue;
this.messageTimerDom.title = timePassed.timerTitle;
}
this.setFirstSwipe(messageId); this.setFirstSwipe(messageId);
} }