mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
- Merged RossAscends-mods.js as separate file.
- removed RA functions from main JS (left code as comments, feel free to delete) - moved function declarations out of document ready - function calls and listeners remain inside the document ready function - fixed UsernameChange and Char deletion in main JS - updated Humanizedtime variable name - small css changes
This commit is contained in:
RossAsscends
@ -18,6 +18,7 @@
|
||||
<script src="scripts/jquery-cookie-1.4.1.min.js"></script>
|
||||
<script src="scripts/showdown.min.js"></script>
|
||||
<script src="scripts/popper.js"></script>
|
||||
<script type="module" src="scripts/RossAscends-mods.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="style.css">
|
||||
<link rel="stylesheet" href="css/bg_load.css">
|
||||
<link rel="icon" type="image/x-icon" href="favicon.ico">
|
||||
@ -818,16 +819,6 @@
|
||||
</div>
|
||||
<textarea id="send_textarea" placeholder="Not connected to API!" name="text"></textarea>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
//RossAscends: this script makes the chat input text area resize vertically to match the text size (limited by CSS at 50% window height)
|
||||
$('#send_textarea').on('input', function () {
|
||||
this.style.height = '40px';
|
||||
this.style.height =
|
||||
(this.scrollHeight) + 'px';
|
||||
});
|
||||
</script>
|
||||
|
||||
<div id="send_but_sheld">
|
||||
<div id="loading_mes"></div>
|
||||
<input id="send_but" type="button">
|
||||
|
||||
1834
public/script.js
1834
public/script.js
File diff suppressed because it is too large
Load Diff
369
public/scripts/RossAscends-mods.js
Normal file
369
public/scripts/RossAscends-mods.js
Normal file
@ -0,0 +1,369 @@
|
||||
import { encode } from "../scripts/gpt-2-3-tokenizer/mod.js";
|
||||
|
||||
import {
|
||||
Generate,
|
||||
getSettings,
|
||||
saveSettings,
|
||||
printMessages,
|
||||
clearChat,
|
||||
getChat,
|
||||
this_chid,
|
||||
settings,
|
||||
characters,
|
||||
online_status,
|
||||
main_api,
|
||||
api_server,
|
||||
api_key_novel,
|
||||
getCharacters,
|
||||
is_send_press
|
||||
} from "../script.js";
|
||||
|
||||
var NavToggle = document.getElementById("nav-toggle");
|
||||
var PanelPin = document.getElementById("rm_button_panel_pin");
|
||||
var SelectedCharacterTab = document.getElementById("rm_button_selected_ch");
|
||||
var RightNavPanel = document.getElementById("right-nav-panel");
|
||||
var AdvancedCharDefsPopup = document.getElementById("character_popup");
|
||||
var ConfirmationPopup = document.getElementById("dialogue_popup");
|
||||
var AutoConnectCheckbox = document.getElementById("auto-connect-checkbox");
|
||||
var AutoLoadChatCheckbox = document.getElementById("auto-load-chat-checkbox");
|
||||
var SelectedNavTab = ("#"+LoadLocal('SelectedNavTab'));
|
||||
|
||||
var create_save_name;
|
||||
var create_save_description;
|
||||
var create_save_personality;
|
||||
var create_save_first_message;
|
||||
var create_save_scenario;
|
||||
var create_save_mes_example;
|
||||
var count_tokens;
|
||||
var perm_tokens;
|
||||
var ALC_Done;
|
||||
|
||||
////////////////// LOCAL STORAGE HANDLING /////////////////////
|
||||
|
||||
function SaveLocal(target, val) {
|
||||
localStorage.setItem(target, val);
|
||||
console.log('SaveLocal -- '+target+' : '+val);
|
||||
}
|
||||
function LoadLocal(target) {
|
||||
return localStorage.getItem(target);
|
||||
}
|
||||
function LoadLocalBool(target){
|
||||
let result = localStorage.getItem(target) === 'true';
|
||||
return result;
|
||||
}
|
||||
function CheckLocal() {
|
||||
console.log("----------local storage---------");
|
||||
var i;
|
||||
for (i = 0; i < localStorage.length; i++) {
|
||||
console.log(localStorage.key(i) +" : " +localStorage.getItem(localStorage.key(i)));
|
||||
}
|
||||
console.log("------------------------------");
|
||||
}
|
||||
function ClearLocal() {localStorage.clear();console.log('Removed All Local Storage');}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
//RossAscends: Added function to format dates used in files and chat timestamps to a humanized format.
|
||||
//Mostly I wanted this to be for file names, but couldn't figure out exactly where the filename save code was as everything seemed to be connected.
|
||||
//Does not break old characters/chats, as the code just uses whatever timestamp exists in the chat.
|
||||
//New chats made with characters will use this new formatting.
|
||||
//Useable variable is (( HumanizedDateTime ))
|
||||
export function humanizedDateTime() {
|
||||
let baseDate = new Date(Date.now());
|
||||
let humanYear = baseDate.getFullYear();
|
||||
let humanMonth = baseDate.getMonth() + 1;
|
||||
let humanDate = baseDate.getDate();
|
||||
let humanHour = (baseDate.getHours() < 10 ? "0" : "") + baseDate.getHours();
|
||||
let humanMinute =
|
||||
(baseDate.getMinutes() < 10 ? "0" : "") + baseDate.getMinutes();
|
||||
let humanSecond =
|
||||
(baseDate.getSeconds() < 10 ? "0" : "") + baseDate.getSeconds();
|
||||
let humanMillisecond =
|
||||
(baseDate.getMilliseconds() < 10 ? "0" : "") + baseDate.getMilliseconds();
|
||||
let HumanizedDateTime =
|
||||
humanYear +"-" +humanMonth +"-" +humanDate +" @" +humanHour +"h " +humanMinute +"m " +humanSecond +"s " +humanMillisecond +"ms";
|
||||
return HumanizedDateTime;
|
||||
}
|
||||
|
||||
//RA_CountCharTokens -- faster counting characters. Works for unsaved characters, and counts permanent and ephemeral tokens separately.
|
||||
|
||||
// triggers:
|
||||
$("#rm_button_create").on("click", function () { //when "+New Character" is clicked
|
||||
$(SelectedCharacterTab).children("h2").html(''); // empty nav's 3rd panel tab
|
||||
|
||||
//empty temp vars to store new char data for counting
|
||||
create_save_name="";
|
||||
create_save_description="";
|
||||
create_save_personality="";
|
||||
create_save_first_message="";
|
||||
create_save_scenario="";
|
||||
create_save_mes_example="";
|
||||
$("#result_info").html('Type to start counting tokens!');
|
||||
});
|
||||
$(SelectedCharacterTab).children("h2").on("DOMSubtreeModified", function () { // when the nav's 3rd panel tab header changes (when a char is selected from the char list)
|
||||
//console.log('3rd tab name changed - counting tokens');
|
||||
//SaveLocal('ActiveChar',active_character);
|
||||
setTimeout(RA_CountCharTokens,200); //delay to allow textareas to fill out, so we don't show a previous char's count
|
||||
});
|
||||
|
||||
$("#rm_ch_create_block").on("input", function () {RA_CountCharTokens();}); //when any input is made to the create/edit character form textareas
|
||||
$("#character_popup").on("input", function () {RA_CountCharTokens();}); //when any input is made to the advanced editing popup textareas
|
||||
|
||||
//function:
|
||||
function RA_CountCharTokens() {
|
||||
$("#result_info").html("");
|
||||
console.log('RA_TC -- starting with this_chid = '+this_chid);
|
||||
if (document.getElementById('name_div').style.display == "block"){ //if new char
|
||||
|
||||
$("#form_create").on("input", function () { //fill temp vars with form_create values
|
||||
create_save_name = $("#character_name_pole").val();
|
||||
create_save_description = $("#description_textarea").val();
|
||||
create_save_first_message = $("#firstmessage_textarea").val();
|
||||
});
|
||||
$("#character_popup").on("input", function () { //fill temp vars with advanced popup values
|
||||
create_save_personality = $("#personality_textarea").val();
|
||||
create_save_scenario = $("#scenario_pole").val();
|
||||
create_save_mes_example = $("#mes_example_textarea").val();
|
||||
|
||||
});
|
||||
|
||||
//count total tokens, including those that will be removed from context once chat history is long
|
||||
count_tokens = encode(JSON.stringify(
|
||||
create_save_name +
|
||||
create_save_description +
|
||||
create_save_personality +
|
||||
create_save_scenario +
|
||||
create_save_first_message +
|
||||
create_save_mes_example
|
||||
)).length;
|
||||
|
||||
//count permanent tokens that will never get flushed out of context
|
||||
perm_tokens = encode(JSON.stringify(
|
||||
create_save_name +
|
||||
create_save_description +
|
||||
create_save_personality +
|
||||
create_save_scenario
|
||||
)).length;
|
||||
|
||||
} else {if (this_chid !== undefined && this_chid !== "invalid-safety-id") { // if we are counting a valid pre-saved char
|
||||
|
||||
//same as above, all tokens including temporary ones
|
||||
count_tokens = encode(
|
||||
JSON.stringify(
|
||||
characters[this_chid].description +
|
||||
characters[this_chid].personality +
|
||||
characters[this_chid].scenario +
|
||||
characters[this_chid].first_mes +
|
||||
characters[this_chid].mes_example
|
||||
)).length;
|
||||
|
||||
//permanent tokens count
|
||||
perm_tokens = encode(
|
||||
JSON.stringify(
|
||||
characters[this_chid].name +
|
||||
characters[this_chid].description +
|
||||
characters[this_chid].personality +
|
||||
characters[this_chid].scenario
|
||||
)).length;
|
||||
} else {console.log("RA_TC -- no valid char found, closing.");} // if neither, probably safety char or some error in loading
|
||||
}
|
||||
// display the counted tokens
|
||||
if (count_tokens < 1024 && perm_tokens < 1024) {
|
||||
$("#result_info").html(count_tokens + " Tokens (" + perm_tokens + " Permanent Tokens)"); //display normal if both counts are under 1024
|
||||
} else {$("#result_info").html("<font color=red>" +count_tokens +" Tokens (" +perm_tokens +" Permanent Tokens)(TOO MANY)</font>");} //warn if either are over 1024
|
||||
}
|
||||
|
||||
|
||||
|
||||
//Auto Load Last Charcter -- (fires when active_character is defined and auto_load_chat is true)
|
||||
async function RA_autoloadchat() {
|
||||
if (document.getElementById('CharID0') !== null){
|
||||
console.log('char list loaded! clicking activeChar')
|
||||
var CharToAutoLoad = document.getElementById('CharID'+LoadLocal('ActiveChar'));
|
||||
if (CharToAutoLoad !=null){
|
||||
CharToAutoLoad.click();
|
||||
}else{
|
||||
console.log(CharToAutoLoad + ' ActiveChar local var - not found: '+LoadLocal('ActiveChar'));
|
||||
}
|
||||
RestoreNavTab();
|
||||
}else{
|
||||
console.log('no char list yet..')
|
||||
setTimeout(RA_autoloadchat,100) // if the charcter list hadn't been loaded yet, try again.
|
||||
}
|
||||
}
|
||||
|
||||
//only triggers when AutoLoadChat is enabled, consider adding this as an independent feature later.
|
||||
function RestoreNavTab(){
|
||||
if($(rm_button_selected_ch).children("h2").text()!==''){ //check for a change in the character edit tab name
|
||||
console.log('detected ALC char finished loaded, proceeding to restore tab.');
|
||||
$(SelectedNavTab).click() //click to restore saved tab when name has changed (signalling char load is done)
|
||||
}else{
|
||||
setTimeout(RestoreNavTab,100) //if not changed yet, check again after 100ms
|
||||
}
|
||||
}
|
||||
|
||||
//changes input bar and send button display depending on connection status
|
||||
$("#online_status_text2").on("DOMSubtreeModified", function () {RA_checkOnlineStatus();});
|
||||
function RA_checkOnlineStatus() {
|
||||
if (online_status == "no_connection") {
|
||||
$("#send_textarea").attr("placeholder", "Not connected to API!"); //Input bar placeholder tells users they are not connected
|
||||
$("#send_form").css("background-color", "rgba(100,0,0,0.7)"); //entire input form area is red when not connected
|
||||
$("#send_but").css("display", "none"); //send button is hidden when not connected;
|
||||
} else {
|
||||
if (online_status !== undefined && online_status !== "no_connection") {
|
||||
$("#send_textarea").attr("placeholder", "Type a message..."); //on connect, placeholder tells user to type message
|
||||
$("#send_form").css("background-color", "rgba(0,0,0,0.7)"); //on connect, form BG changes to transprent black
|
||||
$("#send_but").css("display", "inline"); //on connect, send button shows
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Auto-connect to API (when set to kobold, API URL exists, and auto_connect is true)
|
||||
function RA_autoconnect() {
|
||||
//console.log('RA_AC -- starting..')
|
||||
if(online_status !== undefined && api_server !== ''){
|
||||
if (online_status == "no_connection") {
|
||||
if (LoadLocalBool('AutoConnectEnabled') === true) {
|
||||
if (main_api === "kobold") {
|
||||
if (api_server !== "") {
|
||||
$("#api_url_text").val(api_server);
|
||||
console.log('clicking API-button');
|
||||
$("#api_button").click();
|
||||
//console.log("clicked KAI connect for you");
|
||||
} else {
|
||||
console.log(main_api+' '+api_server);
|
||||
console.log("RA_AC - KAI API not specificed");
|
||||
}
|
||||
} else {
|
||||
//console.log("RA_AC - not kobold. skipping to novel.");
|
||||
}
|
||||
|
||||
if (main_api === "novel") {
|
||||
if (api_key_novel !== "") {
|
||||
$("#api_key_novel").val(api_key_novel);
|
||||
console.log('clicking novel API-button');
|
||||
$("#api_button").click();
|
||||
// console.log("clicked NAI connect for you");
|
||||
} else {
|
||||
console.log("RA_AC - no novel API key");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
console.log("RA_AC - is disabled. stopping.");
|
||||
}
|
||||
} else {
|
||||
console.log("RA_AC -- Already online, nothing to do.");
|
||||
}
|
||||
}else{
|
||||
console.log('RA_AC -- settings not loaded yet...trying again..');
|
||||
setTimeout(RA_autoconnect,100);
|
||||
} // if onlinbe_staus hadn't been declared yet, try again..
|
||||
}
|
||||
|
||||
|
||||
$("document").ready(function () {
|
||||
|
||||
// read the state of Nav Lock and whether the nav was open or not before page load.
|
||||
$(PanelPin).prop('checked', LoadLocalBool("NavLockOn"));
|
||||
if (LoadLocalBool("NavLockOn") == true){
|
||||
$(NavToggle).prop("checked", LoadLocalBool("NavOpened"));
|
||||
}
|
||||
// read the state of AutoConnect and AutoLoadChat.
|
||||
$(AutoConnectCheckbox).prop("checked",LoadLocalBool("AutoConnectEnabled"));
|
||||
$(AutoLoadChatCheckbox).prop("checked",LoadLocalBool("AutoLoadChatEnabled"));
|
||||
|
||||
|
||||
|
||||
//AutoLoadChat and AutoConnect must be loaded on a small delay after page load to allow getSettings to fill out what they need
|
||||
if (LoadLocalBool('AutoLoadChatEnabled') == true) {
|
||||
console.log('calling RA_ALC');
|
||||
RA_autoloadchat();
|
||||
}
|
||||
|
||||
if (LoadLocalBool("AutoConnectEnabled") == true) {RA_autoconnect()}
|
||||
|
||||
$("#main_api").change(function () {RA_autoconnect();});
|
||||
|
||||
$("#api_button").click(function () {setTimeout(RA_checkOnlineStatus, 100);});
|
||||
|
||||
//close the RightNav panel when user clicks outside of it or related panels (adv editing popup, or dialog popups)
|
||||
$("html").click(function (e) {
|
||||
//console.log('clicking'+$(this));
|
||||
if ($(NavToggle).prop("checked") === true && $(PanelPin).prop("checked") === false) {
|
||||
if ($(e.target).attr("id") !== "nav-toggle") {
|
||||
if (RightNavPanel.contains(e.target) === false) {
|
||||
if (AdvancedCharDefsPopup.contains(e.target) === false) {
|
||||
if (ConfirmationPopup.contains(e.target) === false) {
|
||||
NavToggle.click();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
//save NavLock prefs and record state of the Nav being open or closed
|
||||
$(NavToggle).on("change", function () {
|
||||
SaveLocal("NavOpened", $(NavToggle).prop("checked"));
|
||||
});
|
||||
$(PanelPin).on("change",function () {
|
||||
SaveLocal("NavLockOn", $(PanelPin).prop("checked"));
|
||||
});
|
||||
|
||||
//save AutoConnect and AutoLoadChat prefs
|
||||
$(AutoConnectCheckbox).on("change",function () {
|
||||
SaveLocal("AutoConnectEnabled", $(AutoConnectCheckbox).prop("checked"));
|
||||
});
|
||||
$(AutoLoadChatCheckbox).on("change",function () {
|
||||
SaveLocal("AutoLoadChatEnabled", $(AutoLoadChatCheckbox).prop("checked"));
|
||||
});
|
||||
|
||||
//save the clicked Nav Tab as the tab to auto-open on page reload
|
||||
$("#rm_button_settings").click( function (){
|
||||
SaveLocal('SelectedNavTab','rm_button_settings');
|
||||
});
|
||||
$(SelectedCharacterTab).click(function () {
|
||||
console.log('3rd tab clicked - saving selnavtab');
|
||||
//SaveLocal('ActiveChar',this_chid);
|
||||
SaveLocal('SelectedNavTab','rm_button_selected_ch');
|
||||
});
|
||||
$("#rm_button_characters").click( function () { //if char list is clicked, in addition to saving it...
|
||||
SaveLocal('SelectedNavTab','rm_button_characters');
|
||||
characters.sort(Intl.Collator().compare); // we sort the list
|
||||
});
|
||||
// when a char is selected from the list, save them as the auto-load character for next page load
|
||||
$(document).on("click", ".character_select",function () {
|
||||
console.log('char clicked in charlist - saving local activechar');
|
||||
SaveLocal('ActiveChar',$(this).attr('chid'));
|
||||
});
|
||||
|
||||
//this makes the chat input text area resize vertically to match the text size (limited by CSS at 50% window height)
|
||||
$('#send_textarea').on('input', function () {
|
||||
this.style.height = '40px';
|
||||
this.style.height =
|
||||
(this.scrollHeight) + 'px';
|
||||
});
|
||||
|
||||
//Additional hotkeys CTRL+ENTER and CTRL+UPARROW
|
||||
document.addEventListener("keydown", (event) => {
|
||||
if (event.ctrlKey && event.key == "Enter") {
|
||||
// Ctrl+Enter for Regeneration Last Response
|
||||
if (is_send_press == false) {
|
||||
|
||||
Generate("regenerate");
|
||||
}
|
||||
}
|
||||
if (event.ctrlKey && event.key == "ArrowUp") {
|
||||
//Ctrl+UpArrow for Connect to last server
|
||||
if (online_status === "no_connection") {
|
||||
document.getElementById("api_button").click();
|
||||
}
|
||||
}
|
||||
if (event.ctrlKey && event.key == "ArrowLeft") { //for debug, show all local stored vars
|
||||
CheckLocal();
|
||||
}
|
||||
if (event.ctrlKey && event.key == "ArrowRight") { //for debug, empty local storage state
|
||||
ClearLocal();
|
||||
}
|
||||
});
|
||||
|
||||
})
|
||||
@ -103,6 +103,7 @@ body {
|
||||
.mes_text i,
|
||||
.mes_text em {
|
||||
color: var(--grey70);
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.mes_text strong,
|
||||
@ -185,11 +186,11 @@ code {
|
||||
border-bottom: 1px solid var(--black30a);
|
||||
border-left: 1px solid var(--black30a);
|
||||
border-right: 1px solid var(--black30a);
|
||||
backdrop-filter: blur(10px);
|
||||
backdrop-filter: blur(20px);
|
||||
background-color: var(--black70a);
|
||||
-webkit-backdrop-filter: blur(10px);
|
||||
/*border-radius: 0 0 40px 40px;*/
|
||||
-webkit-backdrop-filter: blur(20px);
|
||||
text-shadow: #000 0 0 3px;
|
||||
scrollbar-width: thin;
|
||||
|
||||
}
|
||||
|
||||
@ -209,6 +210,7 @@ code {
|
||||
|
||||
border-radius: 0 0 20px 20px;
|
||||
background-color: var(--crimson70a);
|
||||
backdrop-filter: blur(20px);
|
||||
}
|
||||
|
||||
#send_but_sheld {
|
||||
@ -293,13 +295,13 @@ code {
|
||||
overflow: hidden;
|
||||
display: block;
|
||||
position: absolute;
|
||||
backdrop-filter: blur(10px);
|
||||
background-color: var(--black70a);
|
||||
-webkit-backdrop-filter: blur(10px);
|
||||
/* backdrop-filter: blur(10px); */ /* removed because we can't have both this and the input bar blurring*/
|
||||
background-color: var(--black100);
|
||||
/* -webkit-backdrop-filter: blur(10px); */ /* removed because we can't have both this and the input bar blurring*/
|
||||
border: 1px solid #666;
|
||||
border-radius: 15px;
|
||||
box-shadow: 00 5px #000;
|
||||
text-shadow: #000 0 0 3px;
|
||||
box-shadow: 0 0 5px black;
|
||||
text-shadow: 0 0 3px black;
|
||||
min-width: 200px;
|
||||
z-index: 2000;
|
||||
}
|
||||
@ -427,8 +429,10 @@ textarea {
|
||||
font-size: 15px;
|
||||
font-family: "Noto Sans", "Noto Color Emoji", sans-serif;
|
||||
padding: 5px 10px;
|
||||
scrollbar-width: thin;
|
||||
}
|
||||
|
||||
|
||||
#send_textarea {
|
||||
font-size: 1rem;
|
||||
line-height: 1.5rem;
|
||||
@ -1146,7 +1150,7 @@ input[type=search]:focus::-webkit-search-cancel-button {
|
||||
z-index: -100;
|
||||
background-color: red;
|
||||
}
|
||||
|
||||
/* ------ online status indicators and texts. 2 = kobold AI, 3 = Novel AI ----------*/
|
||||
#online_status2,
|
||||
#online_status4 {
|
||||
opacity: 0.5;
|
||||
@ -2421,6 +2425,7 @@ a {
|
||||
z-index: 2050;
|
||||
white-space: nowrap;
|
||||
border-left: 1px solid var(--black30a);
|
||||
scrollbar-width: thin;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 450px) {
|
||||
|
||||
Reference in New Issue
Block a user