CC: Add advanced formatting null settings notice (#4661)
Signed| @@ -544,3 +544,21 @@ label[for="bind_preset_to_connection"]:has(input:checked) { | |||
| 544 | #openai_settings [data-cc-toggle="false"]>.icon-unsupported { | 544 | #openai_settings [data-cc-toggle="false"]>.icon-unsupported { |
| 545 | color: var(--golden); | 545 | color: var(--golden); |
| 546 | } | 546 | } |
| 547 | |||
| 548 | #advanced-formatting-cc-notice { | ||
| 549 | display: none; | ||
| 550 | gap: 5px; | ||
| 551 | align-items: baseline; | ||
| 552 | margin: 5px 0; | ||
| 553 | padding: 5px 10px; | ||
| 554 | } | ||
| 555 | |||
| 556 | #top-settings-holder:has(#main_api option[value="openai"]:checked) #advanced-formatting-cc-notice { | ||
| 557 | display: flex; | ||
| 558 | } | ||
| 559 | |||
| 560 | #top-settings-holder:has(#main_api option[value="openai"]:checked) #AdvancedFormatting [data-cc-null] { | ||
| 561 | opacity: 0.5; | ||
| 562 | filter: grayscale(0.5); | ||
| 563 | cursor: not-allowed; | ||
| 564 | } | ||
| @@ -3779,7 +3779,7 @@ | |||
| 3779 | <span class="fa-solid fa-circle-question note-link-span"></span> | 3779 | <span class="fa-solid fa-circle-question note-link-span"></span> |
| 3780 | </a> | 3780 | </a> |
| 3781 | </h3> | 3781 | </h3> |
| 3782 | <div class="flex-container"> | 3782 | <div class="flex-container" data-cc-null> |
| 3783 | <input id="af_master_import_file" type="file" hidden accept=".json" class="displayNone"> | 3783 | <input id="af_master_import_file" type="file" hidden accept=".json" class="displayNone"> |
| 3784 | <div id="af_master_import" class="menu_button menu_button_icon" title="Import Advanced Formatting settings You can also provide legacy files for Instruct and Context templates." data-i18n="[title]Import Advanced Formatting settings"> | 3784 | <div id="af_master_import" class="menu_button menu_button_icon" title="Import Advanced Formatting settings You can also provide legacy files for Instruct and Context templates." data-i18n="[title]Import Advanced Formatting settings"> |
| 3785 | <i class="fa-solid fa-file-import"></i> | 3785 | <i class="fa-solid fa-file-import"></i> |
| @@ -3791,10 +3791,16 @@ | |||
| 3791 | </div> | 3791 | </div> |
| 3792 | </div> | 3792 | </div> |
| 3793 | </div> | 3793 | </div> |
| 3794 | <div id="advanced-formatting-cc-notice" class="info-block warning"> | ||
| 3795 | <i class="fa-solid fa-triangle-exclamation"></i> | ||
| 3796 | <span data-i18n="Grayed-out options have no effect when Chat Completion API is used."> | ||
| 3797 | Grayed-out options have no effect when Chat Completion API is used. | ||
| 3798 | </span> | ||
| 3799 | </div> | ||
| 3794 | <div class="flex-container spaceEvenly"> | 3800 | <div class="flex-container spaceEvenly"> |
| 3795 | <div id="ContextSettings" class="flex-container flexNoGap flexFlowColumn flex1"> | 3801 | <div id="ContextSettings" class="flex-container flexNoGap flexFlowColumn flex1"> |
| 3796 | <div> | 3802 | <div> |
| 3797 | <h4 class="standoutHeader title_restorable"> | 3803 | <h4 class="standoutHeader title_restorable" data-cc-null> |
| 3798 | <div> | 3804 | <div> |
| 3799 | <span data-i18n="Context Template">Context Template</span> | 3805 | <span data-i18n="Context Template">Context Template</span> |
| 3800 | </div> | 3806 | </div> |
| @@ -3805,7 +3811,7 @@ | |||
| 3805 | </label> | 3811 | </label> |
| 3806 | </div> | 3812 | </div> |
| 3807 | </h4> | 3813 | </h4> |
| 3808 | <div class="flex-container" title="Select your current Context Template" data-i18n="[title]Select your current Context Template"> | 3814 | <div class="flex-container" title="Select your current Context Template" data-i18n="[title]Select your current Context Template" data-cc-null> |
| 3809 | <select id="context_presets" data-preset-manager-for="context" class="flex1 text_pole"></select> | 3815 | <select id="context_presets" data-preset-manager-for="context" class="flex1 text_pole"></select> |
| 3810 | <div class="flex-container justifyCenter gap3px"> | 3816 | <div class="flex-container justifyCenter gap3px"> |
| 3811 | <input type="file" hidden data-preset-manager-file="context" accept=".json, .settings"> | 3817 | <input type="file" hidden data-preset-manager-file="context" accept=".json, .settings"> |
| @@ -3819,12 +3825,14 @@ | |||
| 3819 | </div> | 3825 | </div> |
| 3820 | </div> | 3826 | </div> |
| 3821 | <div> | 3827 | <div> |
| 3822 | <label for="context_story_string" class="flex-container"> | 3828 | <div data-cc-null> |
| 3823 | <small data-i18n="Story String">Story String</small> | 3829 | <label for="context_story_string" class="flex-container"> |
| 3824 | <i class="editor_maximize fa-solid fa-maximize right_menu_button" data-for="context_story_string" title="Expand the editor" data-i18n="[title]Expand the editor"></i> | 3830 | <small data-i18n="Story String">Story String</small> |
| 3825 | </label> | 3831 | <i class="editor_maximize fa-solid fa-maximize right_menu_button" data-for="context_story_string" title="Expand the editor" data-i18n="[title]Expand the editor"></i> |
| 3826 | <textarea id="context_story_string" class="text_pole textarea_compact autoSetHeight"></textarea> | 3832 | </label> |
| 3827 | <div class="flex-container flexFlowColumn"> | 3833 | <textarea id="context_story_string" class="text_pole textarea_compact autoSetHeight"></textarea> |
| 3834 | </div> | ||
| 3835 | <div class="flex-container flexFlowColumn" data-cc-null> | ||
| 3828 | <div id="context_story_string_position_block"> | 3836 | <div id="context_story_string_position_block"> |
| 3829 | <label for="context_story_string_position"> | 3837 | <label for="context_story_string_position"> |
| 3830 | <small data-i18n="Position:">Position:</small> | 3838 | <small data-i18n="Position:">Position:</small> |
| @@ -3853,7 +3861,7 @@ | |||
| 3853 | </div> | 3861 | </div> |
| 3854 | </div> | 3862 | </div> |
| 3855 | </div> | 3863 | </div> |
| 3856 | <div class="flex-container"> | 3864 | <div class="flex-container" data-cc-null> |
| 3857 | <div class="flex1"> | 3865 | <div class="flex1"> |
| 3858 | <label for="context_example_separator"> | 3866 | <label for="context_example_separator"> |
| 3859 | <small data-i18n="Example Separator">Example Separator</small> | 3867 | <small data-i18n="Example Separator">Example Separator</small> |
| @@ -3878,13 +3886,13 @@ | |||
| 3878 | </span> | 3886 | </span> |
| 3879 | </h4> | 3887 | </h4> |
| 3880 | 3888 | ||
| 3881 | <label class="checkbox_label" for="always-force-name2-checkbox"> | 3889 | <label class="checkbox_label" for="always-force-name2-checkbox" data-cc-null> |
| 3882 | <input id="always-force-name2-checkbox" type="checkbox" /> | 3890 | <input id="always-force-name2-checkbox" type="checkbox" /> |
| 3883 | <small data-i18n="Always add character's name to prompt"> | 3891 | <small data-i18n="Always add character's name to prompt"> |
| 3884 | Always add character's name to prompt | 3892 | Always add character's name to prompt |
| 3885 | </small> | 3893 | </small> |
| 3886 | </label> | 3894 | </label> |
| 3887 | <label class="checkbox_label" for="single_line"> | 3895 | <label class="checkbox_label" for="single_line" data-cc-null> |
| 3888 | <input id="single_line" type="checkbox" /> | 3896 | <input id="single_line" type="checkbox" /> |
| 3889 | <small data-i18n="Generate only one line per request"> | 3897 | <small data-i18n="Generate only one line per request"> |
| 3890 | Generate only one line per request | 3898 | Generate only one line per request |
| @@ -3907,11 +3915,11 @@ | |||
| 3907 | Trim Incomplete Sentences | 3915 | Trim Incomplete Sentences |
| 3908 | </small> | 3916 | </small> |
| 3909 | </label> | 3917 | </label> |
| 3910 | <label class="checkbox_label" title="Add Chat Start and Example Separator to a list of stopping strings." data-i18n="[title]Add Chat Start and Example Separator to a list of stopping strings."> | 3918 | <label class="checkbox_label" title="Add Chat Start and Example Separator to a list of stopping strings." data-i18n="[title]Add Chat Start and Example Separator to a list of stopping strings." data-cc-null> |
| 3911 | <input id="context_use_stop_strings" type="checkbox" /> | 3919 | <input id="context_use_stop_strings" type="checkbox" /> |
| 3912 | <small data-i18n="Separators as Stop Strings">Separators as Stop Strings</small> | 3920 | <small data-i18n="Separators as Stop Strings">Separators as Stop Strings</small> |
| 3913 | </label> | 3921 | </label> |
| 3914 | <label class="checkbox_label" title="Add Character and User names to a list of stopping strings." data-i18n="[title]Add Character and User names to a list of stopping strings."> | 3922 | <label class="checkbox_label" title="Add Character and User names to a list of stopping strings." data-i18n="[title]Add Character and User names to a list of stopping strings." data-cc-null> |
| 3915 | <input id="context_names_as_stop_strings" type="checkbox" /> | 3923 | <input id="context_names_as_stop_strings" type="checkbox" /> |
| 3916 | <small data-i18n="Names as Stop Strings">Names as Stop Strings</small> | 3924 | <small data-i18n="Names as Stop Strings">Names as Stop Strings</small> |
| 3917 | </label> | 3925 | </label> |
| @@ -3919,7 +3927,7 @@ | |||
| 3919 | </div> | 3927 | </div> |
| 3920 | </div> | 3928 | </div> |
| 3921 | </div> | 3929 | </div> |
| 3922 | <div id="InstructSettingsColumn" class="flex-container flexNoGap flexFlowColumn flex1"> | 3930 | <div id="InstructSettingsColumn" class="flex-container flexNoGap flexFlowColumn flex1" data-cc-null> |
| 3923 | <h4 class="standoutHeader title_restorable justifySpaceBetween"> | 3931 | <h4 class="standoutHeader title_restorable justifySpaceBetween"> |
| 3924 | <div class="flex-container"> | 3932 | <div class="flex-container"> |
| 3925 | <span data-i18n="Instruct Template">Instruct Template</span> | 3933 | <span data-i18n="Instruct Template">Instruct Template</span> |
| @@ -4113,7 +4121,7 @@ | |||
| 4113 | </div> | 4121 | </div> |
| 4114 | </div> | 4122 | </div> |
| 4115 | <div id="SystemPromptColumn" class="flex-container flexNoGap flexFlowColumn flex1"> | 4123 | <div id="SystemPromptColumn" class="flex-container flexNoGap flexFlowColumn flex1"> |
| 4116 | <h4 class="standoutHeader title_restorable justifySpaceBetween"> | 4124 | <h4 class="standoutHeader title_restorable justifySpaceBetween" data-cc-null> |
| 4117 | <div class="flex-container"> | 4125 | <div class="flex-container"> |
| 4118 | <span data-i18n="System Prompt">System Prompt</span> | 4126 | <span data-i18n="System Prompt">System Prompt</span> |
| 4119 | </div> | 4127 | </div> |
| @@ -4124,7 +4132,7 @@ | |||
| 4124 | </label> | 4132 | </label> |
| 4125 | </div> | 4133 | </div> |
| 4126 | </h4> | 4134 | </h4> |
| 4127 | <div id="SystemPromptBlock" class="marginBot10"> | 4135 | <div id="SystemPromptBlock" class="marginBot10" data-cc-null> |
| 4128 | <div class="flex-container" title="Select your current System Prompt" data-i18n="[title]Select your current System Prompt"> | 4136 | <div class="flex-container" title="Select your current System Prompt" data-i18n="[title]Select your current System Prompt"> |
| 4129 | <select id="sysprompt_select" data-preset-manager-for="sysprompt" class="flex1 text_pole"></select> | 4137 | <select id="sysprompt_select" data-preset-manager-for="sysprompt" class="flex1 text_pole"></select> |
| 4130 | <div class="flex-container margin0 justifyCenter gap3px"> | 4138 | <div class="flex-container margin0 justifyCenter gap3px"> |
| @@ -4182,7 +4190,7 @@ | |||
| 4182 | </label> | 4190 | </label> |
| 4183 | </div> | 4191 | </div> |
| 4184 | 4192 | ||
| 4185 | <div name="tokenizerSettingsBlock"> | 4193 | <div name="tokenizerSettingsBlock" data-cc-null> |
| 4186 | <div name="tokenizerSelectorBlock"> | 4194 | <div name="tokenizerSelectorBlock"> |
| 4187 | <h4 class="standoutHeader"><span data-i18n="Tokenizer">Tokenizer</span> | 4195 | <h4 class="standoutHeader"><span data-i18n="Tokenizer">Tokenizer</span> |
| 4188 | <a href="https://docs.sillytavern.app/usage/prompts/tokenizer/" class="notes-link" target="_blank"> | 4196 | <a href="https://docs.sillytavern.app/usage/prompts/tokenizer/" class="notes-link" target="_blank"> |
| @@ -4295,7 +4303,7 @@ | |||
| 4295 | </div> | 4303 | </div> |
| 4296 | <div> | 4304 | <div> |
| 4297 | <h4 class="standoutHeader" data-i18n="Miscellaneous">Miscellaneous</h4> | 4305 | <h4 class="standoutHeader" data-i18n="Miscellaneous">Miscellaneous</h4> |
| 4298 | <div name="bindModelPresetBlock"> | 4306 | <div name="bindModelPresetBlock" data-cc-null> |
| 4299 | <label for="bind_model_templates" class="checkbox_label"> | 4307 | <label for="bind_model_templates" class="checkbox_label"> |
| 4300 | <input id="bind_model_templates" type="checkbox" /> | 4308 | <input id="bind_model_templates" type="checkbox" /> |
| 4301 | <small data-i18n="Bind Model to Templates">Bind Model to Templates</small> | 4309 | <small data-i18n="Bind Model to Templates">Bind Model to Templates</small> |