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

buttonify instruct header toggles, style instruct columns when disabled

Browse Source
This commit is contained in:
RossAscends
2024-09-01 19:51:30 +09:00
parent 3ed198deb7
commit 93bfe7f40b
2 changed files with 58 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
public/index.html
View File

@ -3196,7 +3196,7 @@
</div> </div>
<div id="InstructSettingsColumn" class="flex-container flexNoGap flexFlowColumn flex1"> <div id="InstructSettingsColumn" class="flex-container flexNoGap flexFlowColumn flex1">
<div name="instructSettingsBlock"> <div id="instructSettingsBlock">
<h4 class="standoutHeader title_restorable justifySpaceBetween"> <h4 class="standoutHeader title_restorable justifySpaceBetween">
<div class="flex-container"> <div class="flex-container">
<span data-i18n="Instruct Mode">Instruct Mode</span> <span data-i18n="Instruct Mode">Instruct Mode</span>
@ -3206,12 +3206,12 @@
</div> </div>
<div class="flex-container"> <div class="flex-container">
<label for="instruct_enabled" class="checkbox_label flex1"> <label for="instruct_enabled" class="checkbox_label flex1">
<input id="instruct_enabled" type="checkbox" /> <input id="instruct_enabled" type="checkbox" style="display:none;" />
<small data-i18n="Enabled"><i class="fa-solid fa-power-off"></i></small> <small data-i18n="Enabled"><i class="fa-solid fa-power-off menu_button margin0"></i></small>
</label> </label>
<label for="instruct_bind_to_context" class="checkbox_label flex1" title="If enabled, Context templates will be automatically selected based on selected Instruct template name or by preference." data-i18n="[title]instruct_bind_to_context"> <label for="instruct_bind_to_context" class="checkbox_label flex1" title="If enabled, Context templates will be automatically selected based on selected Instruct template name or by preference." data-i18n="[title]instruct_bind_to_context">
<input id="instruct_bind_to_context" type="checkbox" /> <input id="instruct_bind_to_context" type="checkbox" style="display:none;" />
<small data-i18n="Bind to Context"><i class="fa-solid fa-link"></i></small> <small data-i18n="Bind to Context"><i class="fa-solid fa-link menu_button margin0" title="If enabled, Context templates will be automatically selected based on selected Instruct template name or by preference."></i></small>
</label> </label>
</div> </div>
</h4> </h4>
@ -3266,41 +3266,43 @@
<small data-i18n="Force for Groups and Personas">Force for Groups and Personas</small> <small data-i18n="Force for Groups and Personas">Force for Groups and Personas</small>
</label> </label>
</div> </div>
<hr> </div>
<div name="tokenizerSettingsBlock"> <hr>
<div data-newbie-hidden name="tokenizerSelectorBlock"> <div name="tokenizerSettingsBlock">
<h4 class="standoutHeader"><span data-i18n="Tokenizer">Tokenizer</span> <div data-newbie-hidden name="tokenizerSelectorBlock">
<a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#tokenizer" class="notes-link" target="_blank"> <h4 class="standoutHeader"><span data-i18n="Tokenizer">Tokenizer</span>
<a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#tokenizer" class="notes-link" target="_blank">
<span class="fa-solid fa-circle-question note-link-span"></span>
</a>
</h4>
<select id="tokenizer">
<option value="99">Best match (recommended)</option>
<option value="0">None / Estimated</option>
<option value="1">GPT-2</option>
<!-- Option #2 was a legacy GPT-2/3 tokenizer -->
<option value="3">Llama 1/2</option>
<option value="12">Llama 3</option>
<option value="4">NerdStash (NovelAI Clio)</option>
<option value="5">NerdStash v2 (NovelAI Kayra)</option>
<option value="7">Mistral</option>
<option value="8">Yi</option>
<option value="11">Claude 1/2</option>
<option value="6">API (WebUI / koboldcpp)</option>
</select>
</div>
<div class="range-block flex-container flexnowrap" data-newbie-hidden name="tokenPaddingBlock">
<div class="range-block-title justifyLeft">
<small data-i18n="Token Padding" class="flex-container">Token Padding
<a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#token-padding" class="notes-link" target="_blank">
<span class="fa-solid fa-circle-question note-link-span"></span> <span class="fa-solid fa-circle-question note-link-span"></span>
</a> </a>
</h4> </small>
<select id="tokenizer">
<option value="99">Best match (recommended)</option>
<option value="0">None / Estimated</option>
<option value="1">GPT-2</option>
<!-- Option #2 was a legacy GPT-2/3 tokenizer -->
<option value="3">Llama 1/2</option>
<option value="12">Llama 3</option>
<option value="4">NerdStash (NovelAI Clio)</option>
<option value="5">NerdStash v2 (NovelAI Kayra)</option>
<option value="7">Mistral</option>
<option value="8">Yi</option>
<option value="11">Claude 1/2</option>
<option value="6">API (WebUI / koboldcpp)</option>
</select>
</div>
<div class="range-block flex-container flexnowrap" data-newbie-hidden name="tokenPaddingBlock">
<div class="range-block-title justifyLeft">
<small data-i18n="Token Padding" class="flex-container">Token Padding
<a href="https://docs.sillytavern.app/usage/core-concepts/advancedformatting/#token-padding" class="notes-link" target="_blank">
<span class="fa-solid fa-circle-question note-link-span"></span>
</a>
</small>
</div>
<input id="token_padding" class="text_pole textarea_compact" type="number" min="-2048" max="2048" />
</div> </div>
<input id="token_padding" class="text_pole textarea_compact" type="number" min="-2048" max="2048" />
</div> </div>
</div>
<div>
<h4 class="standoutHeader">Misc.</h4>
<div> <div>
<small> <small>
<span data-i18n="Non-markdown strings"> <span data-i18n="Non-markdown strings">

20
public/scripts/instruct-mode.js
View File

@ -87,8 +87,16 @@ export async function loadInstructMode(data) {
if (power_user.instruct.enabled) { if (power_user.instruct.enabled) {
$('#instruct_enabled').parent().find('i').addClass('toggleEnabled'); $('#instruct_enabled').parent().find('i').addClass('toggleEnabled');
$('#instructSettingsBlock, #InstructSequencesColumn').removeClass('disabled');
} else { } else {
$('#instruct_enabled').parent().find('i').removeClass('toggleEnabled'); $('#instruct_enabled').parent().find('i').removeClass('toggleEnabled');
$('#instructSettingsBlock, #InstructSequencesColumn').addClass('disabled');
}
if (power_user.instruct.bind_to_context) {
$('#instruct_bind_to_context').parent().find('i').addClass('toggleEnabled');
} else {
$('#instruct_bind_to_context').parent().find('i').removeClass('toggleEnabled');
} }
controls.forEach(control => { controls.forEach(control => {
@ -639,8 +647,12 @@ jQuery(() => {
//color toggle for the main switch //color toggle for the main switch
if (power_user.instruct.enabled) { if (power_user.instruct.enabled) {
$('#instruct_enabled').parent().find('i').addClass('toggleEnabled'); $('#instruct_enabled').parent().find('i').addClass('toggleEnabled');
$('#instructSettingsBlock, #InstructSequencesColumn')
.removeClass('disabled');
} else { } else {
$('#instruct_enabled').parent().find('i').removeClass('toggleEnabled'); $('#instruct_enabled').parent().find('i').removeClass('toggleEnabled');
$('#instructSettingsBlock, #InstructSequencesColumn')
.addClass('disabled');
} }
if (!power_user.instruct.bind_to_context) { if (!power_user.instruct.bind_to_context) {
@ -656,6 +668,14 @@ jQuery(() => {
} }
}); });
$('#instruct_bind_to_context').on('change', function () {
if (power_user.instruct.bind_to_context) {
$('#instruct_bind_to_context').parent().find('i').addClass('toggleEnabled');
} else {
$('#instruct_bind_to_context').parent().find('i').removeClass('toggleEnabled');
}
});
$('#instruct_presets').on('change', function () { $('#instruct_presets').on('change', function () {
const name = String($(this).find(':selected').val()); const name = String($(this).find(':selected').val());
const preset = instruct_presets.find(x => x.name === name); const preset = instruct_presets.find(x => x.name === name);