")).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(/\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)} + function simpleMarkdown(e){var r=function(e){return e.replace(//g,">")},l=function(e,r){return"
"},c=function(e){return(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=(e=e.replace(/^###### (.*?)\s*#*$/gm,""+(r=(r=(r=(r=(r=r.replace(//g,">")).replace(/\t/g," ").replace(/\^\^\^(.+?)\^\^\^/g,"$1")).replace(/^\/\/(.*)/gm,"//$1 ").replace(/\s\/\/(.*)/gm,"//$1 ")).replace(/(\s?)(function|procedure|return|exit|if|then|else|end|loop|while|or|and|case|when)(\s)/gim,"$1$2$3")).replace(/(\s?)(var|let|const|=>|for|next|do|while|loop|continue|break|switch|try|catch|finally)(\s)/gim,"$1$2$3"))+"$1
").replace(/^##### (.*?)\s*#*$/gm,"$1
").replace(/^#### (.*?)\s*#*$/gm,"$1
").replace(/^### (.*?)\s*#*$/gm,"$1
").replace(/^## (.*?)\s*#*$/gm,"$1
").replace(/^# (.*?)\s*#*$/gm,"$1
") + .replace(/^
")).replace(/``(.*?)``/gm,function(e,l){return""+r(l).replace(/`/g,"`")+""})).replace(/`(.*?)`/gm,"$1")).replace(/^\>\> (.*$)/gm,"
")).replace(/^\> (.*$)/gm,"$1
$1
")).replace(/<\/blockquote\>\n
")).replace(/!\[(.*?)\]\((.*?) "(.*?)"\)/gm,'')).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(/\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)} //LMZA-JS, under MIT license var lz_c=function(){"use strict";function r(e,r){postMessage({action:Ur,cbn:r,result:e})}function t(e){var r=[];return r[e-1]=void 0,r}function n(e,r){return i(e[0]+r[0],e[1]+r[1])}function s(e,r){return f(~~Math.max(Math.min(e[1]/$r,2147483647),-2147483648)&~~Math.max(Math.min(r[1]/$r,2147483647),-2147483648),c(e)&c(r))}function o(e,r){var t,n;return e[0]==r[0]&&e[1]==r[1]?0:(t=0>e[1],n=0>r[1],t&&!n?-1:!t&&n?1:h(e,r)[1]<0?-1:1)}function i(e,r){var t,n;for(r%=0x10000000000000000,e%=0x10000000000000000,t=r%$r,n=Math.floor(e/$r)*$r,r=r-t+n,e=e-n+t;0>e;)e+=$r,r-=$r;for(;e>4294967295;)e-=$r,r+=$r;for(r%=0x10000000000000000;r>0x7fffffff00000000;)r-=0x10000000000000000;for(;-0x8000000000000000>r;)r+=0x10000000000000000;return[e,r]}function _(e,r){return e[0]==r[0]&&e[1]==r[1]}function a(e){return e>=0?[e,0]:[e+$r,-$r]}function c(e){return e[0]>=2147483648?~~Math.max(Math.min(e[0]-$r,2147483647),-2147483648):~~Math.max(Math.min(e[0],2147483647),-2147483648)}function f(e,r){var t,n;return t=e*$r,n=r,0>r&&(n+=$r),[n,t]}function u(e){return 30>=e?1<Apple devices are known to have issues saving. If the above button does not work, try opening or right-click / long press one of the below links, and select (Save As)
- Raw File Data
- JSON File Data
- JSON URL Blob
`, "Save Story", true) + } + } + reader.readAsDataURL(file); + } + else + { + savenowfn(); + } + } + if(localsettings.prompt_for_savename) { inputBox("Enter a Filename","Save File",last_known_filename,"Input Filename", ()=>{ @@ -3816,17 +4221,13 @@ Current version: 76 save_file(); } } - function save_file() { - //determine if oldui file or newui file format, but we always save to oldui format - let is_oldui = (loaded_storyobj.file_version == null); - if (!is_oldui) { - // was formerly saved in newui format, regenerate a basic oldui file - loaded_storyobj = generate_base_storyobj(); - } + function generate_savefile(save_images,export_settings,export_aesthetic_settings) //takes the current loaded story and generates a new savefile json object + { + let new_save_storyobj = generate_base_storyobj(); let export_arr = gametext_arr; - if(!localsettings.save_images) + if(!save_images) { export_arr = []; for (let i = 0; i < gametext_arr.length; ++i) { @@ -3834,67 +4235,52 @@ Current version: 76 } } - - loaded_storyobj.prompt = ""; - loaded_storyobj.actions = []; - loaded_storyobj.actions_metadata = {}; if (export_arr.length > 0) { - loaded_storyobj.prompt = export_arr[0]; + new_save_storyobj.prompt = export_arr[0]; } for (var i = 1; i < export_arr.length; ++i) { - loaded_storyobj.actions.push(export_arr[i]); + new_save_storyobj.actions.push(export_arr[i]); let key = (i - 1).toString(); - loaded_storyobj.actions_metadata[key] = { + new_save_storyobj.actions_metadata[key] = { "Selected Text": export_arr[i], "Alternative Text": [] }; } - loaded_storyobj.anotetemplate = current_anotetemplate; - loaded_storyobj.authorsnote = current_anote; - loaded_storyobj.memory = current_memory; - loaded_storyobj.worldinfo = current_wi; + new_save_storyobj.anotetemplate = current_anotetemplate; + new_save_storyobj.authorsnote = current_anote; + new_save_storyobj.memory = current_memory; + new_save_storyobj.worldinfo = current_wi; //extra unofficial fields - loaded_storyobj.extrastopseq = extrastopseq; + new_save_storyobj.extrastopseq = extrastopseq; - if (localsettings.export_settings) { - loaded_storyobj.savedsettings = JSON.parse(JSON.stringify(localsettings)); + if (export_settings) { + new_save_storyobj.savedsettings = JSON.parse(JSON.stringify(localsettings)); //redact some values - loaded_storyobj.savedsettings.my_api_key = "0000000000"; - loaded_storyobj.savedsettings.home_cluster = text_hordes[0].baseurl; - loaded_storyobj.savedsettings.saved_oai_key = ""; - loaded_storyobj.savedsettings.saved_oai_addr = ""; - loaded_storyobj.savedsettings.saved_claude_key = ""; - loaded_storyobj.savedsettings.saved_claude_addr = ""; + 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_oai_addr = ""; + new_save_storyobj.savedsettings.saved_claude_key = ""; + new_save_storyobj.savedsettings.saved_claude_addr = ""; + new_save_storyobj.savedsettings.saved_kai_addr = ""; + new_save_storyobj.savedsettings.saved_openrouter_key = ""; - loaded_storyobj.savedaestheticsettings = JSON.parse(JSON.stringify(aestheticInstructUISettings, null, 2)); - }else{ - loaded_storyobj.savedsettings = null; - loaded_storyobj.savedaestheticsettings = null; - } + new_save_storyobj.savedsettings.modelhashes = []; - - window.URL = window.URL || window.webkitURL; - - var userAgent = window.navigator.userAgent; - newfilename = last_known_filename; - - if (userAgent.match(/AppleWebKit/) && (userAgent.match(/iPad/i) || userAgent.match(/iPhone/i))) { - var file = new Blob([JSON.stringify(loaded_storyobj)], { type: 'application/octet-stream' }); - console.log("Special save handling for iphones") - // iPad or iPhone needs an extra download - var reader = new FileReader(); - reader.onload = function (e) { - msgbox(`If that does not work, right-click or long press this link, and select (Save As)
`, "Save Story", true) + if(export_aesthetic_settings) + { + new_save_storyobj.savedaestheticsettings = JSON.parse(JSON.stringify(aestheticInstructUISettings, null, 2)); + for (var i = 0; i < selected_models.length; ++i) { + new_save_storyobj.savedsettings.modelhashes.push(cyrb_hash(selected_models[i].name)); + } } - reader.readAsDataURL(file); - } - else - { - savenowfn(); + }else{ + new_save_storyobj.savedsettings = null; + new_save_storyobj.savedaestheticsettings = null; } - + return new_save_storyobj; } function load_file(event) { @@ -3912,6 +4298,7 @@ Current version: 76 } }; + //attempt to load a file from disk. could be any format, even images function load_selected_file(selectedFile) { var selectedFilename = ""; @@ -3939,11 +4326,15 @@ Current version: 76 //check for ooba text generation fields (character) load_ooba_obj(new_loaded_storyobj); } + else if(new_loaded_storyobj.md && new_loaded_storyobj.savedsettings) //add some compat loading for sharefiles + { + kai_json_load(new_loaded_storyobj,false); + } else { msgbox("Could not load selected json file. Does not appear to be a KoboldAI story or compatible format."); } } else { - kai_json_load(new_loaded_storyobj); + kai_json_load(new_loaded_storyobj,false); if (selectedFilename && selectedFilename != "") { last_known_filename = selectedFilename; } @@ -3983,7 +4374,7 @@ Current version: 76 } if (result != null) { - kai_json_load(result); + kai_json_load(result,false); } else { if (selectedFilename.endsWith(".txt")) { @@ -3992,11 +4383,8 @@ Current version: 76 //raw text import restart_new_game(); gametext_arr.push(text); - hide_popups(); render_gametext(); - }, () => { - hide_popups(); - }, true) + }, null, true) } else { msgbox("Could not load selected file. Is it valid?"); } @@ -4012,104 +4400,81 @@ Current version: 76 reader.readAsText(selectedFile); } - function kai_json_load(new_loaded_storyobj) + function kai_json_load(storyobj, force_load_settngs) { //determine if oldui file or newui file format restart_new_game(); - loaded_storyobj = new_loaded_storyobj; - let is_oldui = (loaded_storyobj.file_version == null); - console.log("Is oldui: " + is_oldui); - if (is_oldui) { - //v1 load - if(loaded_storyobj.prompt!="") + + 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 (is_sharefile) { + //handle old shareformat + gametext_arr = storyobj.ga; + if(gametext_arr==null) { - gametext_arr.push(loaded_storyobj.prompt); + gametext_arr = []; } - for (var i = 0; i < loaded_storyobj.actions.length; ++i) { - gametext_arr.push(loaded_storyobj.actions[i]); + 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]); } - //port over old images to the new format - migrate_old_images_in_gametext(); - - if (loaded_storyobj.anotetemplate) { - current_anotetemplate = loaded_storyobj.anotetemplate; + if (storyobj.anotetemplate) { + current_anotetemplate = storyobj.anotetemplate; } - if (loaded_storyobj.authorsnote) { - current_anote = loaded_storyobj.authorsnote; + if (storyobj.authorsnote) { + current_anote = storyobj.authorsnote; } - if (loaded_storyobj.memory) { - current_memory = loaded_storyobj.memory; + if (storyobj.memory) { + current_memory = storyobj.memory; } - if (loaded_storyobj.worldinfo) { - current_wi = loaded_storyobj.worldinfo; + if (storyobj.worldinfo) { + current_wi = storyobj.worldinfo; } - if (loaded_storyobj.extrastopseq) { - extrastopseq = loaded_storyobj.extrastopseq; - } - if (loaded_storyobj.savedsettings && loaded_storyobj.savedsettings != "") { - //prompt to import settings - msgboxYesNo("This story includes custom settings. Do you want to import them?", "Import Story Settings", () => { - 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_claude1 = localsettings.saved_claude_key; - let tmp_claude2 = localsettings.saved_claude_addr; - let tmp_palm1 = localsettings.saved_palm_key; - import_props_into_object(localsettings, loaded_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_claude_key = tmp_claude1; - localsettings.saved_claude_addr = tmp_claude2; - localsettings.saved_palm_key = tmp_palm1; - - //backwards compat support for newlines - if(localsettings.instruct_has_newlines==true || (loaded_storyobj.savedsettings != null && loaded_storyobj.savedsettings.instruct_has_newlines==null&&loaded_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 (loaded_storyobj.savedaestheticsettings && loaded_storyobj.savedaestheticsettings != "") { - import_props_into_object(aestheticInstructUISettings,loaded_storyobj.savedaestheticsettings); - } - - hide_popups(); - render_gametext(); - }, hide_popups); + if (storyobj.extrastopseq) { + extrastopseq = storyobj.extrastopseq; } } else { //v2 load - if(loaded_storyobj.prompt!="") + if(storyobj.prompt!="") { - gametext_arr.push(loaded_storyobj.prompt); + gametext_arr.push(storyobj.prompt); } - for (var key in loaded_storyobj.actions.actions) { - var itm = loaded_storyobj.actions.actions[key]; + for (var key in storyobj.actions.actions) { + var itm = storyobj.actions.actions[key]; gametext_arr.push(itm["Selected Text"]); } - if (loaded_storyobj.authornotetemplate) { - current_anotetemplate = loaded_storyobj.authornotetemplate; + if (storyobj.authornotetemplate) { + current_anotetemplate = storyobj.authornotetemplate; } - if (loaded_storyobj.authornote) { - current_anote = loaded_storyobj.authornote; + if (storyobj.authornote) { + current_anote = storyobj.authornote; } - if (loaded_storyobj.memory) { - current_memory = loaded_storyobj.memory; + if (storyobj.memory) { + current_memory = storyobj.memory; } - if (loaded_storyobj.worldinfo_v2 != null && loaded_storyobj.worldinfo_v2.entries != null) { - for (var key in loaded_storyobj.worldinfo_v2.entries) { - var itm = loaded_storyobj.worldinfo_v2.entries[key]; + 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], @@ -4124,9 +4489,69 @@ Current version: 76 } } } + } + + 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) + { + document.getElementById("entersubmit").checked = localsettings.entersubmit; + } } - render_gametext(); + + //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(); + } + } function load_agnai_wi(obj,chatopponent,myname) @@ -4190,6 +4615,7 @@ Current version: 76 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:""; //post process if(scenario!="") @@ -4200,7 +4626,11 @@ Current version: 76 { examplemsg = "\n"+examplemsg; } - let combinedmem = memory + scenario + examplemsg; + if(sysprompt!="") + { + sysprompt = sysprompt+"\n"; + } + let combinedmem = sysprompt + memory + scenario + examplemsg; let agnaidatafieldsempty = scenario + examplemsg + (obj.personality?obj.personality:"") + greeting; //check if it's a world info only card, if so, do not restart game if(combinedmem.trim()=="" && greeting=="" && obj.entries) @@ -4217,9 +4647,10 @@ Current version: 76 localsettings.chatname = myname; localsettings.chatopponent = chatopponent; gametext_arr.push("\n"+chatopponent+": "+greeting); - current_memory = combinedmem + "\n"; + current_memory = combinedmem + "\n***"; localsettings.opmode = 3; localsettings.gui_type_chat = 2; + localsettings.multiline_replies = true; //handle character book if(obj.character_book && obj.character_book.entries && obj.character_book.entries.length>0) { @@ -4253,7 +4684,7 @@ Current version: 76 localsettings.chatname = myname; localsettings.chatopponent = chatopponent; gametext_arr.push("\n"+chatopponent+": "+greeting); - current_memory = memory + scenario + examplemsg + "\n "; + current_memory = memory + scenario + examplemsg + "\n***"; localsettings.opmode = 3; localsettings.gui_type_chat = 2; render_gametext(); @@ -4320,26 +4751,25 @@ Current version: 76 },false); } - function get_chubai_scenario() + function get_chubai_scenario(chubstr="") { - inputBox("Enter chub.ai prompt URL","Import from chub.ai","","https://chub.ai/characters/Anonymous/example-character", ()=>{ - let userinput = getInputBoxValue().toLowerCase().trim(); + const loadchub = function(userinput) + { if(userinput=="") { //pass } else { - if (userinput.includes("chub.ai/")) { - //is a url, extract the character name - userinput = userinput.replace("/characters/","/"); - userinput = userinput.split("chub.ai/")[1]; - userinput = userinput.split("#")[0]; - userinput = userinput.split("?")[0]; + if (userinput.match(/chub\.ai\//i)) { + // is a URL, extract the character name + userinput = userinput.replace(/\/characters\//i, '/'); + userinput = userinput.split(/chub\.ai\//i)[1].split("#")[0].split("?")[0]; } userinput = userinput.endsWith('/') ? userinput.slice(0, -1) : userinput; if(userinput!="") { + document.getElementById("scenariodesc").innerText = "Loading scenario from Chub..."; fetch("https://api.chub.ai/api/characters/download", { method: 'POST', headers: { @@ -4352,18 +4782,25 @@ Current version: 76 }), referrerPolicy: 'no-referrer', }) - .then(x => x.json()) + .then(x => { + if(x.ok) + { + return x.json(); + }else{ + throw new Error('Cannot fetch chub scenario'); + } + }) .then(data => { console.log(data); let botname = data.name?data.name:"Bot"; let cdef = data.definition?data.definition.replace("END_OF_DIALOG","").trim():""; let cdesc = data.description?data.description:""; let greeting = data.greeting?data.greeting:""; - let previewtxt = replaceAll(cdesc,"{{char}}",botname,true); + let previewtxt = (data.title ? data.title + '\n\n' : '') + replaceAll(cdesc,"{{char}}",botname,true); previewtxt = replaceAll(previewtxt,"{{user}}","You",true); temp_scenario = { - "title":data.title?data.title:"", + "title":data.name?data.name:"", "desc": previewtxt, "opmode":3, "chatname": "You", @@ -4376,7 +4813,42 @@ Current version: 76 "authorsnote": "", "worldinfo": [], }; - preview_temp_scenario(); + + //try to obtain the full portrait image + fetch("https://api.chub.ai/api/characters/download", { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + "format": "tavern", + "fullPath": userinput, + "version": "main" + }), + referrerPolicy: 'no-referrer', + }) + .then(rb => { + if(rb.ok) + { + return rb.blob(); + }else{ + throw new Error('Cannot fetch tavern image'); + } + }) + .then(blob => { + preview_temp_scenario(); + const objectURL = URL.createObjectURL(blob); + const compressedImg = compressImage(objectURL, (compressedImageURI, aspectratio)=>{ + temp_scenario.image = compressedImageURI; + temp_scenario.image_aspect = aspectratio; + preview_temp_scenario(); + }, true); + }) + .catch(error => { + preview_temp_scenario(); + console.error("Error fetching tavern image:", error); + }); + }).catch((error) => { temp_scenario = null; document.getElementById("scenariodesc").innerText = "Error: Selected scenario is invalid."; @@ -4384,10 +4856,20 @@ Current version: 76 }); }else{ temp_scenario = null; - document.getElementById("scenariodesc").innerText = "Error: User input is invalid\n\n Please ensure you have input a valid aetherroom.club URL or ID (e.g. https://aetherroom.club/1234 or just 1234)"; + document.getElementById("scenariodesc").innerText = "Error: User input is invalid\n\n Please ensure you have input a valid Chub AI URL or ID."; } } - },false); + } + + if(chubstr=="") + { + inputBox("Enter chub.ai prompt URL","Import from chub.ai","","https://chub.ai/characters/Anonymous/example-character", ()=>{ + let userinput = getInputBoxValue().trim(); + loadchub(userinput); + },false); + }else{ + loadchub(chubstr); + } } @@ -4399,13 +4881,18 @@ Current version: 76 function preview_temp_scenario() { let author = ""; + let image = ""; if(temp_scenario.author && temp_scenario.author!="") { author = "
Author: "+temp_scenario.author; } - document.getElementById("scenariodesc").innerHTML = ``+escapeHtml(temp_scenario.title)+`
`+ + if (temp_scenario.image) { + temp_scenario.gui_type = 2; //upgrade to aesthetic if we have image + image = ``; + } + document.getElementById("scenariodesc").innerHTML = image+`
`+escapeHtml(temp_scenario.title)+`
`+ `Mode: `+(temp_scenario.opmode==1?"Story":(temp_scenario.opmode==2?"Adventure":(temp_scenario.opmode==3?"Chat":"Instruct"))) + author+`
` - +``+(temp_scenario.desc!=""?escapeHtml(temp_scenario.desc):"[No Description Given]") +`
`; + +``+(temp_scenario.desc!=""?escapeHtml(temp_scenario.desc).replace(/\n/g, '
`; } function complete_load_scenario() { @@ -4436,6 +4923,11 @@ Current version: 76 current_memory = replace_placeholders_direct(current_memory); } } + if (temp_scenario.image && temp_scenario.image != "") { + aestheticInstructUISettings.AI_portrait = temp_scenario.image; + document.getElementById('portrait_ratio_AI').value = (temp_scenario.image_aspect?temp_scenario.image_aspect:1).toFixed(2); + refreshPreview(true); + } if (temp_scenario.worldinfo && temp_scenario.worldinfo.length > 0) { current_wi = []; for (let x = 0; x < temp_scenario.worldinfo.length; ++x) { @@ -4496,6 +4988,14 @@ Current version: 76 else if(temp_scenario.gui_type===2) { localsettings.gui_type_instruct = 2; } else if(temp_scenario.gui_type===0) { localsettings.gui_type_instruct = 0; } + if (temp_scenario.instruct_has_markdown===true) { + localsettings.instruct_has_markdown = true; + } + else if(temp_scenario.instruct_has_markdown===false) + { + localsettings.instruct_has_markdown = false; + } + if (temp_scenario.instruct_starttag) { localsettings.instruct_starttag = temp_scenario.instruct_starttag; } if (temp_scenario.instruct_endtag) { localsettings.instruct_endtag = temp_scenario.instruct_endtag; } } @@ -4567,7 +5067,7 @@ Current version: 76 } else { - let nsfwmodels = ["erebus","shinen","horni","litv2","lit-6b","spicyboros","mlewd"]; + let nsfwmodels = ["erebus","shinen","horni","litv2","lit-6b","spicyboros","mlewd","mxlewd"]; selected_models = []; for (var i = 0; i < mdls.length; ++i) { for (var j = 0; j < temp_scenario.prefmodel1.length; ++j) { @@ -4690,7 +5190,7 @@ Current version: 76 function show_last_req() { - msgbox(last_request_str,"Last Request Context",false); + msgbox(last_request_str,"Last Request Sent",false); } var worker_data_showonly = []; //only for table display, dont mix @@ -4700,6 +5200,22 @@ Current version: 76 } get_workers((wdata) => { worker_data_showonly = wdata; + + //preprocess the showonly data for extra fields + for (var i = 0; i < worker_data_showonly.length; ++i) { + let elem = worker_data_showonly[i]; + let tokenspersec = elem.performance.replace(" tokens per second", ""); + if(tokenspersec.toLowerCase()=="no requests fulfilled yet") + { + tokenspersec = 0; + } + worker_data_showonly[i].tokenspersec = parseFloat(tokenspersec); + if(elem.models.length>0) + { + worker_data_showonly[i].defaultmodel = elem.models[0]; + } + } + show_workers(); }); } @@ -4774,6 +5290,31 @@ Current version: 76 return days+"d "+hours+"h "+minutes+"m"; } + var sortworkersdisplayasc = true; + var lastsortworkerkey = ""; + function sort_display_workers(sortkey) + { + sortworkersdisplayasc = !sortworkersdisplayasc; + if(lastsortworkerkey!=sortkey) + { + sortworkersdisplayasc = true; + } + lastsortworkerkey = sortkey; + worker_data_showonly.sort(function(a, b) { + if(sortworkersdisplayasc) + { + if(a[sortkey] < b[sortkey]) { return -1; } + if(a[sortkey] > b[sortkey]) { return 1; } + return 0; + }else{ + if(a[sortkey] < b[sortkey]) { return 1; } + if(a[sortkey] > b[sortkey]) { return -1; } + return 0; + } + }); + show_workers(); + } + function show_workers() { document.getElementById("workercontainer").classList.remove("hidden"); @@ -4814,11 +5355,12 @@ Current version: 76 if (parentcluster && userData && userData.worker_ids && userData.worker_ids.length > 0) { let urls = userData.worker_ids.map(x=>parentcluster.maintenance_endpoint + "/" + x); - Promise.all(urls.map(url => fetch(url) - .then(response => response.json()))) + Promise.all(urls.map(url => fetch(url).then(response => response.json()).catch(error => error))) .then(values => { + values = values.filter(n => (n.id && n.id!="")); lastValidFoundUserWorkers = values; - console.log(values); + console.log(lastValidFoundUserWorkers); + document.getElementById("myownworkercontainer").classList.remove("hidden"); let str = ""; @@ -4828,7 +5370,7 @@ Current version: 76 let brokenstyle = (elem.maintenance_mode ? "style=\"color:#ee4444;\"" : ""); let workerNameHtml = escapeHtml(elem.name.substring(0, 32)); let eleminfo = ((elem.info && elem.info!="")?elem.info:""); - str += "
'):"[No Description Given]") +`" + workerNameHtml + " " + format_uptime(elem.uptime) + "
(" + elem.requests_fulfilled + " jobs)" + elem.kudos_rewards.toFixed(0) + " "+(elem.online?"Online":"Offline")+" " + workerNameHtml + " " + format_uptime(elem.uptime) + "
(" + elem.requests_fulfilled + " jobs)" + elem.kudos_rewards.toFixed(0) + "
"+(elem.online?"Online":"Offline")+"+ + + +++ Temporary Browser Storage +`; + filetable += entry; + + for(let i=0;i<4;++i) + { + let testslot = localStorage.getItem(STORAGE_PREFIX + "slot_"+i+"_meta"); + entry = `+`; + filetable += entry; + } + document.getElementById("saveloadentries").innerHTML = filetable; + } + function save_to_slot(slot) + { + let defaultsavename = (localsettings.opmode==1?"Untitled Story":(localsettings.opmode==2?"Untitled Adventure":(localsettings.opmode==3?"Untitled Chat":"Untitled Instruct"))); + let savename = defaultsavename + " " + new Date().toLocaleString(); + let slotnumshown = (slot+1); + let testslot = localStorage.getItem(STORAGE_PREFIX + "slot_"+slot+"_meta"); + if(testslot) + { + savename = testslot; + } + let newcompressedstory = generate_compressed_story(true,true,true); + + const slotwrite = function() + { + inputBox("Enter a label for this Browser Storage Slot data","Enter a label",savename,defaultsavename,()=>{ + let userinput = getInputBoxValue(); + if(userinput.trim()=="") + { + userinput = defaultsavename; + } + localStorage.setItem(STORAGE_PREFIX + "slot_"+slot+"_data", newcompressedstory); + localStorage.setItem(STORAGE_PREFIX + "slot_"+slot+"_meta", userinput); + display_saveloadcontainer(); + }); + } + + if(testslot) + { + msgboxYesNo("Overwrite existing story in Browser Storage Slot "+slotnumshown+"?","Overwrite Storage Slot "+slotnumshown,()=>{ + slotwrite(); + },null); + }else{ + slotwrite(); + } + + + } + function load_from_slot(slot) + { + let loadedstorycompressed = localStorage.getItem(STORAGE_PREFIX + "slot_"+slot+"_data"); + if(loadedstorycompressed) + { + hide_popups(); + import_compressed_story(loadedstorycompressed,false); + }else{ + msgbox("Unable to load story from browser storage","Browser Storage Load Failed"); + } + } + function download_from_slot(slot) + { + let loadedstorycompressed = localStorage.getItem(STORAGE_PREFIX + "slot_"+slot+"_data"); + if(loadedstorycompressed) + { + tempfileobj = decompress_story(loadedstorycompressed); + if(tempfileobj) + { + save_file_button(true); + } + else + { + tempfileobj = generate_base_storyobj(); + msgbox("Story could not be downloaded. Try loading it first.","Browser Storage Load Failed"); + } + }else{ + msgbox("Unable to load story from browser storage","Browser Storage Load Failed"); + } + } + function delete_from_slot(slot) + { + let slotnumshown = (slot+1); + msgboxYesNo("Delete story in Browser Storage Slot "+slotnumshown+"?","Delete Storage Slot "+slotnumshown,()=>{ + localStorage.setItem(STORAGE_PREFIX + "slot_"+slot+"_data", ""); + localStorage.setItem(STORAGE_PREFIX + "slot_"+slot+"_meta", ""); + display_saveloadcontainer(); + },()=>{ + display_saveloadcontainer(); + }); } function fetch_models(onDoneCallback) @@ -5716,6 +6457,35 @@ Current version: 76 } } + function delete_my_worker(index) + { + if(lastValidFoundUserWorkers && lastValidFoundUserWorkers.length>index) + { + let elem = lastValidFoundUserWorkers[index]; + msgboxYesNo(`Are you sure you want to delete the worker `+elem.name+` with the ID `+elem.id+`?+ `+(testslot?`[ Slot `+(i+1)+` - `+testslot+` ]`:`[ Slot `+(i+1)+` - Empty ]`)+` +++ + + + +
This action is irreversible!`,"Confirm Delete Worker", + ()=>{ + let newapikey = document.getElementById("apikey").value; + let parentcluster = find_text_horde(lastValidFoundCluster); + fetch(parentcluster.maintenance_endpoint + "/" + elem.id, { + method: 'DELETE', + headers: { + 'Content-Type': 'application/json', + 'apikey': newapikey, + } + }) + .then((response) => response.json()) + .then((data) => { + msgbox(JSON.stringify(data), "Delete My Worker"); + }) + .catch((error) => { + console.error('Error:', error); + }); + hide_popups(); + },()=>{ + },true); + } + } + function update_my_workers() { let newapikey = document.getElementById("apikey").value; @@ -5769,7 +6539,9 @@ Current version: 76 } desired_new_home_cluster = null; let newapikey = document.getElementById("apikey").value; + if (newapikey != null && newapikey.trim() != "") { + document.getElementById("showownworkerslink").classList.add("hidden"); document.getElementById("kudos_bal").innerHTML = "Checking...
"; let fupayload = { @@ -5779,7 +6551,6 @@ Current version: 76 }, }; let fu_zip = finduser_endpoints.map(a => [a, fupayload]); - multifetch(fu_zip, (resArr, errArr) => { if (resArr && resArr.length > 0) { lastValidFoundUserData = null; @@ -5810,9 +6581,12 @@ Current version: 76 { document.getElementById("kudos_bal").innerHTML = clustertag + uname + "
"+ "(Register New User)"; + }else{ + document.getElementById("showownworkerslink").classList.remove("hidden"); } } else { document.getElementById("kudos_bal").innerHTML = clustertag + unameurl + "
Kudos Balance: " + kuds; + document.getElementById("showownworkerslink").classList.remove("hidden"); } } @@ -5894,6 +6668,7 @@ Current version: 76 document.getElementById("invert_colors").checked = localsettings.invert_colors; document.getElementById("trimsentences").checked = localsettings.trimsentences; document.getElementById("trimwhitespace").checked = localsettings.trimwhitespace; + document.getElementById("compressnewlines").checked = localsettings.compressnewlines; document.getElementById("eos_ban_mode").value = localsettings.eos_ban_mode; document.getElementById("persist_session").checked = localsettings.persist_session; document.getElementById("opmode").value = localsettings.opmode; @@ -5931,7 +6706,11 @@ Current version: 76 { document.getElementById("tokenstreaminglabel").classList.add("color_red"); } - document.getElementById("generate_images").value = localsettings.generate_images; + document.getElementById("generate_images_model").value = localsettings.generate_images_model; + if(document.getElementById("generate_images_mode").value == 0 || document.getElementById("generate_images_mode").value != localsettings.generate_images_mode) { + document.getElementById("generate_images_mode").value = localsettings.generate_images_mode; + toggle_generate_images_mode(true); + } document.getElementById("multiline_replies").checked = localsettings.multiline_replies; document.getElementById("allow_continue_chat").checked = localsettings.allow_continue_chat; document.getElementById("idle_responses").value = localsettings.idle_responses; @@ -5982,12 +6761,9 @@ Current version: 76 toggle_opmode(); //sd models display - let sdmodelshtml = ""; - for (var i = 0; i < stablemodels.length; ++i) { - sdmodelshtml += "