From b069ea9f55ed923c536cd5b23d6454e7e40d6b9f Mon Sep 17 00:00:00 2001
From: Grzegorz Gidel <grg.gdl@gmail.com>
Date: Wed, 19 Apr 2023 23:39:58 +0200
Subject: [PATCH 1/2] Fix extra space in the prompt before top anchor if
 personality is missing

---
 public/script.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/script.js b/public/script.js
index a61a136f6..2a06a29bd 100644
--- a/public/script.js
+++ b/public/script.js
@@ -1682,9 +1682,9 @@ async function Generate(type, automatic_trigger, force_name2) {
                         is_add_personality = true;
                         //chatString = chatString.substr(0,chatString.length-1);
                         //anchorAndPersonality = "[Genre: roleplay chat][Tone: very long messages with descriptions]";
-                        if ((anchorTop != "" || charPersonality != "") && !is_pygmalion) {
-                            if (anchorTop != "") charPersonality += ' ';
-                            item += "[" + charPersonality + anchorTop + ']\n';
+                        let personalityAndAnchor = [ charPersonality, anchorTop ].filter(x => x).join(' ');
+                        if (personalityAndAnchor && !is_pygmalion) {
+                            item += "[" + personalityAndAnchor + ']\n';
                         }
                     }
                     if (i >= arrMes.length - 1 && count_view_mes > 8 && $.trim(item).substr(0, (name1 + ":").length) == name1 + ":" && !is_pygmalion) {//For add anchor in end

From d10dc611317f00690540a20b9c26dcb3ec223084 Mon Sep 17 00:00:00 2001
From: Grzegorz Gidel <grg.gdl@gmail.com>
Date: Wed, 19 Apr 2023 21:17:42 +0200
Subject: [PATCH 2/2] Fix conjoined words and some excessive newlines around
 various parts of the prompt

---
 public/script.js | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/public/script.js b/public/script.js
index 2a06a29bd..d8b77de81 100644
--- a/public/script.js
+++ b/public/script.js
@@ -1458,21 +1458,8 @@ async function Generate(type, automatic_trigger, force_name2) {
             storyString += appendToStoryString(charPersonality, power_user.disable_personality_formatting ? '' : 'Personality: ');
             storyString += appendToStoryString(Scenario, power_user.disable_scenario_formatting ? '' : 'Scenario: ');
         } else {
-            if (charDescription !== undefined) {
-                if (charPersonality.length > 0 && !power_user.disable_personality_formatting) {
-                    charPersonality = name2 + "'s personality: " + charPersonality;
-                }
-            }
-
             storyString += appendToStoryString(charDescription, '');
-
-            if (storyString.endsWith('\n')) {
-                storyString = storyString.slice(0, -1);
-            }
-
-            if (count_view_mes < topAnchorDepth) {
-                storyString += '\n' + appendToStoryString(charPersonality, '');
-            }
+            storyString += appendToStoryString(charPersonality, power_user.disable_personality_formatting ? '' : name2 + "'s personality: ");
         }
 
         if (power_user.custom_chat_separator && power_user.custom_chat_separator.length) {
@@ -1484,9 +1471,6 @@ async function Generate(type, automatic_trigger, force_name2) {
         if (power_user.pin_examples && main_api !== 'openai') {
             for (let example of mesExamplesArray) {
                 if (!is_pygmalion) {
-                    if (!storyString.endsWith('\n')) {
-                        storyString += '\n';
-                    }
                     const replaceString = power_user.disable_examples_formatting ? '' : `This is how ${name2} should talk`;
                     example = example.replace(/<START>/i, replaceString);
                 }
@@ -1645,9 +1629,6 @@ async function Generate(type, automatic_trigger, force_name2) {
                     }
                 }
                 if (!is_pygmalion && Scenario && Scenario.length > 0) {
-                    if (!storyString.endsWith('\n')) {
-                        storyString += '\n';
-                    }
                     storyString += !power_user.disable_scenario_formatting ? `Circumstances and context of the dialogue: ${Scenario}\n` : `${Scenario}\n`;
                 }
                 console.log('calling runGenerate');