")).replace(/``(.*?)``/gm,function(e,l){return"
"+r(l).replace(/`/g,"`")+""})).replace(/`(.*?)`/gm,"$1")).replace(/^\>\> (.*$)/gm,"")).replace(/^\> (.*$)/gm,"$1
$1")).replace(/<\/blockquote\>\n
")).replace(/!\[(.*?)\]\((.*?) "(.*?)"\)/gm,'
- $1
- $1
- /gm,"
- ")).replace(/^\s{2,6}[\*+-][ .](.*)/gm,"
- $1
- $1
$1")).replace(/\^\^(\w.*?)\^\^/gm,"$1")).replace(/\{\{(\w.*?)\}\}/gm,"$1")).replace(/^((?:\|[^|\r\n]*[^|\r\n\s]\s*)+\|(?:\r?\n|\r|))+/gm,function (matchedTable){return convertMarkdownTableToHtml(matchedTable);})).replace(/ \n/g,"\n
") + .replace(/^[\*+-][ .](.*)/gm,"- $1
- $1
- /gm,"
- ")).replace(/^<[ou]l>
- (.*\%SpcStg\%.*\%SpcEtg\%.*)<\/li><\/[ou]l\>/gm,"$1").replace(/^\s{2,6}[\*+-][ .](.*)/gm,"
- $1
- $1
- /gm,"
- ")).replace(/\*\*\*(\w.*?[^\\])\*\*\*/gm,"$1")).replace(/\*\*(\w.*?[^\\])\*\*/gm,"$1")).replace(/\*(\w.*?[^\\])\*/gm,"$1")).replace(/___(\w.*?[^\\])___/gm,"$1")).replace(/__(\w.*?[^\\])__/gm,"$1")).replace(/~~(\w.*?)~~/gm,"
$1")).replace(/\^\^(\w.*?)\^\^/gm,"$1")).replace(/\{\{(\w.*?)\}\}/gm,"$1")).replace(/^((?:\|[^|\r\n]*[^|\r\n\s]\s*)+\|(?:\r?\n|\r|))+/gm,function (matchedTable){return convertMarkdownTableToHtml(matchedTable);})).replace(/ \n/g,"\n
") //.replace(/\n\s*\n/g,"\n\n") ).replace(/^ {4,10}(.*)/gm,function(e,l){return"
"})).replace(/^\t(.*)/gm,function(e,l){return""+r(l)+"
"})).replace(/<\/code\><\/pre\>\n"+r(l)+""))>=0;)n=e.indexOf("",a),p+=c(e.substr(0,a))+e.substr(a+6,n>0?n-a-6:mdtext.length),e=e.substr(n+7);return p+c(e)} @@ -3125,11 +3199,14 @@ Current version: 83 const koboldcpp_abort_endpoint = "/api/extra/abort"; const koboldcpp_check_endpoint = "/api/extra/generate/check"; const koboldcpp_truemaxctxlen_endpoint = "/api/extra/true_max_context_length"; + const koboldcpp_preloadstory_endpoint = "/api/extra/preloadstory"; const oai_models_endpoint = "/models"; const oai_submit_endpoint = "/completions"; const oai_submit_endpoint_turbo = "/chat/completions"; + const default_oai_image_endpoint = "/images/generations"; + const scale_submit_endpoint = "https://dashboard.scale.com/spellbook/api/v2/deploy/" const claude_submit_endpoint = "/complete"; @@ -3138,6 +3215,7 @@ Current version: 83 const default_oai_base = "https://api.openai.com"; const default_claude_base = "https://api.anthropic.com"; const default_palm_base = "https://generativelanguage.googleapis.com/v1beta2/models/text-bison-001:generateText?key="; + const default_gemini_base = "https://generativelanguage.googleapis.com/v1beta/models/gemini-pro:generateContent?key="; const a1111_models_endpoint = "/sdapi/v1/sd-models"; const a1111_options_endpoint = "/sdapi/v1/options"; @@ -3163,6 +3241,7 @@ Current version: 83 var gametext_arr = []; //array of texts currently displayed var redo_arr = []; //array of texts that are in the redo stack var retry_prev_text = "" ; //when we retry, save the last version in case they want to undo + var retry_preserve_last = false; //if true, retrying does not delete any old text var redo_prev_text = ""; //if we undo a retry, save a copy here so it can be reverted with redo var pending_response_id = ""; //guid of response pending from horde server var pending_response_horde = text_hordes[0]; //the url to poll for pending response from a v2 submit @@ -3179,13 +3258,14 @@ Current version: 83 var anote_strength = 320; //distance from end var newlineaftermemory = true; var current_wi = []; //each item stores a wi object. + var wi_insertlocation = 0; //after memory var wi_searchdepth = 0; //search everything var generateimagesinterval = 650; //if generated images is enabled, it will trigger after every 600 new characters in context. var nextgeneratedimagemilestone = generateimagesinterval; //used to keep track of when to generate the next image var image_db = {}; //stores a dictionary of pending images var completed_imgs_meta = {}; //stores temp info on completed images like alt text //key is ID, body is {done:false,queue:10,result:""} - var stablemodels = []; //stored as {name,count} + var stablemodels = [{"name": "stable_diffusion","count": 1}]; //stored as {name,count} var custom_kobold_endpoint = ""; //if set, does not use horde. Instead, attempts to use this sync endpoint var custom_oai_endpoint = ""; var custom_oai_key = ""; //if set, uses the OpenAI API to generate @@ -3201,7 +3281,6 @@ Current version: 83 var synchro_polled_response = null; var synchro_pending_stream = ""; //used for token pseduo streaming for kobold api only var waiting_for_autosummary = false; - var filter_enabled = true; var italics_regex = new RegExp(/\*(\S[^*]+\S)\*/g); //the fallback regex var temp_scenario = null; var last_token_budget = ""; //to display token limits @@ -3212,12 +3291,17 @@ Current version: 83 var koboldcpp_version = ""; //detect if we are using koboldcpp var last_request_str = "No Requests Available"; //full context of last submitted request var lastcheckgenkey = ""; //for checking polled-streaming unique id when generating in kcpp + var globalabortcontroller = null; + var passed_ai_warning_local = false; + var welcome = ""; var localsettings = { my_api_key: "0000000000", //put here so it can be saved and loaded in persistent mode home_cluster: text_hordes[0].baseurl, //which horde does this api key belongs to saved_oai_key: "", //do not ever share this in save files! saved_oai_addr: default_oai_base, //do not ever share this in save files! + saved_dalle_key: "", + saved_dalle_url: (default_oai_base + "/v1" + default_oai_image_endpoint), saved_openrouter_key: "", saved_claude_key: "", //do not ever share this in save files! saved_claude_addr: default_claude_base, //do not ever share this in save files! @@ -3225,6 +3309,7 @@ Current version: 83 saved_kai_addr: "", //do not ever share this in save files! saved_oai_jailbreak: "", //customized oai system prompt saved_oai_custommodel: "", //customized oai custom model + prev_custom_endpoint_type: 0, //show a reconnect box to custom endpoint if needed. 0 is horde, otherwise its dropdown value+1 autoscroll: true, //automatically scroll to bottom on render trimsentences: true, //trim to last punctuation @@ -3243,10 +3328,11 @@ Current version: 83 persist_session: true, speech_synth: 0, //0 is disabled beep_on: false, + narrate_both_sides: false, image_styles: "", grammar:"", tokenstreammode: (localflag?1:0), //0=off,1=pollstream,2=sse - generate_images_mode: (localflag?0:1), //0=off, 1=horde, 2=a1111 + generate_images_mode: (localflag?0:1), //0=off, 1=horde, 2=a1111, 3=dalle generate_images_model: "stable_diffusion", //"" is disabled and "*" is all, anything else is the model name pulled from stable horde img_autogen: false, img_allownsfw: true, @@ -3261,11 +3347,12 @@ Current version: 83 idle_responses: 0, idle_duration: 60, export_settings: true, //affects if settings are included with the story and sharelinks + show_advanced_load: false, //if true, every load opens the selector window invert_colors: false, passed_ai_warning: false, //used to store AI safety panel acknowledgement state entersubmit: true, //enter sends the prompt - max_context_length: 1024, + max_context_length: 1600, max_length: 120, auto_ctxlen: true, auto_genamt: true, @@ -3274,6 +3361,9 @@ Current version: 83 rep_pen_slope: 0.7, temperature: 0.7, top_p: 0.92, + min_p: 0.00, + presence_penalty: 0.00, + sampler_seed: -1, top_k: 100, top_a: 0, typ_s: 1, @@ -3295,6 +3385,8 @@ Current version: 83 genamt: defaultsettings.max_length, top_k: defaultsettings.top_k, top_p: defaultsettings.top_p, + min_p: defaultsettings.min_p, + presence_penalty: defaultsettings.presence_penalty, top_a: defaultsettings.top_a, typical: defaultsettings.typ_s, tfs: defaultsettings.tfs_s, @@ -3310,6 +3402,8 @@ Current version: 83 genamt: defaultsettings.max_length, top_k: defaultsettings.top_k, top_p: defaultsettings.top_p, + min_p: defaultsettings.min_p, + presence_penalty: defaultsettings.presence_penalty, top_a: defaultsettings.top_a, typical: defaultsettings.typ_s, tfs: defaultsettings.tfs_s, @@ -3318,7 +3412,7 @@ Current version: 83 rep_pen_slope: defaultsettings.rep_pen_slope, sampler_order: [0, 1, 2, 3, 4, 5, 6] }, - {"preset":"Godlike","description":"Makes AI give a descriptive and sensual output.","temp":0.7,"genamt":80,"top_k":0,"top_p":0.5,"top_a":0.75,"typical":0.19,"tfs":0.97,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,5,4,3,2,1,0]},{"preset":"Mayday","description":"Wacky plot, creativity from AI, crazy stories you want AI to weird out.","temp":1.05,"genamt":80,"top_k":0,"top_p":0.95,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,0,1,2,3,4,5]},{"preset":"Good Winds","description":"Let AI direct the plot, but still stay logical.","temp":0.7,"genamt":80,"top_k":0,"top_p":1,"top_a":0,"typical":1,"tfs":0.9,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,0,1,2,3,4,5]},{"preset":"Liminal Drift","description":"Drives coherent dialogue, responses, and behavior, sometimes surreal situations arise based on information already present in the story.","temp":0.66,"genamt":80,"top_k":0,"top_p":1,"top_a":0.96,"typical":0.6,"tfs":1,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,4,5,1,0,2,3]},{"preset":"TavernAI","description":"Preset used in TavernAI.","temp":0.79,"genamt":80,"top_k":0,"top_p":0.9,"top_a":0,"typical":1,"tfs":0.95,"rep_pen":1.19,"rep_pen_range":1024,"rep_pen_slope":0.9,"sampler_order":[6,0,1,2,3,4,5]},{"preset":"Storywriter 6B","description":"Optimized settings for relevant output.","genamt":80,"rep_pen":1.1,"rep_pen_range":2048,"rep_pen_slope":0.2,"sampler_order":[6,5,0,2,3,1,4],"temp":0.72,"tfs":1,"top_a":0,"top_k":0,"top_p":0.73,"typical":1},{"preset":"Coherent Creativity 6B","description":"A good balance between coherence, creativity, and quality of prose.","genamt":80,"rep_pen":1.2,"rep_pen_range":2048,"rep_pen_slope":0,"sampler_order":[6,5,0,2,3,1,4],"temp":0.51,"tfs":0.99,"top_a":0,"top_k":0,"top_p":1,"typical":1},{"preset":"Luna Moth 6B","description":"A great degree of creativity without losing coherency.","temp":1.5,"genamt":80,"top_k":85,"top_p":0.24,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.1,"rep_pen_range":2048,"rep_pen_slope":0,"sampler_order":[6,5,0,2,3,1,4]},{"preset":"Best Guess 6B","description":"A subtle change with alternative context settings.","temp":0.8,"genamt":80,"top_k":100,"top_p":0.9,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.15,"rep_pen_range":2048,"rep_pen_slope":3.4,"sampler_order":[6,5,0,2,3,1,4]},{"preset":"Pleasing Results 6B","description":"Expectable output with alternative context settings.","temp":0.44,"genamt":80,"top_k":0,"top_p":1,"top_a":0,"typical":1,"tfs":0.9,"rep_pen":1.15,"rep_pen_range":2048,"rep_pen_slope":6.8,"sampler_order":[6,5,0,2,3,1,4]},{"preset":"Genesis 13B","description":"Stable and logical, but with scattered creativity.","temp":0.63,"genamt":80,"top_k":0,"top_p":0.98,"top_a":0,"typical":1,"tfs":0.98,"rep_pen":1.05,"rep_pen_range":2048,"rep_pen_slope":0.1,"sampler_order":[6,2,0,3,5,1,4]},{"preset":"Basic Coherence 13B","description":"Keep things on track.","temp":0.59,"genamt":80,"top_k":0,"top_p":1,"top_a":0,"typical":1,"tfs":0.87,"rep_pen":1.1,"rep_pen_range":2048,"rep_pen_slope":0.3,"sampler_order":[6,5,0,2,3,1,4]},{"preset":"Ouroboros 13B","description":"Versatile, conforms well to poems, lists, chat, etc.","temp":1.07,"genamt":80,"top_k":100,"top_p":1,"top_a":0,"typical":1,"tfs":0.93,"rep_pen":1.05,"rep_pen_range":404,"rep_pen_slope":0.8,"sampler_order":[6,0,5,3,2,1,4]},{"preset":"Ace of Spades 13B","description":"Expressive, while still staying focused.","temp":1.15,"genamt":80,"top_k":0,"top_p":0.95,"top_a":0,"typical":1,"tfs":0.8,"rep_pen":1.05,"rep_pen_range":2048,"rep_pen_slope":7,"sampler_order":[6,3,2,0,5,1,4]},{"preset":"Low Rider 13B","description":"Reliable, aimed at story development.","temp":0.94,"genamt":80,"top_k":12,"top_p":1,"top_a":0,"typical":1,"tfs":0.94,"rep_pen":1.05,"rep_pen_range":2048,"rep_pen_slope":0.2,"sampler_order":[6,5,0,2,3,1,4]},{"preset":"Pro Writer 13B","description":"Optimal setting for readability, based on AI-powered mass statistical analysis of Euterpe output.","temp":1.35,"genamt":80,"top_k":0,"top_p":1,"top_a":0,"typical":1,"tfs":0.69,"rep_pen":1.15,"rep_pen_range":2048,"rep_pen_slope":0.1,"sampler_order":[6,3,2,5,0,1,4]},{"preset":"Default 20B","description":"Good starting settings for NeoX 20B.","temp":0.6,"genamt":80,"top_k":0,"top_p":0.9,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.04,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,0,1,2,3,4,5]} + {"preset":"Godlike","description":"Makes AI give a descriptive and sensual output.","temp":0.7,"genamt":120,"top_k":0,"top_p":0.5,"min_p":0.0,"presence_penalty":0.0,"top_a":0.75,"typical":0.19,"tfs":0.97,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,5,4,3,2,1,0]},{"preset":"Mayday","description":"Wacky plot, creativity from AI, crazy stories you want AI to weird out.","temp":1.05,"genamt":120,"top_k":0,"top_p":0.95,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,0,1,2,3,4,5]},{"preset":"Good Winds","description":"Let AI direct the plot, but still stay logical.","temp":0.7,"genamt":120,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":0.9,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,0,1,2,3,4,5]},{"preset":"Liminal Drift","description":"Drives coherent dialogue, responses, and behavior, sometimes surreal situations arise based on information already present in the story.","temp":0.66,"genamt":120,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"top_a":0.96,"typical":0.6,"tfs":1,"rep_pen":1.1,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,4,5,1,0,2,3]},{"preset":"TavernAI","description":"Preset used in TavernAI.","temp":0.79,"genamt":120,"top_k":0,"top_p":0.9,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":0.95,"rep_pen":1.19,"rep_pen_range":1024,"rep_pen_slope":0.9,"sampler_order":[6,0,1,2,3,4,5]},{"preset":"Storywriter 6B","description":"Optimized settings for relevant output.","genamt":120,"rep_pen":1.1,"rep_pen_range":2048,"rep_pen_slope":0.2,"sampler_order":[6,5,0,2,3,1,4],"temp":0.72,"tfs":1,"top_a":0,"top_k":0,"top_p":0.73,"min_p":0.0,"presence_penalty":0.0,"typical":1},{"preset":"Coherent Creativity 6B","description":"A good balance between coherence, creativity, and quality of prose.","genamt":120,"rep_pen":1.2,"rep_pen_range":2048,"rep_pen_slope":0,"sampler_order":[6,5,0,2,3,1,4],"temp":0.51,"tfs":0.99,"top_a":0,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"typical":1},{"preset":"Luna Moth 6B","description":"A great degree of creativity without losing coherency.","temp":1.5,"genamt":120,"top_k":85,"top_p":0.24,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.1,"rep_pen_range":2048,"rep_pen_slope":0,"sampler_order":[6,5,0,2,3,1,4]},{"preset":"Pleasing Results 6B","description":"Expectable output with alternative context settings.","temp":0.44,"genamt":120,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":0.9,"rep_pen":1.15,"rep_pen_range":2048,"rep_pen_slope":6.8,"sampler_order":[6,5,0,2,3,1,4]},{"preset":"Genesis 13B","description":"Stable and logical, but with scattered creativity.","temp":0.63,"genamt":120,"top_k":0,"top_p":0.98,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":0.98,"rep_pen":1.05,"rep_pen_range":2048,"rep_pen_slope":0.1,"sampler_order":[6,2,0,3,5,1,4]},{"preset":"Basic Coherence 13B","description":"Keep things on track.","temp":0.59,"genamt":120,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":0.87,"rep_pen":1.1,"rep_pen_range":2048,"rep_pen_slope":0.3,"sampler_order":[6,5,0,2,3,1,4]},{"preset":"Ouroboros 13B","description":"Versatile, conforms well to poems, lists, chat, etc.","temp":1.07,"genamt":120,"top_k":100,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":0.93,"rep_pen":1.05,"rep_pen_range":404,"rep_pen_slope":0.8,"sampler_order":[6,0,5,3,2,1,4]},{"preset":"Ace of Spades 13B","description":"Expressive, while still staying focused.","temp":1.15,"genamt":120,"top_k":0,"top_p":0.95,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":0.8,"rep_pen":1.05,"rep_pen_range":2048,"rep_pen_slope":7,"sampler_order":[6,3,2,0,5,1,4]},{"preset":"Low Rider 13B","description":"Reliable, aimed at story development.","temp":0.94,"genamt":120,"top_k":12,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":0.94,"rep_pen":1.05,"rep_pen_range":2048,"rep_pen_slope":0.2,"sampler_order":[6,5,0,2,3,1,4]},{"preset":"Pro Writer 13B","description":"Optimal setting for readability, based on AI-powered mass statistical analysis of Euterpe output.","temp":1.35,"genamt":120,"top_k":0,"top_p":1,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":0.69,"rep_pen":1.15,"rep_pen_range":2048,"rep_pen_slope":0.1,"sampler_order":[6,3,2,5,0,1,4]},{"preset":"Default 20B","description":"Good starting settings for NeoX 20B.","temp":0.6,"genamt":120,"top_k":0,"top_p":0.9,"min_p":0.0,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.04,"rep_pen_range":1024,"rep_pen_slope":0.7,"sampler_order":[6,0,1,2,3,4,5]},{"preset":"Min-P","description":"A good default for Min-P, only works on backends with min-p.","temp":1.25,"genamt":120,"top_k":0,"top_p":1,"min_p":0.1,"presence_penalty":0.0,"top_a":0,"typical":1,"tfs":1,"rep_pen":1.03,"rep_pen_range":320,"rep_pen_slope":0.7,"sampler_order":[6,5,0,1,3,4,2]} ]; function polyfills() @@ -3383,11 +3477,24 @@ Current version: 83 } + function prepare_abort_controller() + { + try { //setup global abort controller + const controller = new AbortController(); + const signal = controller.signal; + globalabortcontroller = controller; + } catch (e) { + console.log("AbortController Not Supported: " + e); + } + } + //attempt to load settings function init() { polyfills(); + prepare_abort_controller(); + //uncompress compacted scenarios for(let i=0;i
'); document.execCommand("insertHTML", false, text); }); @@ -3603,6 +3768,8 @@ Current version: 83 connect_custom_endpoint(); document.getElementById("lastreq").innerHTML = document.getElementById("lastreq2").innerHTML = `You're using Kobold Lite Embedded.`; + + read_url_params_data(); } else { @@ -3637,46 +3804,12 @@ Current version: 83 document.getElementById("connectstatus").classList.add("color_green"); render_gametext(false); - //read the url params, and autoload a shared story if found - const foundStory = urlParams.get('s'); - const foundScenario = urlParams.get('scenario'); - const foundChub = urlParams.get('chub'); - const nofiltermode = urlParams.get('nofilter'); - if (nofiltermode) { - filter_enabled = false; - console.log("Safety filter is off. Use at your own risk."); - } - if (foundStory && foundStory != "") { - let safe_to_overwrite = (gametext_arr.length == 0 && current_memory == "" && current_anote == "" && current_wi.length == 0 && redo_arr.length == 0); - if (localsettings.persist_session && !safe_to_overwrite) { - import_compressed_story_prompt_overwrite(foundStory); - } else { - import_compressed_story(foundStory,false); - } - //purge url params - window.history.replaceState(null, null, window.location.pathname); - } else if (foundScenario && foundScenario != "") { - display_scenarios(); - document.getElementById("scenariosearch").value = escapeHtml(foundScenario); - scenario_search(); - const found = scenario_db.find(m => m.title.toLowerCase() == foundScenario.trim().toLowerCase()); - if (found !== undefined) { - temp_scenario = found; - preview_temp_scenario(); - } - //purge url params - window.history.replaceState(null, null, window.location.pathname); - } else if (foundChub && foundChub != "") { - display_scenarios(); - get_chubai_scenario(foundChub); - //purge url params - window.history.replaceState(null, null, window.location.pathname); - } - else { - if (popup_aiselect) { - display_models(); - } + read_url_params_data(); + + if (popup_aiselect) { + display_models(); } + } else { msgbox("Failed to connect to KAI Horde!\nPlease check your network connection."); @@ -3703,6 +3836,41 @@ Current version: 83 } } + function read_url_params_data() + { + //read the url params, and autoload a shared story if found + const foundStory = urlParams.get('s'); + const foundScenario = urlParams.get('scenario'); + const foundChub = urlParams.get('chub'); + + if (foundStory && foundStory != "") { + let safe_to_overwrite = (gametext_arr.length == 0 && current_memory == "" && current_anote == "" && current_wi.length == 0 && redo_arr.length == 0); + if (localsettings.persist_session && !safe_to_overwrite) { + import_compressed_story_prompt_overwrite(foundStory); + } else { + import_compressed_story(foundStory, false); + } + //purge url params + window.history.replaceState(null, null, window.location.pathname); + } else if (foundScenario && foundScenario != "") { + display_scenarios(); + document.getElementById("scenariosearch").value = escapeHtml(foundScenario); + scenario_search(); + const found = scenario_db.find(m => m.title.toLowerCase() == foundScenario.trim().toLowerCase()); + if (found !== undefined) { + temp_scenario = found; + preview_temp_scenario(); + } + //purge url params + window.history.replaceState(null, null, window.location.pathname); + } else if (foundChub && foundChub != "") { + display_scenarios(); + get_chubai_scenario(foundChub); + //purge url params + window.history.replaceState(null, null, window.location.pathname); + } + } + var image_models_fetched = false; function fetch_image_models(onDoneCallback) { @@ -3761,14 +3929,14 @@ Current version: 83 }).catch((error) => { if(!silent) { - msgbox("A1111 Connect Error: " + error+"\nPlease make sure A1111 is running and properly configured!\nIn your local install of Automatic1111 WebUi, modify webui-user.bat and add these flags to enable API access:\n\nset COMMANDLINE_ARGS= --api --cors-allow-origins=*\n"); + msgbox("A1111 Connect Error: " + error+"\nPlease make sure A1111 is running and properly configured!\nIn your local install of Automatic1111 WebUi, modify webui-user.bat and add these flags to enable API access:\n\nset COMMANDLINE_ARGS= --api --listen --cors-allow-origins=*\n"); } a1111_is_connected = false; }); }).catch((error) => { if(!silent) { - msgbox("A1111 Connect Error: " + error+"\nPlease make sure A1111 is running and properly configured!\nIn your local install of Automatic1111 WebUi, modify webui-user.bat and add these flags to enable API access:\n\nset COMMANDLINE_ARGS= --api --cors-allow-origins=*\n"); + msgbox("A1111 Connect Error: " + error+"\nPlease make sure A1111 is running and properly configured!\nIn your local install of Automatic1111 WebUi, modify webui-user.bat and add these flags to enable API access:\n\nset COMMANDLINE_ARGS= --api --listen --cors-allow-origins=*\n"); } a1111_is_connected = false; }); @@ -3781,7 +3949,6 @@ Current version: 83 let prompt = splits[0]; let negprompt = (splits.length > 1 ? splits[1] : ""); let parsedseed = Math.floor(Math.random() * 99999999); - let sampler = req_payload.params.sampler_name; let tiling = false; //first, if we're using the wrong model, switch the model @@ -3814,8 +3981,6 @@ Current version: 83 "eta_ancestral": 1.0, "ddim_discretize": "uniform", "img2img_fix_steps": false, - "enable_emphasis": true, - "use_old_emphasis_implementation": false, "sd_hypernetwork": "None", "inpainting_mask_weight": 1.0, "initial_noise_multiplier": 1.0, @@ -3854,13 +4019,89 @@ Current version: 83 { inputBox("Enter Automatic1111 API endpoint","A1111 Endpoint Selection",a1111_base_url,"Input A1111 API URL", ()=>{ let userinput = getInputBoxValue(); - if (userinput != null && userinput.trim()!="") { + userinput = userinput.trim(); + if(userinput!="" && userinput.slice(-1)=="/") + { + userinput = userinput.slice(0, -1); + } + if (userinput != null && userinput!="") { a1111_base_url = userinput.trim(); connect_to_a1111(false); } },false); } + function set_dalle_key() + { + inputBox("Enter DALL-E API Key.\n\nNote: DALL-E is known to rephrase and rewrite submitted image prompts before generating, for censorship purposes. There is nothing Kobold Lite can do about that. ","DALL-E API Key",localsettings.saved_dalle_key,"Input DALL-E API Key", ()=>{ + let userinput = getInputBoxValue(); + userinput = userinput.trim(); + if (userinput != null && userinput!="") { + localsettings.saved_dalle_key = userinput.trim(); + } + },false); + } + function set_dalle_url() + { + inputBox("Enter DALL-E API URL.\n\nNote: DALL-E is known to rephrase and rewrite submitted image prompts before generating, for censorship purposes. There is nothing Kobold Lite can do about that. ","DALL-E API URL",localsettings.saved_dalle_url,"Input DALL-E API URL", ()=>{ + let userinput = getInputBoxValue(); + userinput = userinput.trim(); + if (userinput != null && userinput!="") { + localsettings.saved_dalle_url = userinput.trim(); + }else{ + localsettings.saved_dalle_url = (default_oai_base + "/v1" + default_oai_image_endpoint); + } + },false); + } + + function generate_dalle_image(req_payload, onImagesDone) + { + //split the prompt + let splits = req_payload.prompt.split("###"); + let prompt = splits[0].trim(); + + let dalle_payload = { + "model": "dall-e-3", + "prompt": prompt, + "n": 1, + "size": "1024x1024", + "response_format":"b64_json", + } + + //remove all null fields + dalle_payload = Object.fromEntries(Object.entries(dalle_payload).filter(([_, v]) => v != null)); + + let gen_endpoint = localsettings.saved_dalle_url; + console.log(dalle_payload); + + fetch(gen_endpoint, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'Authorization': 'Bearer ' + localsettings.saved_dalle_key + }, + body: JSON.stringify(dalle_payload), + }) + .then(x => x.json()) + .then(resp => { + console.log(resp); + if(resp.data && resp.data.length>0) + { + onImagesDone(resp.data[0].b64_json); + } + else + { + console.log("Generation Error!"); + onImagesDone(null); + } + + }).catch((error) => { + console.log("Generation Error: " + error); + onImagesDone(null); + }); + + } + function get_cursor_position() { let editor = document.getElementById("gametext"); @@ -3925,20 +4166,24 @@ Current version: 83 function is_using_kcpp_with_streaming() { - return (custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.29") > 0); + return (custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.30") >= 0); } function is_using_kcpp_with_sse() //need 1.39 for multibyte fix { let browsersupported = (self.TransformStream!=null && self.TextDecoderStream!=null && self.WritableStream!=null); - return (browsersupported && custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.39") > 0); + return (browsersupported && custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.40") >= 0); } function is_using_kcpp_with_mirostat() { - return (custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.36") > 0); + return (custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.37") >= 0); } function is_using_kcpp_with_grammar() { - return (custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.43") > 0); + return (custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.44") >= 0); + } + function is_using_kcpp_with_added_memory() + { + return (custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.49") >= 0); } //0 is none, 1 is pseudostreaming, 2 is true poll-streaming, 3 is sse-streaming @@ -4012,6 +4257,36 @@ Current version: 83 var cstoryjson = buf_to_b64(lz_c.compress(storyjson, 1)); return cstoryjson; } + + //runs async, complete autosave only if latest to be called + var pending_storyjson_autosave = null; + function autosave_compressed_story(save_images,export_settings,export_aesthetic_settings) { + let story = generate_savefile(save_images,export_settings,export_aesthetic_settings); + let storyjson = JSON.stringify(story); + + let ongoing = pending_storyjson_autosave; + pending_storyjson_autosave = storyjson; + if(ongoing){ + console.log("Delay Autosave: ", story); + return; + } + console.log("Autosave Start: ", story); + (function retry_autosave(json) { + lz_c.compress(json, 1, function(res) { + console.log("Autosave Done"); + let compressedstory = buf_to_b64(res); + localStorage.setItem(STORAGE_PREFIX + "story", compressedstory); + let newer = pending_storyjson_autosave; + if (newer && newer !== json) { + console.log("Updating Autosave"); + retry_autosave(newer); + }else{ + pending_storyjson_autosave = null; + } + }); + })(storyjson); + } + function export_share_story() { let cstoryjson = generate_compressed_story(false,localsettings.export_settings,false); console.log("Export Len: " + cstoryjson.length); @@ -4251,8 +4526,11 @@ Current version: 83 new_save_storyobj.memory = current_memory; new_save_storyobj.worldinfo = current_wi; - //extra unofficial fields + //extra unofficial fields for the story new_save_storyobj.extrastopseq = extrastopseq; + new_save_storyobj.anotestr = anote_strength; + new_save_storyobj.wisearchdepth = wi_searchdepth; + new_save_storyobj.wiinsertlocation = wi_insertlocation; if (export_settings) { new_save_storyobj.savedsettings = JSON.parse(JSON.stringify(localsettings)); @@ -4260,6 +4538,8 @@ Current version: 83 new_save_storyobj.savedsettings.my_api_key = "0000000000"; new_save_storyobj.savedsettings.home_cluster = text_hordes[0].baseurl; new_save_storyobj.savedsettings.saved_oai_key = ""; + new_save_storyobj.savedsettings.saved_dalle_key = ""; + new_save_storyobj.savedsettings.saved_dalle_url = ""; new_save_storyobj.savedsettings.saved_oai_addr = ""; new_save_storyobj.savedsettings.saved_claude_key = ""; new_save_storyobj.savedsettings.saved_claude_addr = ""; @@ -4381,9 +4661,9 @@ Current version: 83 msgboxYesNo("Could not load selected file!
It appears to be invalid or corrupted!
Do you still want to import it as plaintext?", "Loading Failed", () => { //raw text import - restart_new_game(); + restart_new_game(false); gametext_arr.push(text); - render_gametext(); + render_gametext(true); }, null, true) } else { msgbox("Could not load selected file. Is it valid?"); @@ -4402,162 +4682,216 @@ Current version: 83 function kai_json_load(storyobj, force_load_settngs) { - //determine if oldui file or newui file format - restart_new_game(); + //either show popup or just proceed to load + handle_advload_popup((localsettings.show_advanced_load && !force_load_settngs),()=> + { + let old_gametext_arr = gametext_arr; + let old_current_anote = current_anote; + let old_current_anotetemplate = current_anotetemplate; + let old_current_memory = current_memory; + let old_current_wi = current_wi; + let old_extrastopseq = extrastopseq; - let is_oldui = (storyobj.file_version == null); - let is_sharefile = (!storyobj.actions && (storyobj.ga != "" || storyobj.cm != "" || (storyobj.cwi && storyobj.cwi.length > 0) || storyobj.ess != "")); - console.log("Is oldui: " + is_oldui + ", is sharefile: " + is_sharefile); + //determine if oldui file or newui file format + restart_new_game(false); - if (is_sharefile) { - //handle old shareformat - gametext_arr = storyobj.ga; - if(gametext_arr==null) - { - gametext_arr = []; - } - if (storyobj.ca && storyobj.ca != "") { - current_anote = storyobj.ca; - current_anotetemplate = storyobj.ct; - } - if (storyobj.cm && storyobj.cm != "") { - current_memory = storyobj.cm; - } - if (storyobj.cwi && storyobj.cwi.length > 0) { - current_wi = storyobj.cwi; - } - if (storyobj.ess && storyobj.ess != "") { - extrastopseq = storyobj.ess; - } - } else if (is_oldui) { - //v1 load - if (storyobj.prompt != "") { - gametext_arr.push(storyobj.prompt); - } - for (var i = 0; i < storyobj.actions.length; ++i) { - gametext_arr.push(storyobj.actions[i]); - } + let is_oldui = (storyobj.file_version == null); + let is_sharefile = (!storyobj.actions && (storyobj.ga != "" || storyobj.cm != "" || (storyobj.cwi && storyobj.cwi.length > 0) || storyobj.ess != "")); + console.log("Is oldui: " + is_oldui + ", is sharefile: " + is_sharefile); - if (storyobj.anotetemplate) { - current_anotetemplate = storyobj.anotetemplate; - } - if (storyobj.authorsnote) { - current_anote = storyobj.authorsnote; - } - if (storyobj.memory) { - current_memory = storyobj.memory; - } - if (storyobj.worldinfo) { - current_wi = storyobj.worldinfo; - } - if (storyobj.extrastopseq) { - extrastopseq = storyobj.extrastopseq; - } - } else { - //v2 load - if(storyobj.prompt!="") - { - gametext_arr.push(storyobj.prompt); - } - for (var key in storyobj.actions.actions) { - var itm = storyobj.actions.actions[key]; - gametext_arr.push(itm["Selected Text"]); - } - if (storyobj.authornotetemplate) { - current_anotetemplate = storyobj.authornotetemplate; - } - if (storyobj.authornote) { - current_anote = storyobj.authornote; - } - if (storyobj.memory) { - current_memory = storyobj.memory; - } - if (storyobj.worldinfo_v2 != null && storyobj.worldinfo_v2.entries != null) { - for (var key in storyobj.worldinfo_v2.entries) { - var itm = storyobj.worldinfo_v2.entries[key]; - if (itm.key.length > 0 && itm.content != null) { - let nwi = { - "key": itm.key[0], - "keysecondary": (itm.keysecondary.length > 0 ? itm.keysecondary[0] : ""), - "content": itm.content, - "comment": itm.comment, - "folder": null, - "selective": itm.selective, - "constant": itm.constant - }; - current_wi.push(nwi); + if (is_sharefile) { + //handle old shareformat + gametext_arr = storyobj.ga; + if(gametext_arr==null) + { + gametext_arr = []; + } + if (storyobj.ca && storyobj.ca != "") { + current_anote = storyobj.ca; + current_anotetemplate = storyobj.ct; + } + if (storyobj.cm && storyobj.cm != "") { + current_memory = storyobj.cm; + } + if (storyobj.cwi && storyobj.cwi.length > 0) { + current_wi = storyobj.cwi; + } + if (storyobj.ess && storyobj.ess != "") { + extrastopseq = storyobj.ess; + } + } else if (is_oldui) { + //v1 load + if (storyobj.prompt != "") { + gametext_arr.push(storyobj.prompt); + } + for (var i = 0; i < storyobj.actions.length; ++i) { + gametext_arr.push(storyobj.actions[i]); + } + + if (storyobj.anotetemplate) { + current_anotetemplate = storyobj.anotetemplate; + } + if (storyobj.authorsnote) { + current_anote = storyobj.authorsnote; + } + if (storyobj.memory) { + current_memory = storyobj.memory; + } + if (storyobj.worldinfo) { + current_wi = storyobj.worldinfo; + } + if (storyobj.extrastopseq) { + extrastopseq = storyobj.extrastopseq; + } + if (storyobj.anotestr) { + anote_strength = storyobj.anotestr; + } + if (storyobj.wisearchdepth) { + wi_searchdepth = storyobj.wisearchdepth; + } + if (storyobj.wiinsertlocation) { + wi_insertlocation = storyobj.wiinsertlocation; + } + if (storyobj.welcome) { + welcome = storyobj.welcome; + } + } else { + //v2 load + if(storyobj.prompt!="") + { + gametext_arr.push(storyobj.prompt); + } + for (var key in storyobj.actions.actions) { + var itm = storyobj.actions.actions[key]; + gametext_arr.push(itm["Selected Text"]); + } + if (storyobj.authornotetemplate) { + current_anotetemplate = storyobj.authornotetemplate; + } + if (storyobj.authornote) { + current_anote = storyobj.authornote; + } + if (storyobj.memory) { + current_memory = storyobj.memory; + } + if (storyobj.worldinfo_v2 != null && storyobj.worldinfo_v2.entries != null) { + for (var key in storyobj.worldinfo_v2.entries) { + var itm = storyobj.worldinfo_v2.entries[key]; + if (itm.key.length > 0 && itm.content != null) { + let nwi = { + "key": itm.key[0], + "keysecondary": (itm.keysecondary.length > 0 ? itm.keysecondary[0] : ""), + "content": itm.content, + "comment": itm.comment, + "folder": null, + "selective": itm.selective, + "constant": itm.constant + }; + current_wi.push(nwi); + } } } } - } - const import_settings = function() - { - let tmpapikey1 = localsettings.my_api_key; - let tmphc = localsettings.home_cluster; - let tmp_oai1 = localsettings.saved_oai_key; - let tmp_oai2 = localsettings.saved_oai_addr; - let tmp_or1 = localsettings.saved_openrouter_key; - let tmp_claude1 = localsettings.saved_claude_key; - let tmp_claude2 = localsettings.saved_claude_addr; - let tmp_palm1 = localsettings.saved_palm_key; - let tmp_kai = localsettings.saved_kai_addr; - import_props_into_object(localsettings, storyobj.savedsettings); - localsettings.my_api_key = tmpapikey1; - localsettings.home_cluster = tmphc; - localsettings.saved_oai_key = tmp_oai1; - localsettings.saved_oai_addr = tmp_oai2; - localsettings.saved_openrouter_key = tmp_or1; - localsettings.saved_claude_key = tmp_claude1; - localsettings.saved_claude_addr = tmp_claude2; - localsettings.saved_palm_key = tmp_palm1; - localsettings.saved_kai_addr = tmp_kai; - - //backwards compat support for newlines - if (localsettings.instruct_has_newlines == true || (storyobj.savedsettings != null && storyobj.savedsettings.instruct_has_newlines == null && storyobj.savedsettings.instruct_has_markdown == null)) { - localsettings.instruct_has_newlines = false; - if (!localsettings.instruct_starttag.includes("\\n")) { - localsettings.instruct_starttag = "\\n" + localsettings.instruct_starttag + "\\n"; - } - if (!localsettings.instruct_endtag.includes("\\n")) { - localsettings.instruct_endtag = "\\n" + localsettings.instruct_endtag + "\\n"; - } - } - - if (storyobj.savedaestheticsettings && storyobj.savedaestheticsettings != "") { - import_props_into_object(aestheticInstructUISettings, storyobj.savedaestheticsettings); - } - - //old versions dont have this flag - if(localsettings.entersubmit===true || localsettings.entersubmit===false) + const import_settings = function(loadmainstory,loadmemanote,loadworldinfo,loadstopseq,loadgensettings,loadaessettings) { - document.getElementById("entersubmit").checked = localsettings.entersubmit; + if(!loadmainstory) + { + gametext_arr = old_gametext_arr; + } + if(!loadmemanote) + { + current_anote = old_current_anote; + current_anotetemplate = old_current_anotetemplate; + current_memory = old_current_memory; + } + if(!loadworldinfo) + { + current_wi = old_current_wi; + } + if(!loadstopseq) + { + extrastopseq = old_extrastopseq; + } + + if (storyobj.savedsettings && storyobj.savedsettings != "") + { + let tmpapikey1 = localsettings.my_api_key; + let tmphc = localsettings.home_cluster; + let tmp_oai1 = localsettings.saved_oai_key; + let tmp_oai2 = localsettings.saved_oai_addr; + let tmp_oai3 = localsettings.saved_dalle_key; + let tmp_oai4 = localsettings.saved_dalle_url; + let tmp_or1 = localsettings.saved_openrouter_key; + let tmp_claude1 = localsettings.saved_claude_key; + let tmp_claude2 = localsettings.saved_claude_addr; + let tmp_palm1 = localsettings.saved_palm_key; + let tmp_kai = localsettings.saved_kai_addr; + if(loadgensettings) + { + import_props_into_object(localsettings, storyobj.savedsettings); + //backwards compat support for newlines + if (localsettings.instruct_has_newlines == true || (storyobj.savedsettings != null && storyobj.savedsettings.instruct_has_newlines == null && storyobj.savedsettings.instruct_has_markdown == null)) { + localsettings.instruct_has_newlines = false; + if (!localsettings.instruct_starttag.includes("\\n")) { + localsettings.instruct_starttag = "\\n" + localsettings.instruct_starttag + "\\n"; + } + if (!localsettings.instruct_endtag.includes("\\n")) { + localsettings.instruct_endtag = "\\n" + localsettings.instruct_endtag + "\\n"; + } + } + //old versions dont have this flag + if (localsettings.entersubmit === true || localsettings.entersubmit === false) { + document.getElementById("entersubmit").checked = localsettings.entersubmit; + } + } + localsettings.my_api_key = tmpapikey1; + localsettings.home_cluster = tmphc; + localsettings.saved_oai_key = tmp_oai1; + localsettings.saved_oai_addr = tmp_oai2; + localsettings.saved_dalle_key = tmp_oai3; + localsettings.saved_dalle_url = tmp_oai4; + localsettings.saved_openrouter_key = tmp_or1; + localsettings.saved_claude_key = tmp_claude1; + localsettings.saved_claude_addr = tmp_claude2; + localsettings.saved_palm_key = tmp_palm1; + localsettings.saved_kai_addr = tmp_kai; + + if(loadaessettings) + { + if (storyobj.savedaestheticsettings && storyobj.savedaestheticsettings != "") { + import_props_into_object(aestheticInstructUISettings, storyobj.savedaestheticsettings); + } + } + } } - } - - //port over old images to the new format - migrate_old_images_in_gametext(); - - //prompt to import settings - if(force_load_settngs) - { - import_settings(); - render_gametext(); - } - else if (storyobj.savedsettings && storyobj.savedsettings != "") { - import_settings(); - render_gametext(); - } else { - render_gametext(); - } + //port over old images to the new format + migrate_old_images_in_gametext(); + //prompt to import settings + if (localsettings.show_advanced_load && !force_load_settngs) + { + import_settings( + document.getElementById("advset_mainstory").checked, + document.getElementById("advset_memanote").checked, + document.getElementById("advset_worldinfo").checked, + document.getElementById("advset_stopseq").checked, + document.getElementById("advset_gensettings").checked, + document.getElementById("advset_aessettings").checked + ); + } else { + //force load everything + import_settings(true, true, true, true, true, true); + } + render_gametext(true); + }); } function load_agnai_wi(obj,chatopponent,myname) { console.log("Append Agnai WI"); - current_wi = []; + let loadedwi = []; for (let key in obj.entries) { var itm = obj.entries[key]; var karr = itm.keywords; @@ -4570,13 +4904,14 @@ Current version: 83 "selective": false, "constant": false }; - current_wi.push(nwi); + loadedwi.push(nwi); } + return loadedwi; } function load_tavern_wi(obj,chatopponent,myname) { console.log("Append Tavern WI"); - current_wi = []; + let loadedwi = []; for (let key in obj.entries) { var itm = obj.entries[key]; var karr = itm.key; @@ -4598,8 +4933,9 @@ Current version: 83 "selective": itm.selective, "constant": itm.constant }; - current_wi.push(nwi); + loadedwi.push(nwi); } + return loadedwi; } function load_tavern_obj(obj) { @@ -4635,15 +4971,15 @@ Current version: 83 //check if it's a world info only card, if so, do not restart game if(combinedmem.trim()=="" && greeting=="" && obj.entries) { - load_tavern_wi(obj,chatopponent,myname); + current_wi = load_tavern_wi(obj,chatopponent,myname); } else if(agnaidatafieldsempty.trim()=="" && obj.entries && obj.kind=="memory") { - load_agnai_wi(obj,chatopponent,myname); + current_wi = load_agnai_wi(obj,chatopponent,myname); } else { - restart_new_game(); + restart_new_game(false); localsettings.chatname = myname; localsettings.chatopponent = chatopponent; gametext_arr.push("\n"+chatopponent+": "+greeting); @@ -4654,14 +4990,14 @@ Current version: 83 //handle character book if(obj.character_book && obj.character_book.entries && obj.character_book.entries.length>0) { - load_tavern_wi(obj.character_book,chatopponent,myname); + current_wi = load_tavern_wi(obj.character_book,chatopponent,myname); } else if(obj.entries && obj.entries.length>0) { - load_agnai_wi(obj,chatopponent,myname); + current_wi = load_agnai_wi(obj,chatopponent,myname); } } - render_gametext(); + render_gametext(true); } function load_ooba_obj(obj) { @@ -4680,14 +5016,14 @@ Current version: 83 { examplemsg = "\n"+examplemsg; } - restart_new_game(); + restart_new_game(false); localsettings.chatname = myname; localsettings.chatopponent = chatopponent; gametext_arr.push("\n"+chatopponent+": "+greeting); current_memory = memory + scenario + examplemsg + "\n***"; localsettings.opmode = 3; localsettings.gui_type_chat = 2; - render_gametext(); + render_gametext(true); } function get_aetherroom_scenario() @@ -4734,7 +5070,16 @@ Current version: 83 let keys = data.worldInfos[w].keys; let entry = data.worldInfos[w].entry; - temp_scenario.worldinfo.push({"key":(keys?keys:""),"content":(entry?entry:"")}) + let nwi = { + "key": (keys ? keys : ""), + "keysecondary": "", + "content": (entry ? entry : ""), + "comment": "", + "folder": null, + "selective": false, + "constant": false + }; + temp_scenario.worldinfo.push(nwi); } } preview_temp_scenario(); @@ -4813,6 +5158,7 @@ Current version: 83 "authorsnote": "", "worldinfo": [], }; + let card_is_defective = (data.name==""&&previewtxt==""&&greeting==""&&cdesc==""&&cdef==""); //try to obtain the full portrait image fetch("https://api.chub.ai/api/characters/download", { @@ -4837,6 +5183,59 @@ Current version: 83 }) .then(blob => { preview_temp_scenario(); + + readTavernPngFromBlob(blob,(obj)=>{ + if(obj!=null) + { + //a lightweight tavern card loader, not fully compliant + if(obj.spec=="chara_card_v2" && obj.data!=null) + { + obj = obj.data; + } + + if(card_is_defective) + { + let chatopponent = obj.name?obj.name:"Bot"; + let memory = obj.description?("Persona: "+obj.description):""; + memory += obj.personality?("\nPersonality: "+obj.personality):""; + let scenario = obj.scenario?obj.scenario:""; + let examplemsg = obj.mes_example?obj.mes_example:""; + let greeting = obj.first_mes?obj.first_mes:""; + let sysprompt = obj.system_prompt?obj.system_prompt:""; + + if(scenario!="") + { + scenario = "\n[Scenario: "+scenario+"]"; + } + if(examplemsg!="") + { + examplemsg = "\n"+examplemsg; + } + if(sysprompt!="") + { + sysprompt = sysprompt+"\n"; + } + let combinedmem = sysprompt + memory + scenario + examplemsg; + temp_scenario.title = chatopponent; + let prev2 = replaceAll(obj.description,"{{char}}",chatopponent,true); + prev2 = replaceAll(prev2,"{{user}}","You",true); + temp_scenario.desc = prev2; + temp_scenario.chatopponent = chatopponent; + temp_scenario.prompt = ("\n{{char}}: "+ greeting); + temp_scenario.memory = combinedmem; + } + + //since cai format has no wi, try to grab it from tavern format + if(obj.character_book && obj.character_book.entries && obj.character_book.entries.length>0) + { + let myname = ((localsettings.chatname && localsettings.chatname!="")?localsettings.chatname:"You"); + temp_scenario.worldinfo = load_tavern_wi(obj.character_book,chatopponent,myname); + } + preview_temp_scenario(); + } + + }); + const objectURL = URL.createObjectURL(blob); const compressedImg = compressImage(objectURL, (compressedImageURI, aspectratio)=>{ temp_scenario.image = compressedImageURI; @@ -4897,7 +5296,7 @@ Current version: 83 function complete_load_scenario() { console.log("Loading scenario...") - restart_new_game(); + restart_new_game(false); //load contexts gametext_arr = []; @@ -4929,21 +5328,7 @@ Current version: 83 refreshPreview(true); } if (temp_scenario.worldinfo && temp_scenario.worldinfo.length > 0) { - current_wi = []; - for (let x = 0; x < temp_scenario.worldinfo.length; ++x) { - let key = temp_scenario.worldinfo[x].key; - let content = temp_scenario.worldinfo[x].content; - let nwi = { - "key": (key ? key : ""), - "keysecondary": "", - "content": (content ? content : ""), - "comment": "", - "folder": null, - "selective": false, - "constant": false - }; - current_wi.push(nwi); - } + current_wi = temp_scenario.worldinfo; } localsettings.opmode = temp_scenario.opmode; @@ -5000,7 +5385,7 @@ Current version: 83 if (temp_scenario.instruct_endtag) { localsettings.instruct_endtag = temp_scenario.instruct_endtag; } } - render_gametext(); + render_gametext(true); } function togglescenarioallownsfw() { @@ -5023,7 +5408,7 @@ Current version: 83 } function confirm_scenario_verify() { - if(temp_scenario.show_warning==true && localsettings.passed_ai_warning==false) + if(temp_scenario.show_warning==true && localsettings.passed_ai_warning==false && passed_ai_warning_local==false) { let warntxt = `Disclaimer: The AI is not suitable to be used as an actual therapist, counselor or advisor of any kind.
While some find it comforting to talk about their issues with an AI, the responses are unpredictable.
@@ -5038,9 +5423,15 @@ Current version: 83 { confirm_scenario(); localsettings.passed_ai_warning = true; //remember flag for session + passed_ai_warning_local = true; } },true); } else { + if(localsettings.passed_ai_warning==true || passed_ai_warning_local==true) + { + localsettings.passed_ai_warning = true; //remember flag for session + passed_ai_warning_local = true; + } confirm_scenario(); } } @@ -5194,6 +5585,23 @@ Current version: 83 } var worker_data_showonly = []; //only for table display, dont mix + //track worker earn rates + var first_seen_workers = {}; + function track_kudos_earnings(wdata) + { + if(wdata && wdata.length>0) + { + for (let i = 0; i < wdata.length; ++i) { + let elem = wdata[i]; + if (elem && elem.id && !first_seen_workers.hasOwnProperty(elem.id)) { + first_seen_workers[elem.id] = { + startkudos: elem.kudos_rewards, + timestamp: performance.now() + }; + } + } + } + } function get_and_show_workers() { if (localflag) { return; @@ -5215,6 +5623,7 @@ Current version: 83 worker_data_showonly[i].defaultmodel = elem.models[0]; } } + track_kudos_earnings(worker_data_showonly); show_workers(); }); @@ -5319,6 +5728,7 @@ Current version: 83 document.getElementById("workercontainer").classList.remove("hidden"); let str = ""; + let timenow = performance.now(); for (var i = 0; i < worker_data_showonly.length; ++i) { let elem = worker_data_showonly[i]; let tokenspersec = elem.performance.replace(" tokens per second", ""); @@ -5340,8 +5750,18 @@ Current version: 83 if (n > 0) { allmdls += "
"; } allmdls += escapeHtml(elem.models[n].substring(0, 32)); } - - str += "" + workerNameHtml + " " + allmdls + " " + elem.max_length + " / " + elem.max_context_length + "
(" + tokenspersec + " T/s)" + format_uptime(elem.uptime) + "
(" + elem.requests_fulfilled + " jobs)" + elem.kudos_rewards.toFixed(0) + " "+clustertag+" " + workerNameHtml + " " + allmdls + " " + elem.max_length + " / " + elem.max_context_length + "
(" + tokenspersec + " T/s)" + format_uptime(elem.uptime) + "
(" + elem.requests_fulfilled + " jobs)" + elem.kudos_rewards.toFixed(0) + "
"+kudos_per_hr+""+clustertag+" -`; - filetable += entry; + for(let i=0;i<4;++i) + { + let testslot = localStorage.getItem(STORAGE_PREFIX + "slot_"+i+"_meta"); + entry = `- `+(testslot?`[ Slot `+(i+1)+` - `+testslot+` ]`:`[ Slot `+(i+1)+` - Empty ]`)+` --- - - - -+`; + filetable += entry; + } + } catch (e) { + console.log("get slots failed: " + e); } document.getElementById("saveloadentries").innerHTML = filetable; } @@ -6346,6 +6805,9 @@ Current version: 83 if(modelsdone && workersdone) { onBothFetchesDone(); + + //track earnings if possible + track_kudos_earnings(wdata); } }); @@ -6665,6 +7127,7 @@ Current version: 83 document.getElementById("top_p").value = document.getElementById("top_p_slide").value = localsettings.top_p; document.getElementById("autoscroll").checked = localsettings.autoscroll; document.getElementById("export_settings").checked = localsettings.export_settings; + document.getElementById("show_advanced_load").checked = localsettings.show_advanced_load; document.getElementById("invert_colors").checked = localsettings.invert_colors; document.getElementById("trimsentences").checked = localsettings.trimsentences; document.getElementById("trimwhitespace").checked = localsettings.trimwhitespace; @@ -6677,6 +7140,9 @@ Current version: 83 handle_bot_name_onchange(); document.getElementById("instruct_starttag").value = localsettings.instruct_starttag; document.getElementById("instruct_endtag").value = localsettings.instruct_endtag; + document.getElementById("min_p").value = localsettings.min_p; + document.getElementById("presence_penalty").value = localsettings.presence_penalty; + document.getElementById("sampler_seed").value = localsettings.sampler_seed; document.getElementById("top_k").value = localsettings.top_k; document.getElementById("top_a").value = localsettings.top_a; document.getElementById("typ_s").value = localsettings.typ_s; @@ -6758,6 +7224,7 @@ Current version: 83 document.getElementById("ttsselect").innerHTML = ttshtml; document.getElementById("ttsselect").value = localsettings.speech_synth; document.getElementById("beep_on").checked = localsettings.beep_on; + document.getElementById("narrate_both_sides").checked = localsettings.narrate_both_sides; toggle_opmode(); //sd models display @@ -6775,9 +7242,9 @@ Current version: 83 { let sdmodelshtml = ""; for (var i = 0; i < stablemodels.length; ++i) { - sdmodelshtml += ""; } - document.getElementById("sdmodels").innerHTML = sdmodelshtml; + document.getElementById("generate_images_model").innerHTML = sdmodelshtml; } function toggle_preset() { @@ -6787,6 +7254,8 @@ Current version: 83 temp_changingpreset = true; document.getElementById("temperature").value = document.getElementById("temperature_slide").value = found.temp; document.getElementById("max_length").value = document.getElementById("max_length_slide").value = found.genamt; + document.getElementById("presence_penalty").value = found.presence_penalty; + document.getElementById("min_p").value = found.min_p; document.getElementById("top_k").value = found.top_k; document.getElementById("top_p").value = document.getElementById("top_p_slide").value = found.top_p; document.getElementById("top_a").value = found.top_a; @@ -6811,13 +7280,10 @@ Current version: 83 break; } } - if (!matched && inputmodel != "*") { + if (!matched) { document.getElementById("generate_images_model").value = defaultsettings.generate_images_model; } } - function clear_sd_model() { - document.getElementById("generate_images_model").value = ""; - } function validate_samplers(savesetting = false) { let samplerstr = document.getElementById("sampler_order").value; @@ -6878,6 +7344,7 @@ Current version: 83 localsettings.top_p = document.getElementById("top_p").value; localsettings.autoscroll = (document.getElementById("autoscroll").checked ? true : false); localsettings.export_settings = (document.getElementById("export_settings").checked ? true : false); + localsettings.show_advanced_load = (document.getElementById("show_advanced_load").checked ? true : false); localsettings.invert_colors = (document.getElementById("invert_colors").checked ? true : false); localsettings.trimsentences = (document.getElementById("trimsentences").checked ? true : false); localsettings.trimwhitespace = (document.getElementById("trimwhitespace").checked ? true : false); @@ -6920,6 +7387,9 @@ Current version: 83 if (localsettings.instruct_endtag == null || localsettings.instruct_endtag == "") { localsettings.instruct_endtag = "\\n### Response:\\n"; } + localsettings.sampler_seed = document.getElementById("sampler_seed").value; + localsettings.min_p = document.getElementById("min_p").value; + localsettings.presence_penalty = document.getElementById("presence_penalty").value; localsettings.top_k = document.getElementById("top_k").value; localsettings.top_a = document.getElementById("top_a").value; localsettings.typ_s = document.getElementById("typ_s").value; @@ -6930,6 +7400,7 @@ Current version: 83 localsettings.speech_synth = document.getElementById("ttsselect").value; localsettings.beep_on = (document.getElementById("beep_on").checked?true:false); + localsettings.narrate_both_sides = (document.getElementById("narrate_both_sides").checked?true:false); localsettings.auto_ctxlen = (document.getElementById("auto_ctxlen").checked ? true : false); localsettings.auto_genamt = (document.getElementById("auto_genamt").checked ? true : false); @@ -6970,6 +7441,8 @@ Current version: 83 localsettings.rep_pen_range = cleannum(localsettings.rep_pen_range, 0, 8192); localsettings.rep_pen_slope = cleannum(localsettings.rep_pen_slope, 0, 20); localsettings.top_p = cleannum(localsettings.top_p, 0.002, 1); + localsettings.min_p = cleannum(localsettings.min_p, 0.0, 1); + localsettings.presence_penalty = cleannum(localsettings.presence_penalty, -2, 2); localsettings.top_k = cleannum(Math.floor(localsettings.top_k), 0, 300); localsettings.top_a = cleannum(localsettings.top_a, 0, 1); localsettings.typ_s = cleannum(localsettings.typ_s, 0, 1); @@ -6977,10 +7450,12 @@ Current version: 83 localsettings.miro_type = cleannum(localsettings.miro_type, 0, 2); localsettings.miro_tau = cleannum(localsettings.miro_tau, 0, 30); localsettings.miro_eta = cleannum(localsettings.miro_eta, 0, 10); + localsettings.sampler_seed = cleannum(localsettings.sampler_seed, -1, 999999); toggle_invert_colors(); hide_popups(); - render_gametext(); //need to always autosave, so that we can switch back to non persistent sessions + autosave();//need to always autosave, so that we can switch back to non persistent sessions + render_gametext(false); } function toggle_instruct_tag_format() @@ -7009,8 +7484,12 @@ Current version: 83 document.getElementById('instruct_endtag').value = "\\nAnswer: "; break; case "6": //ChatML - document.getElementById('instruct_starttag').value = "<|im_start|>user"; - document.getElementById('instruct_endtag').value = "<|im_end|><|im_start|>assistant"; + document.getElementById('instruct_starttag').value = "<|im_end|>\\n<|im_start|>user\\n"; + document.getElementById('instruct_endtag').value = "<|im_end|>\\n<|im_start|>assistant\\n"; + break; + case "7": //Input & Output + document.getElementById('instruct_starttag').value = "\\n{{[INPUT]}}\\n"; + document.getElementById('instruct_endtag').value = "\\n{{[OUTPUT]}}\\n"; break; default: break; @@ -7045,9 +7524,11 @@ Current version: 83 if(document.getElementById("generate_images_mode").value==0) { document.getElementById("generate_images_model").classList.add("hidden"); + document.getElementById("generate_images_dalle_container").classList.add("hidden"); document.getElementById("generate_images_local_model_container").classList.add("hidden"); }else if(document.getElementById("generate_images_mode").value==1){ document.getElementById("generate_images_model").classList.remove("hidden"); + document.getElementById("generate_images_dalle_container").classList.add("hidden"); document.getElementById("generate_images_local_model_container").classList.add("hidden"); if(!image_models_fetched) { @@ -7057,10 +7538,15 @@ Current version: 83 update_horde_sdmodels(); }); } - }else{ + }else if(document.getElementById("generate_images_mode").value==2){ document.getElementById("generate_images_model").classList.add("hidden"); + document.getElementById("generate_images_dalle_container").classList.add("hidden"); document.getElementById("generate_images_local_model_container").classList.remove("hidden"); connect_to_a1111(silent); + }else if(document.getElementById("generate_images_mode").value==3){ + document.getElementById("generate_images_model").classList.add("hidden"); + document.getElementById("generate_images_dalle_container").classList.remove("hidden"); + document.getElementById("generate_images_local_model_container").classList.add("hidden"); } } @@ -7119,6 +7605,30 @@ Current version: 83 } + //triggers if advanced load is enabled + var advload_callback = null; + function handle_advload_popup(need_display,callbackfn) + { + if(!need_display) + { + callbackfn(); + } + else + { + advload_callback = callbackfn; + document.getElementById("advancedloadfile").classList.remove("hidden"); + } + } + function advload_btnok() + { + document.getElementById("advancedloadfile").classList.add("hidden"); + if(advload_callback) + { + advload_callback(); + } + advload_callback = null; + } + //triggers when loading from slot, or when loading from url share function import_compressed_story_prompt_overwrite(compressed_story) { msgboxYesNo("You already have an existing persistent story. Do you want to overwrite it?","Overwrite Story Warning",()=>{ @@ -7139,7 +7649,7 @@ Current version: 83 selected_workers = []; localsettings.opmode = 1; } - restart_new_game(); + restart_new_game(true, document.getElementById("keep_memory").checked); hide_popups(); } @@ -7161,11 +7671,11 @@ Current version: 83 let onOk = ()=>{ pending_response_id = "-1"; waiting_for_autosummary = true; - let max_allowed_characters = Math.floor(localsettings.max_context_length * 3.35)-100; + let max_allowed_characters = Math.floor(localsettings.max_context_length * 3.0)-100; let truncated_context = concat_gametext(true, ""); - let max_mem_anote_len = Math.floor(max_allowed_characters*0.9); - let truncated_memory = current_memory.substring(current_memory.length - max_mem_anote_len); + let max_mem_len = Math.floor(max_allowed_characters*0.8); + let truncated_memory = current_memory.substring(current_memory.length - max_mem_len); if (truncated_memory != null && truncated_memory != "") { truncated_memory += "\n"; } @@ -7199,6 +7709,11 @@ Current version: 83 "models": selected_models.map((m) => { return m.name }), }; + if(localsettings.sampler_seed>=1) + { + submit_payload.params.sampler_seed = localsettings.sampler_seed; + } + if((custom_kobold_endpoint != "" && is_using_kcpp_with_mirostat())) { if(localsettings.miro_type>0) @@ -7207,6 +7722,10 @@ Current version: 83 submit_payload.params.mirostat_tau = localsettings.miro_tau; submit_payload.params.mirostat_eta = localsettings.miro_eta; } + + //also supports min_p, in that it wont crash, so add it on. it will be ignored if not found + submit_payload.params.min_p = localsettings.min_p; + submit_payload.params.presence_penalty = localsettings.presence_penalty; } //v2 api specific fields @@ -7283,12 +7802,13 @@ Current version: 83 horde_poll_nearly_completed = false; } - function restart_new_game() { + function restart_new_game(save = true, keep_memory = false) { idle_timer = 0; gametext_arr = []; redo_arr = []; last_request_str = "No Requests Available"; retry_prev_text = ""; + retry_preserve_last = false; redo_prev_text = ""; nextgeneratedimagemilestone = generateimagesinterval; pending_response_id = ""; @@ -7296,22 +7816,30 @@ Current version: 83 synchro_pending_stream = ""; waiting_for_autosummary = false; last_reply_was_empty = false; - current_memory = ""; - current_anote = ""; - current_wi = []; pending_context_preinjection = ""; - extrastopseq = ""; - current_anotetemplate = "[Author's note: <|>]"; document.getElementById("input_text").value = ""; document.getElementById("cht_inp").value = ""; + chat_resize_input(); image_db = {}; completed_imgs_meta = {}; localsettings.adventure_is_action = false; prev_hl_chunk = null; last_token_budget = ""; - last_known_filename = "saved_story.json"; groupchat_removals = []; - render_gametext(true); //necessary to trigger an autosave to wipe out current story in case they exit browser after newgame. + welcome = ""; + last_known_filename = "saved_story.json"; + if (!keep_memory) + { + current_memory = ""; + current_anote = ""; + current_wi = []; + extrastopseq = ""; + anote_strength = 320; + wi_searchdepth = 0; + wi_insertlocation = 0; + current_anotetemplate = "[Author's note: <|>]"; + } + render_gametext(save); //necessary to trigger an autosave to wipe out current story in case they exit browser after newgame. } function reset_all_settings() @@ -7324,6 +7852,7 @@ Current version: 83 restart_new_game(); display_settings(); confirm_settings(); + document.getElementById("keep_memory").checked = false; },null); } @@ -7384,7 +7913,7 @@ Current version: 83 function end_trim_to_sentence(input,include_newline=false) { let last = -1; - let enders = ['.', '!', '?', '`', '*', '"', ')', '}', '`', ']', ';']; + let enders = ['.', '!', '?', '*', '"', ')', '}', '`', ']', ';', '…']; for (let i = 0; i < enders.length; ++i) { last = Math.max(last, input.lastIndexOf(enders[i])); @@ -7421,6 +7950,36 @@ Current version: 83 return input; } + //if the string is longer than len, trim it to the last part, but always trim to a word or sentence boundary. + function substring_to_boundary(input_string, maxlen) + { + if(input_string.length <= maxlen) + { + return input_string; + } + else + { + let cutoff = input_string.length - maxlen; + let trim = input_string.substring(cutoff); + let idx = -1; + let enders = ['.', '!', '?', '*', '"', ')', '}', '`', ']', ';', ' ', '\n']; + for (let i = 0; i < enders.length; ++i) + { + let f = trim.indexOf(enders[i]); + if (idx == -1) { + idx = f; + } else if (f>=0){ + idx = Math.min(idx,f); + } + } + if(idx>=0 && idx <= 20) //if unable to trim safely (20 char max), do not trim + { + trim = trim.substring(idx); //no +1, include leading token! + } + return trim; + } + } + function handle_typing(event) { var event = event || window.event; var charCode = event.keyCode || event.which; @@ -7459,9 +8018,18 @@ Current version: 83 let id_to_cancel = pending_response_id; //flush any streaming text first - if(is_using_custom_ep() && pending_response_id!="" && synchro_pending_stream!="") + if(is_using_custom_ep() && pending_response_id != "" && (synchro_pending_stream != "" || synchro_polled_response != "")) { - synchro_polled_response = synchro_pending_stream; + //apply a short delay of 1s before button reenables + allow_reenable_submitbtn_timestamp = performance.now() + 500; + setTimeout(()=>{ + update_submit_button(true); + }, 1000); + + if(synchro_pending_stream!="") + { + synchro_polled_response = synchro_pending_stream; + } poll_in_progress = false; horde_poll_nearly_completed = false; poll_pending_response(); @@ -7499,7 +8067,14 @@ Current version: 83 }), }) .then((response) => response.json()) - .then((data) => {}) + .then((data) => { + if(globalabortcontroller) + { + globalabortcontroller.abort(); + console.log("Abort Signal"); + prepare_abort_controller(); + } + }) .catch((error) => { console.error('Error:', error); }); @@ -7511,20 +8086,24 @@ Current version: 83 function btn_addimg_longpress_start() { addimgLongPressTimer = setTimeout(()=>{ - inputBox("Enter a prompt to generate an image with.","Generate Image Manually","","Enter a Prompt",()=>{ - let userinput = getInputBoxValue(); - if(userinput.trim()!="") - { - var sentence = userinput.trim().substring(0, 300); - do_manual_gen_image(sentence); - } - },false); + popup_manual_image(); }, 2000); } function btn_addimg_longpress_end() { clearTimeout(addimgLongPressTimer); } + function popup_manual_image() + { + inputBox("Tip: You can generate images manually by long-pressing the 'Add Img' button.\n\nEnter a prompt to generate an image with.","Generate Image Manually","","Enter a Prompt",()=>{ + let userinput = getInputBoxValue(); + if(userinput.trim()!="") + { + var sentence = userinput.trim().substring(0, 300); + do_manual_gen_image(sentence); + } + },false); + } function do_manual_gen_image(sentence) { @@ -7550,6 +8129,8 @@ Current version: 83 nextgeneratedimagemilestone = tclen + generateimagesinterval; do_manual_gen_image(sentence); } + }else{ + popup_manual_image(); } } @@ -7565,9 +8146,12 @@ Current version: 83 idle_timer = 0; idle_triggered_counter = 0; if (localsettings.speech_synth > 0 && 'speechSynthesis' in window) { - let utterance = new window.SpeechSynthesisUtterance(newgen); - utterance.voice = window.speechSynthesis.getVoices()[localsettings.speech_synth - 1]; - window.speechSynthesis.speak(utterance); + if(localsettings.narrate_both_sides) + { + let utterance = new window.SpeechSynthesisUtterance(newgen); + utterance.voice = window.speechSynthesis.getVoices()[localsettings.speech_synth - 1]; + window.speechSynthesis.speak(utterance); + } } if (localsettings.opmode == 4) @@ -7624,6 +8208,7 @@ Current version: 83 } redo_arr = []; retry_prev_text = ""; + retry_preserve_last = true; //initially set to true redo_prev_text = ""; document.getElementById("input_text").value = ""; pending_response_id = "-1"; @@ -7678,16 +8263,27 @@ Current version: 83 } } - //this is a hack since we dont have a proper tokenizer, but we can estimate 1 token per 3.3 characters - let max_allowed_characters = Math.floor(maxctxlen * 3.35); + let truncated_context = concat_gametext(true, ""); //no need to truncate if memory is empty + truncated_context = truncated_context.replace(/\xA0/g,' '); //replace non breaking space nbsp + + //this is a hack since we dont have a proper tokenizer, but we can estimate 1 token per 3 characters + let chars_per_token = 3.0; + //we try to detect attempts at coding which tokenize poorly. This usually happens when the average word length is high. + let avgwordlen = (1.0+truncated_context.length)/(1.0+countWords(truncated_context)); + if(avgwordlen>=7.8) + { + chars_per_token = 2.7; + } if (current_memory == null || current_memory.trim() == "") { //if there is no memory, then we can be a lot of lenient with the character counts since the backend will truncate excess anyway - max_allowed_characters = Math.floor(maxctxlen * 4.6); + chars_per_token = 4.8; } - - let truncated_context = concat_gametext(true, ""); //no need to truncate if memory is empty - truncated_context = truncated_context.replace(/\xA0/g,' '); //replace non breaking space nbsp + if(is_using_kcpp_with_added_memory()) //easily handle overflow + { + chars_per_token = 6; + } + let max_allowed_characters = Math.max(1, Math.floor((maxctxlen-maxgenamt) * chars_per_token) - 12); //for adventure mode, inject hidden context, even more if there's nothing in memory if (localsettings.opmode == 2 && localsettings.adventure_context_mod) @@ -7813,9 +8409,10 @@ Current version: 83 } //we clip the memory if its too long, taking the last x chars (not the first) - //memory or anote is allowed to be up to 0.9 times of ctx allowance - let max_mem_anote_len = Math.floor(max_allowed_characters*0.9); - let truncated_memory = current_memory.substring(current_memory.length - max_mem_anote_len); + //memory is allowed to be up to 0.8 times of ctx allowance, anote up to 0.6 times + let max_mem_len = Math.floor(max_allowed_characters*0.8); + let max_anote_len = Math.floor(max_allowed_characters*0.6); + let truncated_memory = substring_to_boundary(current_memory, max_mem_len); if (truncated_memory != null && truncated_memory != "") { if(newlineaftermemory) { @@ -7837,6 +8434,7 @@ Current version: 83 wimatch_context = wimatch_context.toLowerCase(); } + let wistr = ""; if (current_wi.length > 0) { for (var x = 0; x < current_wi.length; ++x) { let wi = current_wi[x]; @@ -7876,33 +8474,51 @@ Current version: 83 } if (shoulduse) { - truncated_memory += wi.content + "\n"; + wistr += wi.content + "\n"; } } } + //we clip the authors note if its too long let truncated_anote = current_anotetemplate.replace("<|>", current_anote); - truncated_anote = truncated_anote.substring(truncated_anote.length - max_mem_anote_len); + truncated_anote = substring_to_boundary(truncated_anote, max_anote_len); if (current_anote.length == 0) { //if there's no authors note at all, don't include the template truncated_anote = ""; } + if(wi_insertlocation>0) + { + truncated_anote = wistr + truncated_anote; + } + else + { + truncated_memory += wistr; + } + + //now we resize the context such that the memory and authors note can fit inside + truncated_context = substring_to_boundary(truncated_context, max_allowed_characters); + //append memory to the start of the context, clipping excess space if needed //only do this processing if memory or anote is not blank - if (truncated_memory.length > 0 || current_anote.length > 0) { - //now we resize the context such that the memory and authors note can fit inside - truncated_context = truncated_context.substring(truncated_context.length - max_allowed_characters); - let augmented_len = truncated_memory.length + truncated_context.length + truncated_anote.length; - let excess_len = augmented_len - max_allowed_characters; //if > 0, then we exceeded context window - truncated_context = truncated_context.substring(excess_len); + if (truncated_memory.length > 0 || current_anote.length > 0) + { + if(!is_using_kcpp_with_added_memory()) + { + let augmented_len = truncated_memory.length + truncated_context.length + truncated_anote.length; + let excess_len = augmented_len - max_allowed_characters; //if > 0, then we exceeded context window + excess_len = excess_len < 0 ? 0 : excess_len; + let newlimit = (max_allowed_characters-excess_len) < 32 ? 32 : (max_allowed_characters-excess_len); + truncated_context = substring_to_boundary(truncated_context, newlimit); //must always have at least 32 chars from main context + } + //insert authors note 80 tokens before the ending (320 characters). let anote_dist = anote_strength; let anote_insert_idx = truncated_context.length - anote_dist; //try to align anote with a word boundary - for(let i=0;i<10;++i) + for(let i=0;i<12;++i) { if(anote_insert_idx>=0 && anote_insert_idx+ `+(testslot?`[ Slot `+(i+1)+` - `+testslot+` ]`:`[ Slot `+(i+1)+` - Empty ]`)+` +++ + + + +{ return m.name }), }; + if(is_using_kcpp_with_added_memory()) + { + submit_payload.params.memory = truncated_memory; + } + + if(localsettings.sampler_seed>=1) + { + submit_payload.params.sampler_seed = localsettings.sampler_seed; + } + if((custom_kobold_endpoint != "" && is_using_kcpp_with_mirostat())) { if(localsettings.miro_type>0) @@ -7950,6 +8589,10 @@ Current version: 83 submit_payload.params.mirostat_tau = localsettings.miro_tau; submit_payload.params.mirostat_eta = localsettings.miro_eta; } + + //also supports min_p, in that it wont crash, so add it on. it will be ignored if not found + submit_payload.params.min_p = localsettings.min_p; + submit_payload.params.presence_penalty = localsettings.presence_penalty; } if((custom_kobold_endpoint != "" && is_using_kcpp_with_grammar())) @@ -7985,6 +8628,56 @@ Current version: 83 } } + function get_stop_sequences() //the input object may not always be the same! + { + let seqs = []; + if (localsettings.opmode == 2) //stop on new action found + { + seqs = ["\n\> "]; + } + if (localsettings.opmode == 3) //stop on selfname found + { + seqs = [localsettings.chatname + "\:",("\n" + localsettings.chatname + " ")]; + + //for multichat, everyone else becomes a stopper token + if (localsettings.chatopponent!="" && localsettings.chatopponent.includes("||$||")) { + let coarr = localsettings.chatopponent.split("||$||"); + coarr = coarr.filter(x => (x && x != "")); + coarr = coarr.map(x => x.trim()); + for (let n = 0; n < coarr.length; ++n) { + seqs.push(coarr[n] + "\:"); + } + } + else + { + if(localsettings.chatopponent!="") + { + seqs.push("\n"+localsettings.chatopponent + "\: "); + } + } + } + if (localsettings.opmode == 4) //stop on selfname found + { + let st = get_instruct_starttag(true); + let et = get_instruct_endtag(true); + seqs = [st, et]; + } + if (extrastopseq != "") { + let rep = replaceAll(extrastopseq, "\\n", "\n"); + let srep = rep.split("||$||"); + if (srep.length > 0 && !seqs) { + seqs = []; + } + for (let i = 0; i < srep.length; ++i) { + if (srep[i] && srep[i] != "") { + seqs.push(srep[i]); + } + } + } + + return seqs; + } + function dispatch_submit_generation(submit_payload, input_was_empty) //if input is not empty, always unban eos { console.log(submit_payload); @@ -8011,54 +8704,12 @@ Current version: 83 submit_payload.quiet = !showlog; //for vesion 1.2.2 and later, send stopper tokens for chat and instruct - if (kobold_endpoint_version && kobold_endpoint_version != "" && compare_version_str(kobold_endpoint_version, "1.2.1") > 0) { - if (localsettings.opmode == 2) //stop on new action found - { - submit_payload.stop_sequence = ["\n\> "]; - } - if (localsettings.opmode == 3) //stop on selfname found - { - submit_payload.stop_sequence = [localsettings.chatname + "\:",("\n" + localsettings.chatname + " ")]; - - //for multichat, everyone else becomes a stopper token - if (localsettings.chatopponent!="" && localsettings.chatopponent.includes("||$||")) { - let coarr = localsettings.chatopponent.split("||$||"); - coarr = coarr.filter(x => (x && x != "")); - coarr = coarr.map(x => x.trim()); - for (let n = 0; n < coarr.length; ++n) { - submit_payload.stop_sequence.push(coarr[n] + "\:"); - } - } - else - { - if(localsettings.chatopponent!="") - { - submit_payload.stop_sequence.push("\n"+localsettings.chatopponent + "\: "); - } - } - } - if (localsettings.opmode == 4) //stop on selfname found - { - let st = get_instruct_starttag(true); - let et = get_instruct_endtag(true); - submit_payload.stop_sequence = [st, et]; - } - if (extrastopseq != "") { - let rep = replaceAll(extrastopseq, "\\n", "\n"); - let srep = rep.split("||$||"); - if (srep.length > 0 && !submit_payload.stop_sequence) { - submit_payload.stop_sequence = []; - } - for (let i = 0; i < srep.length; ++i) { - if (srep[i] && srep[i] != "") { - submit_payload.stop_sequence.push(srep[i]); - } - } - } + if (kobold_endpoint_version && kobold_endpoint_version != "" && compare_version_str(kobold_endpoint_version, "1.2.2") >= 0) { + submit_payload.stop_sequence = get_stop_sequences(); } //version 1.2.4 and later supports unban tokens - if (kobold_endpoint_version && kobold_endpoint_version != "" && compare_version_str(kobold_endpoint_version, "1.2.3") > 0) + if (kobold_endpoint_version && kobold_endpoint_version != "" && compare_version_str(kobold_endpoint_version, "1.2.4") >= 0) { submit_payload.use_default_badwordsids = determine_if_ban_eos(input_was_empty); } @@ -8095,7 +8746,6 @@ Current version: 83 "presence_penalty": scaled_rep_pen, "temperature": submit_payload.params.temperature, "top_p": submit_payload.params.top_p, - "logit_bias": { "50256": -100 }, } if (document.getElementById("useoaichatcompl").checked) { @@ -8113,6 +8763,7 @@ Current version: 83 } } else { + oai_payload.logit_bias = { "50256": -100 }; oai_payload.prompt = submit_payload.prompt; } @@ -8217,22 +8868,26 @@ Current version: 83 } if(document.getElementById("clauderenamecompat").checked) { + let assistant_correct_case = "Assistant:"; if(!claude_payload.prompt.toLowerCase().trim().startsWith('human:')) { claude_payload.prompt = "Human: "+claude_payload.prompt; } - if(!claude_payload.prompt.toLowerCase().trim().endsWith('assistant:')) + if(!claude_payload.prompt.toLowerCase().trim().endsWith(assistant_correct_case.toLowerCase())) { if(localsettings.opmode==1) { - claude_payload.prompt = claude_payload.prompt + " \nAssistant: Here is a continuation of the story: \nAssistant:"; + claude_payload.prompt = claude_payload.prompt + " \n"+assistant_correct_case+" Here is a continuation of the story: \n"+assistant_correct_case; } else { - claude_payload.prompt = claude_payload.prompt + " (cont.) Assistant:"; + claude_payload.prompt = claude_payload.prompt + " "+assistant_correct_case; } - } + //trim end + claude_payload.prompt = claude_payload.prompt.replace(/[\t\r\n ]+$/, ''); + //replace final assistant with fixed case + claude_payload.prompt = claude_payload.prompt.slice(0, -(assistant_correct_case.length))+assistant_correct_case; } last_request_str = JSON.stringify(claude_payload); @@ -8272,7 +8927,7 @@ Current version: 83 } else if (custom_palm_key != "")//handle for PaLM { - let targetep = default_palm_base + custom_palm_key; + let urlbase = default_palm_base; let payload = {"prompt":{"text":submit_payload.prompt}, "temperature":submit_payload.params.temperature, "maxOutputTokens": submit_payload.params.max_length, @@ -8280,6 +8935,75 @@ Current version: 83 "topK": (submit_payload.params.top_k<1?300:submit_payload.params.top_k), "candidateCount":1}; + if(document.getElementById("custom_palm_model").value=="text-bison-001") + { + payload.safetySettings = [ + { + "category": "HARM_CATEGORY_TOXICITY", + "threshold": "BLOCK_NONE" + }, + { + "category": "HARM_CATEGORY_UNSPECIFIED", + "threshold": "BLOCK_NONE" + }, + { + "category": "HARM_CATEGORY_VIOLENCE", + "threshold": "BLOCK_NONE" + }, + { + "category": "HARM_CATEGORY_SEXUAL", + "threshold": "BLOCK_NONE" + } + ]; + } + else if(document.getElementById("custom_palm_model").value=="gemini-pro") + { + if(localsettings.opmode==1) + { + submit_payload.prompt = submit_payload.prompt + " \n ASSISTANT: Here is a continuation of the story: \nASSISTANT:"; + } + + urlbase = default_gemini_base; + payload = { + "contents": [ + { + "parts": [ + { + "text": submit_payload.prompt + } + ] + } + ], + "safetySettings": [ + { + "category": "HARM_CATEGORY_HARASSMENT", + "threshold": "BLOCK_NONE" + }, + { + "category": "HARM_CATEGORY_HATE_SPEECH", + "threshold": "BLOCK_NONE" + }, + { + "category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", + "threshold": "BLOCK_NONE" + }, + { + "category": "HARM_CATEGORY_DANGEROUS_CONTENT", + "threshold": "BLOCK_NONE" + } + ], + "generationConfig": { + "temperature":submit_payload.params.temperature, + "maxOutputTokens": submit_payload.params.max_length, + "topP": submit_payload.params.top_p, + "topK": (submit_payload.params.top_k<1?300:submit_payload.params.top_k), + "candidateCount":1, + "stopSequences": [] + } + }; + } + + let targetep = urlbase + custom_palm_key; last_request_str = JSON.stringify(payload); fetch(targetep, { @@ -8293,8 +9017,10 @@ Current version: 83 .then((response) => response.json()) .then((data) => { console.log("sync finished response: " + JSON.stringify(data)); - if (custom_palm_key != "" && data.candidates != null && data.candidates.length>0 && data.candidates[0].output != "") { + if (custom_palm_key != "" && data.candidates != null && data.candidates.length>0 && data.candidates[0].output && data.candidates[0].output != "") { synchro_polled_response = data.candidates[0].output; + }else if (custom_palm_key != "" && data.candidates != null && data.candidates.length>0 && data.candidates[0].content && data.candidates[0].content.parts != null && data.candidates[0].content.parts.length>0) { + synchro_polled_response = data.candidates[0].content.parts[0].text; } else { //error occurred, maybe captcha failed @@ -8355,10 +9081,16 @@ Current version: 83 subpostheaders['Client-Agent'] = clientagenttouse; } - //horde supports unban tokens if(submit_payload.params) { + //horde supports unban tokens submit_payload.params.use_default_badwordsids = determine_if_ban_eos(input_was_empty); + + //horde now supports stopping sequences + submit_payload.params.stop_sequence = get_stop_sequences(); + + //horde should support min_p in future too + submit_payload.params.min_p = localsettings.min_p; } last_request_str = JSON.stringify(submit_payload); @@ -8435,7 +9167,7 @@ Current version: 83 sentence = localsettings.image_styles + " " + sentence; } - if (filter_enabled && localsettings.generate_images_mode==1) { + if (localsettings.generate_images_mode==1) { sentence = sanitize_horde_image_prompt(sentence); } @@ -8468,7 +9200,7 @@ Current version: 83 "r2": false } - if(localsettings.generate_images_mode==1) + if(localsettings.generate_images_mode==1) //horde { fetch(stablehorde_submit_endpoint, { method: 'POST', // or 'PUT' @@ -8498,7 +9230,9 @@ Current version: 83 console.error('Error:', error); msgbox("Image generation error: " + error); }); - } else { + } + else if(localsettings.generate_images_mode==2) //a1111 + { let desired_model = document.getElementById("generate_images_local_model").value; genimg_payload.models = [desired_model]; let imgid = "A111img"+(Math.floor(10000 + Math.random() * 90000)).toString(); @@ -8516,10 +9250,38 @@ Current version: 83 }, true); }else{ image_db[imgid].queue = "Failed"; - msgbox("Image Generation Failed!\n\nPlease make sure A1111 is running and properly configured!\nIn your local install of Automatic1111 WebUi, modify webui-user.bat and add these flags to enable API access:\n\nset COMMANDLINE_ARGS= --api --cors-allow-origins=*\n"); + msgbox("Image Generation Failed!\n\nPlease make sure A1111 is running and properly configured!\nIn your local install of Automatic1111 WebUi, modify webui-user.bat and add these flags to enable API access:\n\nset COMMANDLINE_ARGS= --api --listen --cors-allow-origins=*\n"); } }); } + else if(localsettings.generate_images_mode==3) //dalle + { + if(localsettings.saved_dalle_key=="" || localsettings.saved_dalle_url=="") + { + msgbox("Error: A valid DALL-E URL and Key is required to generate images with DALL-E.\nThis is usually the same as your OpenAI API key, but can be customized in settings.","Invalid DALL-E Key"); + } + else + { + let imgid = "DALLEimg"+(Math.floor(10000 + Math.random() * 90000)).toString(); + let nimgtag = "[<|p|" + imgid + "|p|>]"; + gametext_arr.push(nimgtag); + image_db[imgid] = { done: false, queue: "Generating", result: "", alt:sentence, local:true }; + generate_dalle_image(genimg_payload,(outputimg)=>{ + if(outputimg) + { + //console.log(outputimg); + let origImg = "data:image/jpeg;base64," + outputimg; + compressImage(origImg, (newDataUri) => { + image_db[imgid].done = true; + image_db[imgid].result = newDataUri; + }, true); + }else{ + image_db[imgid].queue = "Failed"; + msgbox("Image Generation Failed!\n\nPlease make sure your OpenAI key is set correctly and you are allowed to use DALL-E.\n"); + } + }); + } + } } function click_image(target) @@ -8649,6 +9411,8 @@ Current version: 83 } let foundMyName = gentxt.indexOf(localsettings.chatname + "\:"); let foundMyName2 = gentxt.indexOf("\n" + localsettings.chatname + " "); + var foundAltYouName = new RegExp("\nYou [A-Z\"\'*] ", "gi"); + var foundAltYouNameRes = gentxt.match(foundAltYouName); let splitresponse = []; let prune_multiliners = function(input_arr) @@ -8674,7 +9438,9 @@ Current version: 83 splitresponse = gentxt.split(localsettings.chatname + "\:"); splitresponse = prune_multiliners(splitresponse); } - else if (foundMyName2 != -1 && localsettings.chatname!="You") //added by henky request, trigger even without colon + else if (foundMyName2 != -1 && + (localsettings.chatname!="You" || + (foundAltYouNameRes!=null && foundAltYouNameRes.length>0))) //added by henky request, trigger even without colon { splitresponse = gentxt.split("\n" + localsettings.chatname + " "); splitresponse = prune_multiliners(splitresponse); @@ -8733,6 +9499,7 @@ Current version: 83 } } + let gentxtspeak = gentxt; if (pending_context_preinjection != "") { if(gentxt!="" && gentxt[0]!=" " && localsettings.opmode==3) { @@ -8743,21 +9510,27 @@ Current version: 83 pending_context_preinjection = ""; } - if (localsettings.speech_synth > 0 && 'speechSynthesis' in window) { - let utterance = new window.SpeechSynthesisUtterance(gentxt); + if (localsettings.speech_synth > 0 && 'speechSynthesis' in window) + { + if(localsettings.narrate_both_sides) + { + gentxtspeak = gentxt; + } + let utterance = new window.SpeechSynthesisUtterance(gentxtspeak); utterance.voice = window.speechSynthesis.getVoices()[localsettings.speech_synth - 1]; window.speechSynthesis.speak(utterance); } if(gentxt!="") { - gametext_arr.push(gentxt); + gametext_arr.push(gentxt); //delete last message if retry is hit, since response was added + retry_preserve_last = false; } if(localsettings.beep_on) { playbeep(); } - let lastreq = "Last request served by " + genworker + " using "+genmdl+ " for " + genkudos + " kudos in " + getTimeTaken() + " seconds."; + let lastreq = "Last request served by " + genworker + " using "+genmdl+ ""+(genkudos>0?(" for " + genkudos + " kudos"):"")+" in " + getTimeTaken() + " seconds."; document.getElementById("lastreq").innerHTML = lastreq; document.getElementById("lastreq2").innerHTML = lastreq; } @@ -9151,6 +9924,7 @@ Current version: 83 redo_arr = []; last_reply_was_empty = false; retry_prev_text = ""; + retry_preserve_last = false; redo_prev_text = ""; //stash images @@ -9169,13 +9943,14 @@ Current version: 83 ); - //strip chunks - gametext_elem.innerHTML = gametext_elem.innerHTML.replace(/(.+?)<\/span>/g, "$2"); - gametext_elem.innerHTML = gametext_elem.innerHTML.replace(/(.+?)<\/span>/g, "$2"); - gametext_elem.innerHTML = replaceAll(gametext_elem.innerHTML," ", "
"); - gametext_elem.innerHTML = replaceAll(gametext_elem.innerHTML,"", "
"); - gametext_elem.innerHTML = replaceAll(gametext_elem.innerHTML,"", "
"); - + //strip chunks (optimize for firefox by not constantly modifying dom) + let htmlstr = gametext_elem.innerHTML; + htmlstr = htmlstr.replace(/(.+?)<\/span>/g, "$2"); + htmlstr = htmlstr.replace(/(.+?)<\/span>/g, "$2"); + htmlstr = replaceAll(htmlstr,"", "
"); + htmlstr = replaceAll(htmlstr,"", "
"); + htmlstr = replaceAll(htmlstr,"", "
"); + gametext_elem.innerHTML = htmlstr; //rather than dump it all into one history, let's split it into paragraphs let fullmergedstory = gametext_elem.innerText; @@ -9337,6 +10112,7 @@ Current version: 83 } } + var allow_reenable_submitbtn_timestamp = performance.now(); function update_submit_button(full_update) { if (perfdata == null) { @@ -9357,7 +10133,7 @@ Current version: 83 document.getElementById("btnsend").innerHTML = "No AI
Loaded"; } } - else if (pending_response_id == "") { + else if (pending_response_id == "" && performance.now() >= allow_reenable_submitbtn_timestamp) { if(full_update) { document.getElementById("btnsend").disabled = false; @@ -9411,7 +10187,7 @@ Current version: 83 } document.getElementById("btnmode_adventure").classList.remove("hidden"); } - else if(localsettings.opmode==3 && localsettings.chatopponent!="" && localsettings.chatopponent.includes("||$||")) + else if(localsettings.opmode==3 && localsettings.chatopponent!="") { document.getElementById("inputrow").classList.add("show_mode"); document.getElementById("btnmode_chat").classList.remove("hidden"); @@ -9444,14 +10220,14 @@ Current version: 83 { whorun = "
You're using the Spellbook by Scale AI API"; } - else if(custom_palm_key!="") - { - whorun = "
You're using the PaLM API"; - } else if(custom_claude_key!="") { whorun = "
You're using the Claude API"; } + else if(custom_palm_key!="") + { + whorun = "
You're using the PaLM API"; + } else { whorun = "
There are " + selected_models.reduce((s, a) => s + a.count, 0) + " volunteer(s) running selected models with a total queue length of "+ selected_models.reduce((s, a) => s + a.queued, 0) + " tokens"; } @@ -9468,7 +10244,8 @@ Current version: 83 document.getElementById("gametext").innerHTML = "Welcome to KoboldAI Lite!
You are using the models " + selmodelstr + "" + (selected_workers.length == 0 ? "" : (" (Pinned to " + selected_workers.length + " worker IDs)")) - + "." + whorun +".
"+ nowmode +" Selected - Enter a prompt below to begin!" + "
Or, load a JSON File or a Character Card here." + "
Or, select a Quick Start Scenario here.
"; + + "." + whorun +".
"+ nowmode +" Selected - Enter a prompt below to begin!" + "
Or, load a JSON File or a Character Card here." + "
Or, select a Quick Start Scenario here.
"+ + (welcome!=""?("
"+escapeHtml(welcome)+""):""); } //kick out of edit mode @@ -9609,7 +10386,7 @@ Current version: 83 document.getElementById("topbtn_ai").classList.add("hidden"); document.getElementById("topbtn_newgame").classList.remove("hidden"); document.getElementById("topbtn_save_load").classList.remove("hidden"); - document.getElementById("topbtn_settings").classList.add("hidden"); + document.getElementById("topbtn_settings").classList.remove("hidden"); document.getElementById("topbtn_scenarios").classList.add("hidden"); document.getElementById("topbtn_quickplay").classList.add("hidden"); } else { @@ -9690,12 +10467,12 @@ Current version: 83 { document.getElementById("chat_msg_body").innerHTML = render_enhanced_chat_instruct(textToRender,false); } - if (localsettings.opmode == 3 && localsettings.chatopponent != "" && localsettings.chatopponent.includes("||$||")) { + if (localsettings.opmode == 3 && localsettings.chatopponent != "") { document.getElementById("chat_btnmode_chat").classList.remove("hidden"); - document.getElementById("cht_inp").classList.add("shorter"); + document.getElementById("cht_inp_bg").classList.add("shorter"); } else { document.getElementById("chat_btnmode_chat").classList.add("hidden"); - document.getElementById("cht_inp").classList.remove("shorter"); + document.getElementById("cht_inp_bg").classList.remove("shorter"); } // Show the 'AI is typing' message if an answer is pending, and prevent the 'send button' from being clicked again. @@ -9823,6 +10600,7 @@ Current version: 83 let foundimg = ""; if(curr.msg && curr.msg!="") { + curr.msg = curr.msg.replace(italics_regex,"$1"); //convert the msg into images curr.msg = curr.msg.replace(/\[<\|p\|.+?\|p\|>\]/g, function (m) { // m here means the whole matched string @@ -9837,7 +10615,7 @@ Current version: 83 return inner; }); curr.msg = curr.msg.replace(/\[<\|.+?\|>\]/g, ""); //remove normal comments too - curr.msg = curr.msg.replace(italics_regex,"$1"); + } @@ -9884,12 +10662,36 @@ Current version: 83 } } } + function chat_resize_input() + { + //resize chat inp + let textarea = document.getElementById("cht_inp"); + + let textlines = textarea.value.split("\n"); + let numberOfLineBreaks = textlines.length; + let lengthtester = document.getElementById("cht_inp_lengthtester"); + for(let l=0;l`; - if(localsettings.chatopponent!="") - { + let gs = ``; + if (localsettings.chatopponent != "" && localsettings.chatopponent.includes("||$||")) { + gs = `Selected participants will reply randomly, unless you address them directly by name.` + +`
`; + else if(localsettings.chatopponent != "") + { + gs = `You're having a one-on-one chat with `+localsettings.chatopponent+`.
Unselected participants will not reply in group chats.
` + +``; let grouplist = localsettings.chatopponent.split("||$||"); - for(let i=0;i
`; } - gs += ``+grouplist[i]+` `; + gs += ` ` + grouplist[i] + ` ` + +`` + +`
` + +`Turn it into a group chat by adding more AI characters (one per line).
` + + `Impersonate `+localsettings.chatopponent+` speaking as them`; + } + document.getElementById("groupselectitems").innerHTML = gs; } + function impersonate_message(index) + { + hide_popups(); + let grouplist = localsettings.chatopponent.split("||$||"); + let target = grouplist[index]; + inputBox("Add a messsage speaking as "+target+":","Impersonate "+target,"",target+" says...", ()=>{ + let userinput = getInputBoxValue(); + userinput = userinput.trim(); + if(userinput!="") + { + gametext_arr.push("\n"+target+": "+userinput); + render_gametext(); + } + hide_popups(); + },false); + } function confirm_groupchat_select() { groupchat_removals = []; @@ -10787,7 +11658,7 @@ Current version: 83@@ -10982,7 +11855,7 @@ Current version: 83 - + @@ -11024,6 +11897,49 @@ Current version: 83 + @@ -11059,22 +11975,27 @@ Current version: 83 +@@ -10831,15 +11702,17 @@ Current version: 83-+ onclick="submit_generation()">Loading [ABORT]-- - ++ + +Avoid sending privacy sensitive information. Click here for more info.+Avoid sending privacy sensitive information. Click here for more info.Add Endpoint Version- +Claude Compatibility Rename Fix@@ -11087,7 +12008,18 @@ Current version: 83Unsaved data will be lost.+ +
-Keep AI Selected?+++++ Keep AI Selected? + +++ Keep Memory and World Info? + ++