rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

Browse Source
This commit is contained in:
SillyLossy
2023-04-08 18:09:55 +03:00
parent 2c57d0efb6 7fd5feac44
commit 017869932d
3 changed files with 586 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
public/index.html
View File

@ -106,7 +106,8 @@
Adjust generation to worker capabilities Adjust generation to worker capabilities
</label> </label>
<h4>API key</h4> <h4>API key</h4>
<h5>Get it here: <a target="_blank" href="https://horde.koboldai.net/register">Register</a></h5> <h5>Get it here: <a target="_blank" href="https://horde.koboldai.net/register">Register</a>
</h5>
<input id="horde_api_key" name="horde_api_key" class="text_pole" maxlength="500" value="0000000000" autocomplete="off"> <input id="horde_api_key" name="horde_api_key" class="text_pole" maxlength="500" value="0000000000" autocomplete="off">
<h4 class="horde_model_title"> <h4 class="horde_model_title">
Model Model
@ -322,10 +323,9 @@
<div class="drawer-toggle drawer-header"> <div class="drawer-toggle drawer-header">
<div class="drawer-icon icon-sliders closedIcon" title="AI Response Configuration"></div> <div class="drawer-icon icon-sliders closedIcon" title="AI Response Configuration"></div>
</div> </div>
<div class="drawer-content closedDrawer widthFreeExpand"> <div class="drawer-content fillLeft closedDrawer widthFreeExpand">
<div class="flex-container"> <div class="flex-container">
<div id="ai-settings-flex-col1" class="flexWide50p"> <div id="respective-presets-block" class="width100p">
<div id="respective-presets-block">
<div id="kobold_api-presets"> <div id="kobold_api-presets">
<h3>Kobold Presets <h3>Kobold Presets
<a href="/notes/4" class="notes-link" target="_blank"> <a href="/notes/4" class="notes-link" target="_blank">
@ -369,9 +369,13 @@
<select id="settings_preset_textgenerationwebui"> <select id="settings_preset_textgenerationwebui">
</select> </select>
</div> </div>
<div id="poe_api-presets">
<h3>Poe.com API Settings</h3>
<!-- just a placeholder title for the Poe.com settings panel-->
</div> </div>
<hr> </div>
<div id="common-gen-settings-block"> <div id="common-gen-settings-block" class="width100p">
<div id="pro-settings-block"> <div id="pro-settings-block">
<div id="amount_gen_block" class="range-block"> <div id="amount_gen_block" class="range-block">
<div class="range-block-title"> <div class="range-block-title">
@ -389,7 +393,7 @@
</div> </div>
</div> </div>
</div> </div>
<div id="respective-ranges-and-temps"> <div id="respective-ranges-and-temps" class="width100p">
<div id="range_block"> <div id="range_block">
<div class="range-block"> <div class="range-block">
<div class="range-block-title"> <div class="range-block-title">
@ -575,53 +579,40 @@
</div> </div>
<div id="range_block_poe"> <div id="range_block_poe">
<div class="range-block"> <div class="range-block">
<div class="range-block-title">
Auto-purge poe.com chat
</div>
<div class="range-block-counter">
Deletes messages from poe before each prompt is sent
</div>
<div class="range-block-range">
<label for="poe_auto_purge" class="checkbox_label"> <label for="poe_auto_purge" class="checkbox_label">
<input id="poe_auto_purge" type="checkbox"> <input id="poe_auto_purge" type="checkbox">
Enable Auto-purge chat cache
</label> </label>
<div class="range-block-counter justifyLeft">
Deletes messages from poe before each prompt is sent
</div> </div>
</div> </div>
<div class="range-block"> <div class="range-block">
<div class="range-block-title">
Auto-jailbreak
</div>
<div class="range-block-counter">
Sends the jailbreak message and keeps it in context
</div>
<div class="range-block-range">
<label for="poe_auto_jailbreak" class="checkbox_label"> <label for="poe_auto_jailbreak" class="checkbox_label">
<input id="poe_auto_jailbreak" type="checkbox"> <input id="poe_auto_jailbreak" type="checkbox">
Enable Auto-jailbreak
</label> </label>
<div class="range-block-counter justifyLeft">
Sends the jailbreak message and keeps it in context
</div> </div>
</div> </div>
<div class="range-block"> <div class="range-block">
<div class="range-block-title"> <label for="poe_character_nudge" class="checkbox_label">
<input id="poe_character_nudge" class="text_pole" type="checkbox" />
Send character note Send character note
</div> </label>
<div class="range-block-counter"> <div class="range-block-counter justifyLeft">
Nudges the bot to reply as the character only Nudges the bot to reply as the character only
</div> </div>
<div class="range-block-range"> <div class="range-block-range">
<label for="poe_character_nudge" class="checkbox_label">
<input id="poe_character_nudge" class="text_pole" type="checkbox" />
Enable
</label>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> <div id="advanced-ai-config-block" class="width100p">
<div id="ai-settings-flex-col2" class="flexWide50p">
<div id="advanced-ai-config-block">
<div id="kobold_api-settings"> <div id="kobold_api-settings">
<div id="kobold-advanced-config"> <div id="kobold-advanced-config">
<div class="range-block"> <div class="range-block">
@ -826,6 +817,7 @@
</div> </div>
<div id="openai_settings"> <div id="openai_settings">
<div class="flex-container">
<div class="range-block"> <div class="range-block">
<label class="checkbox_label" for="nsfw_toggle"> <label class="checkbox_label" for="nsfw_toggle">
<input id="nsfw_toggle" type="checkbox" checked> <input id="nsfw_toggle" type="checkbox" checked>
@ -868,7 +860,7 @@
Wrap in Quotes Wrap in Quotes
</label> </label>
</div> </div>
</div>
<br> <br>
<div class="range-block"> <div class="range-block">
@ -927,7 +919,7 @@
<div class="range-block-title"> <div class="range-block-title">
Jailbreak activation message Jailbreak activation message
</div> </div>
<div class="range-block-counter"> <div class="range-block-counter justifyLeft">
Message sent as a jailbreak to activate the roleplay Message sent as a jailbreak to activate the roleplay
</div> </div>
<div class="range-block-range"> <div class="range-block-range">
@ -938,7 +930,7 @@
<div class="range-block-title"> <div class="range-block-title">
Jailbreak activation response Jailbreak activation response
</div> </div>
<div class="range-block-counter"> <div class="range-block-counter justifyLeft">
Bot reply that counts as a successful jailbreak Bot reply that counts as a successful jailbreak
</div> </div>
<div class="range-block-range"> <div class="range-block-range">
@ -949,7 +941,7 @@
<div class="range-block-title"> <div class="range-block-title">
Character note text Character note text
</div> </div>
<div class="range-block-counter"> <div class="range-block-counter justifyLeft">
Text to be send as a character nudge Text to be send as a character nudge
</div> </div>
<div class="range-block-range"> <div class="range-block-range">
@ -961,7 +953,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div id="WI-SP-button" class="drawer" style="z-index:3003;"> <div id="WI-SP-button" class="drawer" style="z-index:3003;">
<div class="drawer-toggle drawer-header"> <div class="drawer-toggle drawer-header">
@ -1121,7 +1112,8 @@
<h4>Active extensions</h4> <h4>Active extensions</h4>
<ul id="extensions_list"> <ul id="extensions_list">
</ul> </ul>
<p>Missing something? Press <a id="extensions_details" href="javascript:void(null);">here</a> for more details!</p> <p>Missing something? Press <a id="extensions_details" href="javascript:void(null);">here</a>
for more details!</p>
</div> </div>
<div id="extensions_settings"> <div id="extensions_settings">
<h3>Extension settings</h3> <h3>Extension settings</h3>
@ -1132,9 +1124,10 @@
<div id="rightNavHolder" class="drawer" style="z-index:3001;"> <div id="rightNavHolder" class="drawer" style="z-index:3001;">
<div id="unimportantYes" class="drawer-toggle drawer-header"> <div id="unimportantYes" class="drawer-toggle drawer-header">
<div id="rightNavDrawerIcon" class="drawer-icon icon-idcard closedIcon" title="Character Management"></div> <div id="rightNavDrawerIcon" class="drawer-icon icon-idcard closedIcon" title="Character Management">
</div> </div>
<nav id="right-nav-panel" class="drawer-content closedDrawer"> </div>
<nav id="right-nav-panel" class="drawer-content closedDrawer fillRight">
<div id="right-nav-panel-tabs"> <div id="right-nav-panel-tabs">
<div class="right_menu_button" id="rm_button_characters" title="Select/Create Characters"> <div class="right_menu_button" id="rm_button_characters" title="Select/Create Characters">
<img alt="" class="svg_icon" src="img/list-ul-solid.svg" /> <img alt="" class="svg_icon" src="img/list-ul-solid.svg" />
@ -1161,11 +1154,11 @@
<div id="avatar_div_div" class="avatar"> <div id="avatar_div_div" class="avatar">
<img id="avatar_load_preview" src="img/ai4.png" alt="avatar"> <img id="avatar_load_preview" src="img/ai4.png" alt="avatar">
</div> </div>
<div class="form_create_bottom_buttons_block">
<label for="add_avatar_button" class="menu_button" title="Click to select a new avatar for this character"> <label for="add_avatar_button" class="menu_button" title="Click to select a new avatar for this character">
<input type="file" id="add_avatar_button" name="avatar" accept="image/png, image/jpeg, image/jpg, image/gif, image/bmp"> <input type="file" id="add_avatar_button" name="avatar" accept="image/png, image/jpeg, image/jpg, image/gif, image/bmp">
<img alt="" class="svg_icon" src="img/file-image-solid.svg"> <img alt="" class="svg_icon" src="img/file-image-solid.svg">
</label> </label>
<div class="form_create_bottom_buttons_block">
<div id="rm_button_back" class="menu_button"> <div id="rm_button_back" class="menu_button">
<img alt="" class="svg_icon" src="img/left-long-solid.svg"> <img alt="" class="svg_icon" src="img/left-long-solid.svg">
</div> </div>

18
public/script.js
View File

@ -831,7 +831,7 @@ function messageFormating(mes, ch_name, isSystem, forceAvatar) {
mes = mes.replace(/\n/g, "<br/>"); mes = mes.replace(/\n/g, "<br/>");
mes = mes.trim(); mes = mes.trim();
mes = mes.replace(/<code>[\s\S]*?<\/code>/g, function(match) { mes = mes.replace(/<code>[\s\S]*?<\/code>/g, function (match) {
return match.replace(/&amp;/g, '&'); return match.replace(/&amp;/g, '&');
}); });
} }
@ -1649,7 +1649,7 @@ async function Generate(type, automatic_trigger, force_name2) {
'seed': textgenerationwebui_settings.seed, 'seed': textgenerationwebui_settings.seed,
} }
]; ];
generate_data = { "data": [ JSON.stringify(data) ]}; generate_data = { "data": [JSON.stringify(data)] };
} }
if (main_api == 'novel') { if (main_api == 'novel') {
@ -2137,7 +2137,7 @@ function changeMainAPI() {
"poe": { "poe": {
apiSettings: $("#poe_settings"), apiSettings: $("#poe_settings"),
apiConnector: $("#poe_api"), apiConnector: $("#poe_api"),
apiPresets: $(""), apiPresets: $("#poe_api-presets"),
apiRanges: $("#range_block_poe"), apiRanges: $("#range_block_poe"),
maxContextElem: $("#max_context_block"), maxContextElem: $("#max_context_block"),
amountGenElem: $("#amount_gen_block"), amountGenElem: $("#amount_gen_block"),
@ -2822,7 +2822,7 @@ function setExtensionPrompt(key, value, position, depth) {
} }
function updateChatMetadata(newValues, reset) { function updateChatMetadata(newValues, reset) {
chat_metadata = reset? { ...newValues } : { ...chat_metadata, ...newValues }; chat_metadata = reset ? { ...newValues } : { ...chat_metadata, ...newValues };
} }
function callPopup(text, type) { function callPopup(text, type) {
@ -3035,7 +3035,7 @@ function closeMessageEditor() {
function setGenerationProgress(progress) { function setGenerationProgress(progress) {
if (!progress) { if (!progress) {
$('#send_textarea').css({'background': '', 'transition': ''}); $('#send_textarea').css({ 'background': '', 'transition': '' });
} }
else { else {
$('#send_textarea').css({ $('#send_textarea').css({
@ -3090,7 +3090,7 @@ $(document).ready(function () {
///// SWIPE BUTTON CLICKS /////// ///// SWIPE BUTTON CLICKS ///////
$(document).on('click', '.swipe_right', function () { //when we click swipe right button $(document).on('click', '.swipe_right', function () { //when we click swipe right button
if (chat.length -1 === Number(this_edit_mes_id)) { if (chat.length - 1 === Number(this_edit_mes_id)) {
closeMessageEditor(); closeMessageEditor();
} }
@ -3230,7 +3230,7 @@ $(document).ready(function () {
}); });
$(document).on('click', '.swipe_left', function () { // when we swipe left..but no generation. $(document).on('click', '.swipe_left', function () { // when we swipe left..but no generation.
if (chat.length -1 === Number(this_edit_mes_id)) { if (chat.length - 1 === Number(this_edit_mes_id)) {
closeMessageEditor(); closeMessageEditor();
} }
@ -4295,7 +4295,7 @@ $(document).ready(function () {
this_edit_mes_id = undefined; this_edit_mes_id = undefined;
}); });
$(document).on("click", ".mes_edit_up", function() { $(document).on("click", ".mes_edit_up", function () {
if (is_send_press || this_edit_mes_id <= 0) { if (is_send_press || this_edit_mes_id <= 0) {
return; return;
} }
@ -4652,7 +4652,7 @@ $(document).ready(function () {
$(this).closest('.inline-drawer').find('.inline-drawer-content').slideToggle(); $(this).closest('.inline-drawer').find('.inline-drawer-content').slideToggle();
}); });
$(document).keyup(function(e) { $(document).keyup(function (e) {
if (e.key === "Escape") { if (e.key === "Escape") {
closeMessageEditor(); closeMessageEditor();
} }

61
public/style.css
View File

@ -33,7 +33,7 @@
--greyCAIbg: rgb(36, 36, 37); --greyCAIbg: rgb(36, 36, 37);
--ivory: rgb(220, 220, 210); --ivory: rgb(220, 220, 210);
--sheldWidth: 800px; --sheldWidth: 1000px;
} }
* { * {
@ -1043,9 +1043,10 @@ input[type=search]:focus::-webkit-search-cancel-button {
display: flex; display: flex;
flex: 1; flex: 1;
grid-template-columns: repeat(3, min-content); grid-template-columns: repeat(3, min-content);
grid-gap: 20px; grid-gap: 10px;
align-items: center; align-items: center;
justify-content: end; justify-content: end;
flex-wrap: wrap;
} }
#rm_info_block { #rm_info_block {
@ -1084,7 +1085,6 @@ input[type=search]:focus::-webkit-search-cancel-button {
} }
#result_info { #result_info {
margin-left: 10px;
color: var(--white30a); color: var(--white30a);
display: flex; display: flex;
} }
@ -1184,17 +1184,17 @@ input[type=search]:focus::-webkit-search-cancel-button {
.menu_button { .menu_button {
font-weight: bold; /* font-weight: bold; */
color: var(--white70); color: var(--white70);
background-color: var(--black50a); background-color: var(--black50a);
border: 1px solid var(--white30a); border: 1px solid var(--white30a);
border-radius: 10px; border-radius: 10px;
padding: 10px; padding: 5px;
width: min-content; width: min-content;
cursor: pointer; cursor: pointer;
margin: 10px 0; margin: 10px 0;
transition: 0.3s; transition: 0.3s;
font-size: 15px; /* font-size: 15px; */
} }
.menu_button:hover { .menu_button:hover {
@ -1671,10 +1671,12 @@ input[type='checkbox']:not(#nav-toggle):not(#rm_button_panel_pin):checked::after
.range-block-counter { .range-block-counter {
width: max-content; width: max-content;
display: block;
max-width: 100%;
position: relative; position: relative;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
margin-top: 10px; /* margin-top: 10px; */
font-size: 11px; font-size: 11px;
color: var(--white50a); color: var(--white50a);
} }
@ -1899,7 +1901,7 @@ input[type="range"]::-webkit-slider-thumb {
.checkbox_label { .checkbox_label {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
column-gap: 10px; column-gap: 5px;
align-items: center; align-items: center;
} }
@ -2200,6 +2202,7 @@ input[type="range"]::-webkit-slider-thumb {
width: 100%; width: 100%;
align-items: center; align-items: center;
column-gap: 10px; column-gap: 10px;
flex-wrap: wrap;
} }
.rm_group_settings { .rm_group_settings {
@ -2235,6 +2238,9 @@ input[type="range"]::-webkit-slider-thumb {
overflow: auto; overflow: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
border: 1px solid grey;
border-radius: 10px;
background-color: var(--black30a);
} }
#rm_group_buttons_expander { #rm_group_buttons_expander {
@ -2624,10 +2630,10 @@ a {
left: auto; left: auto;
padding: 0 10px; padding: 0 10px;
backdrop-filter: blur(10px); backdrop-filter: blur(10px);
background-color: var(--black60a); background-color: var(--black50a);
-webkit-backdrop-filter: blur(10px); -webkit-backdrop-filter: blur(10px);
z-index: 3000; z-index: 3000;
white-space: nowrap; /* white-space: nowrap; */
border: 0; border: 0;
border-left: 1px solid var(--grey30a); border-left: 1px solid var(--grey30a);
border-bottom: 1px solid var(--grey30a); border-bottom: 1px solid var(--grey30a);
@ -2918,6 +2924,8 @@ label[for="extensions_autoconnect"] {
display: none; display: none;
} }
.drawer-content { .drawer-content {
background-color: var(--black50a); background-color: var(--black50a);
color: white; color: white;
@ -2939,6 +2947,28 @@ label[for="extensions_autoconnect"] {
-webkit-backdrop-filter: blur(20px); -webkit-backdrop-filter: blur(20px);
} }
.fillRight, .fillLeft {
min-width: unset;
}
.fillLeft{
max-width: calc((100vw - var(--sheldWidth) - 2px) /2);
max-height: calc(100vh - 55px);
height: calc(100vh - 55px);
position: fixed;
top: 40px;
margin: 0;
left: 0;
right: auto;
padding: 0 10px;
border-radius: 0 0 20px 0;
box-shadow: none;
}
.width100p {
width:100%;
}
.drawer-content .text_pole { .drawer-content .text_pole {
width: 100%; width: 100%;
} }
@ -2949,13 +2979,20 @@ label[for="extensions_autoconnect"] {
.flex-container { .flex-container {
display: flex; display: flex;
gap: 20px; gap: 10px;
flex-wrap: wrap;
} }
.flexWide50p { .flexWide50p {
flex: 50%; flex: 50%;
} }
.justifyLeft {
text-align: start;
justify-content: left;
margin-left: unset;
}
.widthFreeExpand { .widthFreeExpand {
width: unset; width: unset;
} }
@ -2964,6 +3001,7 @@ label[for="extensions_autoconnect"] {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
column-gap: 10px; column-gap: 10px;
flex-wrap: wrap;
} }
#openai_api-presets>div { #openai_api-presets>div {
@ -3032,6 +3070,7 @@ label[for="extensions_autoconnect"] {
display: flex; display: flex;
justify-content: space-evenly; justify-content: space-evenly;
flex-direction: row; flex-direction: row;
flex-wrap: wrap;
} }
/* ---------- @media queries must always go at the bottom ------------*/ /* ---------- @media queries must always go at the bottom ------------*/