From 7e1e3ecc61ee316268d590e6d35a8e99a6fe0f29 Mon Sep 17 00:00:00 2001
From: kwaroran <amasio1234@proton.me>
Date: Mon, 27 May 2024 10:51:28 +0900
Subject: [PATCH] refactor: Make custom chain of thought prompt option
 unrecommended

---
 src/lang/en.ts                              |  1 +
 src/lib/Setting/Pages/PromptSettings.svelte | 11 +++++++----
 src/ts/process/index.ts                     |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/lang/en.ts b/src/lang/en.ts
index 686c2a07..4ee40097 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -126,6 +126,7 @@ export const languageEnglish = {
         dynamicAssetsEditDisplay: "If enabled, the dynamic assets will be applied to the Modify Display stage too. however, this can cause performance issues.",
         nickname: "Nickname would used be in {{char}} or <char> in chat instead of character's name if it is set.",
         useRegexLorebook: "If enabled, it will use regex for lorebook search, instead of string matching. it uses /regex/flags format.",
+        customChainOfThought: "If enabled, it will use custom chain of thought prompt instead of default one if chain of thought prompt is enabled. Warning: chain of thought toggle is no longer recommended to use. put chain of thought prompt in other prompt entries instead.",
     },
     setup: {
         chooseProvider: "Choose AI Provider",
diff --git a/src/lib/Setting/Pages/PromptSettings.svelte b/src/lib/Setting/Pages/PromptSettings.svelte
index 0f5aa557..3bd99242 100644
--- a/src/lib/Setting/Pages/PromptSettings.svelte
+++ b/src/lib/Setting/Pages/PromptSettings.svelte
@@ -8,6 +8,7 @@
     import Check from "src/lib/UI/GUI/CheckInput.svelte";
     import TextInput from "src/lib/UI/GUI/TextInput.svelte";
     import NumberInput from "src/lib/UI/GUI/NumberInput.svelte";
+  import Help from "src/lib/Others/Help.svelte";
 
     let sorted = 0
     let opened = 0
@@ -109,9 +110,11 @@
     <Check bind:check={$DataBase.promptSettings.sendChatAsSystem} name={language.sendChatAsSystem} className="mt-4"/>
     <Check bind:check={$DataBase.promptSettings.sendName} name={language.sendName} className="mt-4"/>
     <Check bind:check={$DataBase.promptSettings.utilOverride} name={language.utilOverride} className="mt-4"/>
-    <Check bind:check={$DataBase.promptSettings.customChainOfThought} name={language.customChainOfThought} className="mt-4"/>
-    {#if $DataBase.promptSettings.customChainOfThought}
-        <span class="text-textcolor mt-4">{language.maxThoughtTagDepth}</span>
-        <NumberInput bind:value={$DataBase.promptSettings.maxThoughtTagDepth}/>
+    {#if $DataBase.showUnrecommended}
+        <Check bind:check={$DataBase.promptSettings.customChainOfThought} name={language.customChainOfThought} className="mt-4">
+            <Help unrecommended key='customChainOfThought' />
+        </Check>
     {/if}
+    <span class="text-textcolor mt-4">{language.maxThoughtTagDepth}</span>
+    <NumberInput bind:value={$DataBase.promptSettings.maxThoughtTagDepth}/>
 {/if}
\ No newline at end of file
diff --git a/src/ts/process/index.ts b/src/ts/process/index.ts
index f789918b..9ca9cf85 100644
--- a/src/ts/process/index.ts
+++ b/src/ts/process/index.ts
@@ -669,7 +669,7 @@ export async function sendChat(chatProcessIndex = -1,arg:{chatAdditonalTokens?:n
             formatedChat = name + ': ' + formatedChat
             attr.push('nameAdded')
         }
-        if(usingPromptTemplate && db.promptSettings.customChainOfThought && db.promptSettings.maxThoughtTagDepth !== -1){
+        if(usingPromptTemplate && db.promptSettings.maxThoughtTagDepth !== -1){
             const depth = ms.length - index
             if(depth >= db.promptSettings.maxThoughtTagDepth){
                 formatedChat = formatedChat.replace(/<Thoughts>(.+?)<\/Thoughts>/gm, '')