Merge pull request #3448 from SillyTavern/compact-reasoning-settings Update layout of Reasoning settings block

b2bd73fa780154c675eafe40879547397d8dcfa8

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed
Parents: a2cfcd4ca64c2a4213cc892a9b39a9b069c6c5b0 6e4a51b37f630df9964f073f487f016a4e682c86
17 files changed, +41 -30Showing whitespace changes
public/index.html+24 -15
@@ -3749,8 +3749,8 @@
3749 </div>3749 </div>
3750 <label class="checkbox_label" for="custom_stopping_strings_macro">3750 <label class="checkbox_label" for="custom_stopping_strings_macro">
3751 <input id="custom_stopping_strings_macro" type="checkbox" checked>3751 <input id="custom_stopping_strings_macro" type="checkbox" checked>
3752 <small data-i18n="Replace Macro in Custom Stopping Strings">3752 <small data-i18n="Replace Macro in Stop Strings">
3753 Replace Macro in Custom Stopping Strings3753 Replace Macro in Stop Strings
3754 </small>3754 </small>
3755 </label>3755 </label>
3756 </div>3756 </div>
@@ -3797,24 +3797,36 @@
3797 <span data-i18n="Reasoning">Reasoning</span>3797 <span data-i18n="Reasoning">Reasoning</span>
3798 </h4>3798 </h4>
3799 <div>3799 <div>
3800 <label class="checkbox_label" for="reasoning_auto_parse" title="Automatically parse reasoning blocks from main content between the reasoning prefix/suffix. Both fields must be defined and non-empty." data-i18n="[title]reasoning_auto_parse">3800 <div class="flex-container alignItemsBaseline">
3801 <label class="checkbox_label flex1" for="reasoning_auto_parse" title="Automatically parse reasoning blocks from main content between the reasoning prefix/suffix. Both fields must be defined and non-empty." data-i18n="[title]reasoning_auto_parse">
3801 <input id="reasoning_auto_parse" type="checkbox" />3802 <input id="reasoning_auto_parse" type="checkbox" />
3802 <small data-i18n="Auto-Parse Reasoning">3803 <small data-i18n="Auto-Parse">
3803 Auto-Parse Reasoning3804 Auto-Parse
3804 </small>3805 </small>
3805 </label>3806 </label>
3806 <label class="checkbox_label" for="reasoning_auto_expand" title="Automatically expand reasoning blocks." data-i18n="[title]reasoning_auto_expand">3807 <label class="checkbox_label flex1" for="reasoning_auto_expand" title="Automatically expand reasoning blocks." data-i18n="[title]reasoning_auto_expand">
3807 <input id="reasoning_auto_expand" type="checkbox" />3808 <input id="reasoning_auto_expand" type="checkbox" />
3808 <small data-i18n="Auto-Expand Reasoning">3809 <small data-i18n="Auto-Expand">
3809 Auto-Expand Reasoning3810 Auto-Expand
3810 </small>3811 </small>
3811 </label>3812 </label>
3812 <label class="checkbox_label" for="reasoning_add_to_prompts" title="Add existing reasoning blocks to prompts. To add a new reasoning block, use the message edit menu." data-i18n="[title]reasoning_add_to_prompts">3813 </div>
3814 <div class="flex-container alignItemsBaseline">
3815 <label class="checkbox_label flex1" for="reasoning_add_to_prompts" title="Add existing reasoning blocks to prompts. To add a new reasoning block, use the message edit menu." data-i18n="[title]reasoning_add_to_prompts">
3813 <input id="reasoning_add_to_prompts" type="checkbox" />3816 <input id="reasoning_add_to_prompts" type="checkbox" />
3814 <small data-i18n="Add Reasoning to Prompts">3817 <small data-i18n="Add to Prompts">
3815 Add Reasoning to Prompts3818 Add to Prompts
3816 </small>3819 </small>
3817 </label>3820 </label>
3821 <div class="flex1 flex-container alignItemsBaseline" title="Maximum number of reasoning blocks to be added per prompt, counting from the last message." data-i18n="[title]reasoning_max_additions">
3822 <input id="reasoning_max_additions" class="text_pole textarea_compact widthUnset" type="number" min="0" max="999"></textarea>
3823 <small data-i18n="Max">Max</small>
3824 </div>
3825 </div>
3826 <details>
3827 <summary data-i18n="Reasoning Formatting">
3828 Reasoning Formatting
3829 </summary>
3818 <div class="flex-container">3830 <div class="flex-container">
3819 <div class="flex1" title="Inserted before the reasoning content." data-i18n="[title]reasoning_prefix">3831 <div class="flex1" title="Inserted before the reasoning content." data-i18n="[title]reasoning_prefix">
3820 <small data-i18n="Prefix">Prefix</small>3832 <small data-i18n="Prefix">Prefix</small>
@@ -3830,11 +3842,8 @@
3830 <small data-i18n="Separator">Separator</small>3842 <small data-i18n="Separator">Separator</small>
3831 <textarea id="reasoning_separator" class="text_pole textarea_compact autoSetHeight"></textarea>3843 <textarea id="reasoning_separator" class="text_pole textarea_compact autoSetHeight"></textarea>
3832 </div>3844 </div>
3833 <div class="flex1" title="Maximum number of reasoning blocks to be added per prompt, counting from the last message." data-i18n="[title]reasoning_max_additions">
3834 <small data-i18n="Max Additions">Max Additions</small>
3835 <input id="reasoning_max_additions" class="text_pole textarea_compact" type="number" min="0" max="999"></textarea>
3836 </div>
3837 </div>3845 </div>
3846 </details>
3838 </div>3847 </div>
3839 </div>3848 </div>
3840 <div>3849 <div>
public/locales/ar-sa.json+1 -1
@@ -482,7 +482,7 @@
482 "separate with commas w/o space between": "فصل بفواصل دون مسافة بينها",482 "separate with commas w/o space between": "فصل بفواصل دون مسافة بينها",
483 "Custom Stopping Strings": "سلاسل توقف مخصصة",483 "Custom Stopping Strings": "سلاسل توقف مخصصة",
484 "JSON serialized array of strings": "مصفوفة سلسلة JSON متسلسلة",484 "JSON serialized array of strings": "مصفوفة سلسلة JSON متسلسلة",
485 "Replace Macro in Custom Stopping Strings": "استبدال الماكرو في سلاسل التوقف المخصصة",485 "Replace Macro in Stop Strings": "استبدال الماكرو في سلاسل التوقف المخصصة",
486 "Auto-Continue": "المتابعة التلقائية",486 "Auto-Continue": "المتابعة التلقائية",
487 "Allow for Chat Completion APIs": "السماح بواجهات برمجة التطبيقات لإكمال الدردشة",487 "Allow for Chat Completion APIs": "السماح بواجهات برمجة التطبيقات لإكمال الدردشة",
488 "Target length (tokens)": "الطول المستهدف (رموز)",488 "Target length (tokens)": "الطول المستهدف (رموز)",
public/locales/de-de.json+1 -1
@@ -482,7 +482,7 @@
482 "separate with commas w/o space between": "getrennt durch Kommas ohne Leerzeichen dazwischen",482 "separate with commas w/o space between": "getrennt durch Kommas ohne Leerzeichen dazwischen",
483 "Custom Stopping Strings": "Benutzerdefinierte Stoppzeichenfolgen",483 "Custom Stopping Strings": "Benutzerdefinierte Stoppzeichenfolgen",
484 "JSON serialized array of strings": "JSON serialisierte Reihe von Zeichenfolgen",484 "JSON serialized array of strings": "JSON serialisierte Reihe von Zeichenfolgen",
485 "Replace Macro in Custom Stopping Strings": "Makro in benutzerdefinierten Stoppzeichenfolgen ersetzen",485 "Replace Macro in Stop Strings": "Makro in benutzerdefinierten Stoppzeichenfolgen ersetzen",
486 "Auto-Continue": "Automatisch fortsetzen",486 "Auto-Continue": "Automatisch fortsetzen",
487 "Allow for Chat Completion APIs": "Erlaube Chat-Vervollständigungs-APIs",487 "Allow for Chat Completion APIs": "Erlaube Chat-Vervollständigungs-APIs",
488 "Target length (tokens)": "Ziel-Länge (Tokens)",488 "Target length (tokens)": "Ziel-Länge (Tokens)",
public/locales/es-es.json+1 -1
@@ -482,7 +482,7 @@
482 "separate with commas w/o space between": "separe con comas sin espacio entre ellas",482 "separate with commas w/o space between": "separe con comas sin espacio entre ellas",
483 "Custom Stopping Strings": "Cadenas de Detención Personalizadas",483 "Custom Stopping Strings": "Cadenas de Detención Personalizadas",
484 "JSON serialized array of strings": "Arreglo de cadenas serializado en JSON",484 "JSON serialized array of strings": "Arreglo de cadenas serializado en JSON",
485 "Replace Macro in Custom Stopping Strings": "Reemplazar macro en Cadenas de Detención Personalizadas",485 "Replace Macro in Stop Strings": "Reemplazar macro en Cadenas de Detención Personalizadas",
486 "Auto-Continue": "Autocontinuar",486 "Auto-Continue": "Autocontinuar",
487 "Allow for Chat Completion APIs": "Permitir para APIs de Completado de Chat",487 "Allow for Chat Completion APIs": "Permitir para APIs de Completado de Chat",
488 "Target length (tokens)": "Longitud objetivo (tokens)",488 "Target length (tokens)": "Longitud objetivo (tokens)",
public/locales/fr-fr.json+1 -1
@@ -434,7 +434,7 @@
434 "Non-markdown strings": "Chaînes non Markdown",434 "Non-markdown strings": "Chaînes non Markdown",
435 "Custom Stopping Strings": "Chaînes d'arrêt personnalisées",435 "Custom Stopping Strings": "Chaînes d'arrêt personnalisées",
436 "JSON serialized array of strings": "Tableau de chaînes sérialisé JSON",436 "JSON serialized array of strings": "Tableau de chaînes sérialisé JSON",
437 "Replace Macro in Custom Stopping Strings": "Remplacer les macro dans les chaînes d'arrêt personnalisées",437 "Replace Macro in Stop Strings": "Remplacer les macro dans les chaînes d'arrêt personnalisées",
438 "Auto-Continue": "Auto-Continue",438 "Auto-Continue": "Auto-Continue",
439 "Allow for Chat Completion APIs": "Autoriser les APIs de complétion de chat",439 "Allow for Chat Completion APIs": "Autoriser les APIs de complétion de chat",
440 "Target length (tokens)": "Longueur cible (tokens)",440 "Target length (tokens)": "Longueur cible (tokens)",
public/locales/is-is.json+1 -1
@@ -482,7 +482,7 @@
482 "separate with commas w/o space between": "aðskilið með kommum án bila milli",482 "separate with commas w/o space between": "aðskilið með kommum án bila milli",
483 "Custom Stopping Strings": "Eigin stopp-strengir",483 "Custom Stopping Strings": "Eigin stopp-strengir",
484 "JSON serialized array of strings": "JSON raðað fylki af strengjum",484 "JSON serialized array of strings": "JSON raðað fylki af strengjum",
485 "Replace Macro in Custom Stopping Strings": "Skiptu út í macro í sérsniðnum stoppa strengjum",485 "Replace Macro in Stop Strings": "Skiptu út í macro í sérsniðnum stoppa strengjum",
486 "Auto-Continue": "Sjálfvirk Forná",486 "Auto-Continue": "Sjálfvirk Forná",
487 "Allow for Chat Completion APIs": "Leyfa fyrir spjall Loka APIs",487 "Allow for Chat Completion APIs": "Leyfa fyrir spjall Loka APIs",
488 "Target length (tokens)": "Markaðarlengd (texti)",488 "Target length (tokens)": "Markaðarlengd (texti)",
public/locales/it-it.json+1 -1
@@ -482,7 +482,7 @@
482 "separate with commas w/o space between": "separati con virgole senza spazio tra loro",482 "separate with commas w/o space between": "separati con virgole senza spazio tra loro",
483 "Custom Stopping Strings": "Stringhe di Stop Personalizzate",483 "Custom Stopping Strings": "Stringhe di Stop Personalizzate",
484 "JSON serialized array of strings": "Matrice serializzata JSON di stringhe",484 "JSON serialized array of strings": "Matrice serializzata JSON di stringhe",
485 "Replace Macro in Custom Stopping Strings": "Sostituisci Macro in Stringhe di Arresto Personalizzate",485 "Replace Macro in Stop Strings": "Sostituisci Macro in Stringhe di Arresto Personalizzate",
486 "Auto-Continue": "Auto-continua",486 "Auto-Continue": "Auto-continua",
487 "Allow for Chat Completion APIs": "Consenti per API di completamento chat",487 "Allow for Chat Completion APIs": "Consenti per API di completamento chat",
488 "Target length (tokens)": "Lunghezza obiettivo (token)",488 "Target length (tokens)": "Lunghezza obiettivo (token)",
public/locales/ja-jp.json+1 -1
@@ -482,7 +482,7 @@
482 "separate with commas w/o space between": "間にスペースのないカンマで区切ります",482 "separate with commas w/o space between": "間にスペースのないカンマで区切ります",
483 "Custom Stopping Strings": "カスタム停止文字列",483 "Custom Stopping Strings": "カスタム停止文字列",
484 "JSON serialized array of strings": "文字列のJSONシリアル化配列",484 "JSON serialized array of strings": "文字列のJSONシリアル化配列",
485 "Replace Macro in Custom Stopping Strings": "カスタム停止文字列内のマクロを置換する",485 "Replace Macro in Stop Strings": "カスタム停止文字列内のマクロを置換する",
486 "Auto-Continue": "自動継続",486 "Auto-Continue": "自動継続",
487 "Allow for Chat Completion APIs": "チャット補完APIを許可",487 "Allow for Chat Completion APIs": "チャット補完APIを許可",
488 "Target length (tokens)": "ターゲット長さ（トークン）",488 "Target length (tokens)": "ターゲット長さ（トークン）",
public/locales/ko-kr.json+1 -1
@@ -492,7 +492,7 @@
492 "separate with commas w/o space between": "쉼표로 구분 (공백 없이)",492 "separate with commas w/o space between": "쉼표로 구분 (공백 없이)",
493 "Custom Stopping Strings": "사용자 정의 중지 문자열",493 "Custom Stopping Strings": "사용자 정의 중지 문자열",
494 "JSON serialized array of strings": "문자열의 JSON 직렬화된 배열",494 "JSON serialized array of strings": "문자열의 JSON 직렬화된 배열",
495 "Replace Macro in Custom Stopping Strings": "사용자 정의 중단 문자열에서 매크로 교체",495 "Replace Macro in Stop Strings": "사용자 정의 중단 문자열에서 매크로 교체",
496 "Auto-Continue": "자동 계속하기",496 "Auto-Continue": "자동 계속하기",
497 "Allow for Chat Completion APIs": "채팅 완성 API 허용",497 "Allow for Chat Completion APIs": "채팅 완성 API 허용",
498 "Target length (tokens)": "대상 길이 (토큰)",498 "Target length (tokens)": "대상 길이 (토큰)",
public/locales/nl-nl.json+1 -1
@@ -482,7 +482,7 @@
482 "separate with commas w/o space between": "gescheiden met komma's zonder spatie ertussen",482 "separate with commas w/o space between": "gescheiden met komma's zonder spatie ertussen",
483 "Custom Stopping Strings": "Aangepaste Stopreeksen",483 "Custom Stopping Strings": "Aangepaste Stopreeksen",
484 "JSON serialized array of strings": "JSON geserialiseerde reeks van strings",484 "JSON serialized array of strings": "JSON geserialiseerde reeks van strings",
485 "Replace Macro in Custom Stopping Strings": "Macro vervangen in aangepaste stopreeksen",485 "Replace Macro in Stop Strings": "Macro vervangen in aangepaste stopreeksen",
486 "Auto-Continue": "Automatisch doorgaan",486 "Auto-Continue": "Automatisch doorgaan",
487 "Allow for Chat Completion APIs": "Chatvervolledigings-API's toestaan",487 "Allow for Chat Completion APIs": "Chatvervolledigings-API's toestaan",
488 "Target length (tokens)": "Doellengte (tokens)",488 "Target length (tokens)": "Doellengte (tokens)",
public/locales/pt-pt.json+1 -1
@@ -482,7 +482,7 @@
482 "separate with commas w/o space between": "separe com vírgulas sem espaço entre",482 "separate with commas w/o space between": "separe com vírgulas sem espaço entre",
483 "Custom Stopping Strings": "Cadeias de parada personalizadas",483 "Custom Stopping Strings": "Cadeias de parada personalizadas",
484 "JSON serialized array of strings": "Matriz de strings serializada em JSON",484 "JSON serialized array of strings": "Matriz de strings serializada em JSON",
485 "Replace Macro in Custom Stopping Strings": "Substituir Macro em Strings de Parada Personalizadas",485 "Replace Macro in Stop Strings": "Substituir Macro em Strings de Parada Personalizadas",
486 "Auto-Continue": "Auto-Continuar",486 "Auto-Continue": "Auto-Continuar",
487 "Allow for Chat Completion APIs": "Permitir APIs de Completar Chat",487 "Allow for Chat Completion APIs": "Permitir APIs de Completar Chat",
488 "Target length (tokens)": "Comprimento alvo (tokens)",488 "Target length (tokens)": "Comprimento alvo (tokens)",
public/locales/ru-ru.json+1 -1
@@ -161,7 +161,7 @@
161 "View hidden API keys": "Посмотреть скрытые API-ключи",161 "View hidden API keys": "Посмотреть скрытые API-ключи",
162 "Advanced Formatting": "Расширенное форматирование",162 "Advanced Formatting": "Расширенное форматирование",
163 "Context Template": "Шаблон контекста",163 "Context Template": "Шаблон контекста",
164 "Replace Macro in Custom Stopping Strings": "Заменять макросы в пользовательских стоп-строках",164 "Replace Macro in Stop Strings": "Заменять макросы в пользовательских стоп-строках",
165 "Story String": "Строка истории",165 "Story String": "Строка истории",
166 "Example Separator": "Разделитель примеров сообщений",166 "Example Separator": "Разделитель примеров сообщений",
167 "Chat Start": "Начало чата",167 "Chat Start": "Начало чата",
public/locales/uk-ua.json+1 -1
@@ -482,7 +482,7 @@
482 "separate with commas w/o space between": "розділяйте комами без пропусків між ними",482 "separate with commas w/o space between": "розділяйте комами без пропусків між ними",
483 "Custom Stopping Strings": "Власні рядки зупинки",483 "Custom Stopping Strings": "Власні рядки зупинки",
484 "JSON serialized array of strings": "JSON-серіалізований масив рядків",484 "JSON serialized array of strings": "JSON-серіалізований масив рядків",
485 "Replace Macro in Custom Stopping Strings": "Замінювати макроси у власних рядках зупинки",485 "Replace Macro in Stop Strings": "Замінювати макроси у власних рядках зупинки",
486 "Auto-Continue": "Автоматичне продовження",486 "Auto-Continue": "Автоматичне продовження",
487 "Allow for Chat Completion APIs": "Дозволити для Chat Completion API",487 "Allow for Chat Completion APIs": "Дозволити для Chat Completion API",
488 "Target length (tokens)": "Цільова довжина (токени)",488 "Target length (tokens)": "Цільова довжина (токени)",
public/locales/vi-vn.json+1 -1
@@ -482,7 +482,7 @@
482 "separate with commas w/o space between": "phân tách bằng dấu phẩy không có khoảng trắng giữa",482 "separate with commas w/o space between": "phân tách bằng dấu phẩy không có khoảng trắng giữa",
483 "Custom Stopping Strings": "Chuỗi dừng tùy chỉnh",483 "Custom Stopping Strings": "Chuỗi dừng tùy chỉnh",
484 "JSON serialized array of strings": "Mảng chuỗi được tuần tự hóa JSON",484 "JSON serialized array of strings": "Mảng chuỗi được tuần tự hóa JSON",
485 "Replace Macro in Custom Stopping Strings": "Thay thế Macro trong Chuỗi Dừng Tùy chỉnh",485 "Replace Macro in Stop Strings": "Thay thế Macro trong Chuỗi Dừng Tùy chỉnh",
486 "Auto-Continue": "Tự động Tiếp tục",486 "Auto-Continue": "Tự động Tiếp tục",
487 "Allow for Chat Completion APIs": "Cho phép các API hoàn thành Trò chuyện",487 "Allow for Chat Completion APIs": "Cho phép các API hoàn thành Trò chuyện",
488 "Target length (tokens)": "Độ dài mục tiêu (token)",488 "Target length (tokens)": "Độ dài mục tiêu (token)",
public/locales/zh-cn.json+1 -1
@@ -559,7 +559,7 @@
559 "Prompt Content": "提示词内容",559 "Prompt Content": "提示词内容",
560 "Custom Stopping Strings": "自定义停止字符串",560 "Custom Stopping Strings": "自定义停止字符串",
561 "JSON serialized array of strings": "JSON序列化的字符串数组",561 "JSON serialized array of strings": "JSON序列化的字符串数组",
562 "Replace Macro in Custom Stopping Strings": "替换自定义停止字符串中的宏",562 "Replace Macro in Stop Strings": "替换自定义停止字符串中的宏",
563 "Token Padding": "词符填充",563 "Token Padding": "词符填充",
564 "Miscellaneous": "杂项",564 "Miscellaneous": "杂项",
565 "Non-markdown strings": "非 Markdown 字符串",565 "Non-markdown strings": "非 Markdown 字符串",
public/locales/zh-tw.json+1 -1
@@ -483,7 +483,7 @@
483 "separate with commas w/o space between": "用逗號分隔，之間無空格",483 "separate with commas w/o space between": "用逗號分隔，之間無空格",
484 "Custom Stopping Strings": "自訂停止字串",484 "Custom Stopping Strings": "自訂停止字串",
485 "JSON serialized array of strings": "JSON 序列化字串數組",485 "JSON serialized array of strings": "JSON 序列化字串數組",
486 "Replace Macro in Custom Stopping Strings": "取代自訂停止字串中的巨集",486 "Replace Macro in Stop Strings": "取代自訂停止字串中的巨集",
487 "Auto-Continue": "自動繼續",487 "Auto-Continue": "自動繼續",
488 "Allow for Chat Completion APIs": "允許聊天補全 API",488 "Allow for Chat Completion APIs": "允許聊天補全 API",
489 "Target length (tokens)": "目標長度（符元）",489 "Target length (tokens)": "目標長度（符元）",
public/style.css+2 -0
@@ -5746,11 +5746,13 @@ body:not(.movingUI) .drawer-content.maximized {
5746 overflow-wrap: anywhere;5746 overflow-wrap: anywhere;
5747}5747}
57485748
5749#SystemPromptColumn summary,
5749#InstructSequencesColumn summary {5750#InstructSequencesColumn summary {
5750 font-size: 0.95em;5751 font-size: 0.95em;
5751 cursor: pointer;5752 cursor: pointer;
5752}5753}
57535754
5755#SystemPromptColumn details,
5754#InstructSequencesColumn details:not(:last-of-type) {5756#InstructSequencesColumn details:not(:last-of-type) {
5755 margin-bottom: 5px;5757 margin-bottom: 5px;
5756}5758}