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

@1.2.2

Browse Source 
Fixed multiplication of spaces in Pygmalion
Fixed the loop of generation for Pygmalion
This commit is contained in:
Ash
2023-01-25 03:24:38 +04:00
parent f04961c8d3
commit 7391878b1c
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
public/index.html
View File

@ -23,7 +23,7 @@
<script type=module> <script type=module>
import {encode, decode} from "../scripts/gpt-2-3-tokenizer/mod.js"; import {encode, decode} from "../scripts/gpt-2-3-tokenizer/mod.js";
$(document).ready(function(){ $(document).ready(function(){
const VERSION = '1.2.1'; const VERSION = '1.2.2';
var bg_menu_toggle = false; var bg_menu_toggle = false;
var default_user_name = "You"; var default_user_name = "You";
var name1 = default_user_name; var name1 = default_user_name;
@ -608,7 +608,7 @@
if(charDescription !== undefined){ if(charDescription !== undefined){
if($.trim(charDescription).length > 0){ if($.trim(charDescription).length > 0){
if(charDescription.slice(-1) !== ']' || charDescription.substr(0,1) !== '['){ if(charDescription.slice(-1) !== ']' || charDescription.substr(0,1) !== '['){
charDescription = '['+charDescription+']'; //charDescription = '['+charDescription+']';
} }
storyString+=charDescription+'\n'; storyString+=charDescription+'\n';
} }
@ -759,14 +759,18 @@
var this_amount_gen = parseInt(amount_gen); var this_amount_gen = parseInt(amount_gen);
if(is_pygmalion){ if(is_pygmalion){
if(tokens_already_generated === 0){ if(tokens_already_generated === 0){
if(parseInt(amount_gen) >= 90){ if(parseInt(amount_gen) >= 50){
this_amount_gen = 90; this_amount_gen = 50;
}else{ }else{
this_amount_gen = parseInt(amount_gen); this_amount_gen = parseInt(amount_gen);
} }
}else{ }else{
this_amount_gen = tokens_cycle_count; if(parseInt(amount_gen) - tokens_already_generated < tokens_cycle_count){
this_amount_gen = parseInt(amount_gen) - tokens_already_generated;
}else{
this_amount_gen = tokens_cycle_count;
}
} }
} }
generate_data = {prompt: storyString, generate_data = {prompt: storyString,
@ -834,7 +838,7 @@
dataType: "json", dataType: "json",
contentType: "application/json", contentType: "application/json",
success: function(data){ success: function(data){
tokens_already_generated += this_amount_gen;
//$("#send_textarea").focus(); //$("#send_textarea").focus();
//$("#send_textarea").removeAttr('disabled'); //$("#send_textarea").removeAttr('disabled');
is_send_press = false; is_send_press = false;
@ -846,20 +850,22 @@
if(main_api == 'novel'){ if(main_api == 'novel'){
var getMessage = data.output; var getMessage = data.output;
} }
//Pygmalion run again //Pygmalion run again
if(is_pygmalion){ if(is_pygmalion){
if_typing_text = false; if_typing_text = false;
message_already_generated +=getMessage; message_already_generated +=getMessage;
if(message_already_generated.indexOf('You:') === -1 && tokens_already_generated < parseInt(amount_gen)){ if(message_already_generated.indexOf('You:') === -1 && tokens_already_generated < parseInt(amount_gen)){
if(tokens_already_generated === 0){ if(tokens_already_generated === 0){
getMessage = getMessage.trimStart(); getMessage = getMessage.trimStart();
getMessage = ' '+getMessage; getMessage = ' '+getMessage;
} }
tokens_already_generated += tokens_cycle_count;
runGenerate(storyString+getMessage); runGenerate(storyString+getMessage);
return; return;
} }
getMessage = message_already_generated; getMessage = message_already_generated;
} }
//Formating //Formating
@ -876,6 +882,7 @@
let this_mes_is_name = true; let this_mes_is_name = true;
if(getMessage.indexOf(name2+":") === 0){ if(getMessage.indexOf(name2+":") === 0){
getMessage = getMessage.replace(name2+':', ''); getMessage = getMessage.replace(name2+':', '');
getMessage = getMessage.trimStart();
}else{ }else{
this_mes_is_name = false; this_mes_is_name = false;
} }
@ -887,6 +894,7 @@
chat[chat.length-1]['is_user'] = false; chat[chat.length-1]['is_user'] = false;
chat[chat.length-1]['is_name'] = this_mes_is_name; chat[chat.length-1]['is_name'] = this_mes_is_name;
chat[chat.length-1]['send_date'] = Date.now(); chat[chat.length-1]['send_date'] = Date.now();
getMessage = $.trim(getMessage);
chat[chat.length-1]['mes'] = getMessage; chat[chat.length-1]['mes'] = getMessage;
addOneMessage(chat[chat.length-1]); addOneMessage(chat[chat.length-1]);
$( "#send_but" ).css("display", "block"); $( "#send_but" ).css("display", "block");