From fb48d250419cfbf327cfd13c4609b35bce1e600c Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Mon, 4 Nov 2024 00:41:59 +0200
Subject: [PATCH 1/2] Fix new character highlight

---
 public/script.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/script.js b/public/script.js
index 51e324dda..507a0ca60 100644
--- a/public/script.js
+++ b/public/script.js
@@ -7185,7 +7185,7 @@ export function select_rm_info(type, charId, previousCharId = null) {
     importFlashTimeout = setTimeout(function () {
         if (type === 'char_import' || type === 'char_create') {
             // Find the page at which the character is located
-            const avatarFileName = `${charId}.png`;
+            const avatarFileName = charId;
             const charData = getEntitiesList({ doFilter: true });
             const charIndex = charData.findIndex((x) => x?.item?.avatar?.startsWith(avatarFileName));
 

From a3ca407b2714df5af5a9f83aa925fd64fb778e24 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Wed, 6 Nov 2024 19:47:30 +0200
Subject: [PATCH 2/2] Backport llama.cpp-related DRY fixes from staging (#3051)

* llama.cpp Enable dry w/ array convert

The new PR that was merged needs an array instead of a str

https://github.com/ggerganov/llama.cpp/pull/9702

* Safe sequence breakers parse

* Support comma-separated list of llama.cpp sequence breakers #3026

---------

Co-authored-by: Beinsezii <beinsezii@gmail.com>
---
 public/index.html                  |  3 +--
 public/scripts/textgen-settings.js | 12 ++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/public/index.html b/public/index.html
index 0d6f1105b..2bba8e87b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1397,8 +1397,7 @@
                                         </div>
                                     </div>
 
-                                    <!-- Enable for llama.cpp when the PR is merged: https://github.com/ggerganov/llama.cpp/pull/6839 -->
-                                    <div data-tg-type="ooba, koboldcpp, tabby" id="dryBlock" class="wide100p">
+                                    <div data-tg-type="ooba, koboldcpp, tabby, llamacpp" id="dryBlock" class="wide100p">
                                         <h4 class="wide100p textAlignCenter" title="DRY penalizes tokens that would extend the end of the input into a sequence that has previously occurred in the input. Set multiplier to 0 to disable." data-i18n="[title]DRY_Repetition_Penalty_desc">
                                             <label data-i18n="DRY Repetition Penalty">DRY Repetition Penalty</label>
                                             <a href="https://github.com/oobabooga/text-generation-webui/pull/5677" target="_blank">
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index ab19e5a3a..4bc61ace5 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -1307,11 +1307,23 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
             : [];
         const tokenBans = toIntArray(banned_tokens);
         logitBiasArray.push(...tokenBans.map(x => [Number(x), false]));
+        const sequenceBreakers = (() => {
+            try {
+                return JSON.parse(params.dry_sequence_breakers);
+            } catch {
+                if (typeof params.dry_sequence_breakers === 'string') {
+                    return params.dry_sequence_breakers.split(',');
+                }
+
+                return undefined;
+            }
+        })();
         const llamaCppParams = {
             'logit_bias': logitBiasArray,
             // Conflicts with ooba's grammar_string
             'grammar': settings.grammar_string,
             'cache_prompt': true,
+            'dry_sequence_breakers': sequenceBreakers,
         };
         params = Object.assign(params, llamaCppParams);
     }