rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

Browse Source
This commit is contained in:
SillyLossy
2023-04-13 21:50:24 +03:00
parent f7e89b345d 9a847420ca
commit 0cb78685a9
69 changed files with 163 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/script.js
View File

@@ -302,7 +302,7 @@ $(document).ajaxError(function myErrorHandler(_, xhr) {
}
});
function getTokenCount(str, padding=0) {
function getTokenCount(str, padding = 0) {
if (main_api == 'poe' || main_api == 'openai') {
return gpt3.encode(str).bpe.length + padding;
}
@@ -961,7 +961,9 @@ function addOneMessage(mes, type = "normal", insertAfter = null) {
}
newMessage.find('.avatar img').on('error', function () {
$(this).attr("src", "/img/user-slash-solid.svg");
/* $(this).attr("src", "/img/user-slash-solid.svg"); */
$(this).hide();
$(this).parent().html(`<div class="missing-avatar fa-solid fa-user-slash"></div>`);
});
if (type === 'swipe') {
@@ -1150,13 +1152,13 @@ function isStreamingEnabled() {
class StreamingProcessor {
showStopButton(messageId) {
$(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({'display': 'block'});
$(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({'display': 'none'});
$(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({ 'display': 'block' });
$(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({ 'display': 'none' });
}
hideStopButton(messageId) {
$(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({'display': 'none'});
$(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({'display': 'block'});
$(`#chat .mes[mesid="${messageId}"] .mes_stop`).css({ 'display': 'none' });
$(`#chat .mes[mesid="${messageId}"] .mes_edit`).css({ 'display': 'block' });
}
onStartStreaming(text) {
@@ -1922,7 +1924,7 @@ async function Generate(type, automatic_trigger, force_name2) {
getMessage = message_already_generated;
}
if (streamingProcessor.isFinished) {
streamingProcessor.onFinishStreaming(streamingProcessor.messageId, getMessage);
streamingProcessor = null;
@@ -4929,6 +4931,7 @@ $(document).ready(function () {
$(document).on('click', '.inline-drawer-toggle', function () {
var icon = $(this).find('.inline-drawer-icon');
icon.toggleClass('down up');
icon.toggleClass('fa-circle-chevron-down fa-circle-chevron-up');
$(this).closest('.inline-drawer').find('.inline-drawer-content').slideToggle();
});