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:
RossAscends
2023-04-30 23:25:57 +09:00
parent 8d2b956d30 564caf0621
commit c0f5057660
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
public/script.js
View File

@@ -81,6 +81,7 @@ import {
checkHordeStatus, checkHordeStatus,
getHordeModels, getHordeModels,
adjustHordeGenerationParams, adjustHordeGenerationParams,
MIN_AMOUNT_GEN,
} from "./scripts/horde.js"; } from "./scripts/horde.js";
import { import {
@@ -1434,11 +1435,11 @@ async function Generate(type, automatic_trigger, force_name2) {
return; return;
} }
if (isStreamingEnabled()) { streamingProcessor = isStreamingEnabled() ? new StreamingProcessor(type, force_name2) : false;
streamingProcessor = new StreamingProcessor(type, force_name2);
// Hide swipes on either multigen or real streaming
if (isStreamingEnabled() || isMultigenEnabled()) {
hideSwipeButtons(); hideSwipeButtons();
} else {
streamingProcessor = false;
} }
if (selected_group && !is_group_generating) { if (selected_group && !is_group_generating) {
@@ -1929,6 +1930,7 @@ async function Generate(type, automatic_trigger, force_name2) {
if (main_api == 'kobold' && horde_settings.use_horde && hordeAmountGen) { if (main_api == 'kobold' && horde_settings.use_horde && hordeAmountGen) {
this_amount_gen = Math.min(this_amount_gen, hordeAmountGen); this_amount_gen = Math.min(this_amount_gen, hordeAmountGen);
this_amount_gen = Math.max(this_amount_gen, MIN_AMOUNT_GEN); // prevent validation errors
} }
let generate_data; let generate_data;
@@ -2024,7 +2026,6 @@ async function Generate(type, automatic_trigger, force_name2) {
} }
function onSuccess(data) { function onSuccess(data) {
tokens_already_generated += this_amount_gen; // add new gen amt to any prev gen counter..
is_send_press = false; is_send_press = false;
if (!data.error) { if (!data.error) {
@@ -2041,7 +2042,7 @@ async function Generate(type, automatic_trigger, force_name2) {
if (shouldContinueMultigen(getMessage)) { if (shouldContinueMultigen(getMessage)) {
let this_mes_is_name; let this_mes_is_name;
({ this_mes_is_name, getMessage } = extractNameFromMessage(getMessage, force_name2, isImpersonate)); ({ this_mes_is_name, getMessage } = extractNameFromMessage(getMessage, force_name2, isImpersonate));
if (generate_loop_counter == 0) { if (tokens_already_generated == 0) {
console.log("New message"); console.log("New message");
({ type, getMessage } = saveReply(type, getMessage, this_mes_is_name, title)); ({ type, getMessage } = saveReply(type, getMessage, this_mes_is_name, title));
} }
@@ -2049,7 +2050,8 @@ async function Generate(type, automatic_trigger, force_name2) {
console.log("Should append message"); console.log("Should append message");
({ type, getMessage } = saveReply('append', getMessage, this_mes_is_name, title)); ({ type, getMessage } = saveReply('append', getMessage, this_mes_is_name, title));
} }
generate_loop_counter++; hideSwipeButtons();
tokens_already_generated += this_amount_gen; // add new gen amt to any prev gen counter..
getMessage = message_already_generated; getMessage = message_already_generated;
runGenerate(getMessage); runGenerate(getMessage);
console.log('returning to make generate again'); console.log('returning to make generate again');
@@ -2064,7 +2066,6 @@ async function Generate(type, automatic_trigger, force_name2) {
let this_mes_is_name; let this_mes_is_name;
({ this_mes_is_name, getMessage } = extractNameFromMessage(getMessage, force_name2, isImpersonate)); ({ this_mes_is_name, getMessage } = extractNameFromMessage(getMessage, force_name2, isImpersonate));
//getMessage = getMessage.replace(/^\s+/g, '');
if (getMessage.length > 0) { if (getMessage.length > 0) {
if (isImpersonate) { if (isImpersonate) {
$('#send_textarea').val(getMessage).trigger('input'); $('#send_textarea').val(getMessage).trigger('input');
@@ -2348,7 +2349,7 @@ function saveReply(type, getMessage, this_mes_is_name, title) {
chat[chat.length - 1]['mes'] += getMessage; chat[chat.length - 1]['mes'] += getMessage;
addOneMessage(chat[chat.length - 1], { type: 'swipe' }); addOneMessage(chat[chat.length - 1], { type: 'swipe' });
} else if (type === 'appendFinal') { } else if (type === 'appendFinal') {
console.log("Trying to append.") console.log("Trying to appendFinal.")
chat[chat.length - 1]['title'] = title; chat[chat.length - 1]['title'] = title;
chat[chat.length - 1]['mes'] = getMessage; chat[chat.length - 1]['mes'] = getMessage;
addOneMessage(chat[chat.length - 1], { type: 'swipe' }); addOneMessage(chat[chat.length - 1], { type: 'swipe' });

2
public/scripts/horde.js
View File

@@ -8,6 +8,7 @@ export {
loadHordeSettings, loadHordeSettings,
adjustHordeGenerationParams, adjustHordeGenerationParams,
getHordeModels, getHordeModels,
MIN_AMOUNT_GEN,
} }
let models = []; let models = [];
@@ -21,6 +22,7 @@ let horde_settings = {
const MAX_RETRIES = 100; const MAX_RETRIES = 100;
const CHECK_INTERVAL = 3000; const CHECK_INTERVAL = 3000;
const MIN_AMOUNT_GEN = 16;
async function getWorkers() { async function getWorkers() {
const response = await fetch('https://horde.koboldai.net/api/v2/workers?type=text'); const response = await fetch('https://horde.koboldai.net/api/v2/workers?type=text');