From c3a253baf3b7d7405f9ef51b6c20ad996ffb8684 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 28 Aug 2024 21:08:32 +0300
Subject: [PATCH] Persona: add None position, fix double insert on In-chat
 position

---
 public/index.html            | 1 +
 public/script.js             | 6 +++---
 public/scripts/power-user.js | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index 8192e92fa..f883bd5b2 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4553,6 +4553,7 @@
                                 <div data-newbie-hidden>
                                     <label for="persona_description_position" data-i18n="Position:">Position:</label>
                                     <select id="persona_description_position">
+                                        <option value="9" data-i18n="None (disabled)">None (disabled)</option>
                                         <option value="0" data-i18n="In Story String / Prompt Manager">In Story String / Prompt Manager</option>
                                         <option value="2" data-i18n="Top of Author's Note">Top of Author's Note</option>
                                         <option value="3" data-i18n="Bottom of Author's Note">Bottom of Author's Note</option>
diff --git a/public/script.js b/public/script.js
index 25ab3bcba..7d8ece1e8 100644
--- a/public/script.js
+++ b/public/script.js
@@ -2705,7 +2705,7 @@ function addPersonaDescriptionExtensionPrompt() {
     const INJECT_TAG = 'PERSONA_DESCRIPTION';
     setExtensionPrompt(INJECT_TAG, '', extension_prompt_types.IN_PROMPT, 0);
 
-    if (!power_user.persona_description) {
+    if (!power_user.persona_description || power_user.persona_description_position === persona_description_positions.NONE) {
         return;
     }
 
@@ -3726,7 +3726,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
     const storyStringParams = {
         description: description,
         personality: personality,
-        persona: persona,
+        persona: power_user.persona_description_position == persona_description_positions.IN_PROMPT ? persona : '',
         scenario: scenario,
         system: isInstruct ? system : '',
         char: name2,
@@ -4302,7 +4302,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
             padding: power_user.token_padding,
             main_api: main_api,
             instruction: isInstruct ? substituteParams(power_user.prefer_character_prompt && system ? system : power_user.instruct.system_prompt) : '',
-            userPersona: (power_user.persona_description || ''),
+            userPersona: (power_user.persona_description_position == persona_description_positions.IN_PROMPT ? (persona || '') : ''),
         };
 
         //console.log(additionalPromptStuff);
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 855f8b649..c3b3d8f20 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -107,6 +107,7 @@ export const persona_description_positions = {
     TOP_AN: 2,
     BOTTOM_AN: 3,
     AT_DEPTH: 4,
+    NONE: 9,
 };
 
 let power_user = {