From 71016db617b34de9932e222493c7926b00542596 Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Wed, 12 Feb 2025 11:37:43 +0800
Subject: [PATCH] remove tts audio caching

---
 expose.h                  |  1 -
 klite.embd                |  3 ++-
 koboldcpp.py              |  4 +---
 otherarch/tts_adapter.cpp | 15 ---------------
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/expose.h b/expose.h
index 7306c08335462..ce197ccd018e1 100644
--- a/expose.h
+++ b/expose.h
@@ -224,7 +224,6 @@ struct tts_generation_inputs
     const char * prompt = nullptr;
     const int speaker_seed = 0;
     const int audio_seed = 0;
-    const bool nocache = false;
 };
 struct tts_generation_outputs
 {
diff --git a/klite.embd b/klite.embd
index dd7e70309cb8b..c3fb96b3c552c 100644
--- a/klite.embd
+++ b/klite.embd
@@ -5298,6 +5298,8 @@ Current version indicated by LITEVER below.
 			.replace(/<\/ul>\n<ul>/g, "")
 			.replace(/<\/li><\/ul>\n\s*?\n<ul><li>/gm, "</li>\n<li>")
 			.replace(/<\/li><\/ul>\s*?<ul><li>/gm, "</li><li>")
+			.replace(/<\/ul>\n/gm, "</ul>")
+			.replace(/<\/ol>\n/gm, "</ol>")
 
 			.replace(/\*\*\*([^\s*].*?[^\\])\*\*\*/gm, "<b><em>$1</em></b>")
 			.replace(/\*\*([^\s*].*?[^\\])\*\*/gm, "<b>$1</b>")
@@ -12736,7 +12738,6 @@ Current version indicated by LITEVER below.
 					payload =
 					{
 						"input": text,
-						"nocache": true,
 						"voice": (document.getElementById("kcpp_tts_voice").value == "custom")?document.getElementById("kcpp_tts_voice_custom").value:document.getElementById("kcpp_tts_voice").value
 					};
 					ttsheaders = get_kobold_header();
diff --git a/koboldcpp.py b/koboldcpp.py
index d9f6e583696e4..0d2d959e0158e 100644
--- a/koboldcpp.py
+++ b/koboldcpp.py
@@ -304,8 +304,7 @@ class tts_load_model_inputs(ctypes.Structure):
 class tts_generation_inputs(ctypes.Structure):
     _fields_ = [("prompt", ctypes.c_char_p),
                 ("speaker_seed", ctypes.c_int),
-                ("audio_seed", ctypes.c_int),
-                ("nocache", ctypes.c_bool)]
+                ("audio_seed", ctypes.c_int)]
 
 class tts_generation_outputs(ctypes.Structure):
     _fields_ = [("status", ctypes.c_int),
@@ -1491,7 +1490,6 @@ def tts_generate(genparams):
     except Exception:
         aseed = -1
     inputs.audio_seed = aseed
-    inputs.nocache = genparams.get("nocache", False)
     ret = handle.tts_generate(inputs)
     outstr = ""
     if ret.status==1:
diff --git a/otherarch/tts_adapter.cpp b/otherarch/tts_adapter.cpp
index d690c838b4abf..451a4a368d981 100644
--- a/otherarch/tts_adapter.cpp
+++ b/otherarch/tts_adapter.cpp
@@ -638,21 +638,6 @@ tts_generation_outputs ttstype_generate(const tts_generation_inputs inputs)
     std::mt19937 tts_rng(audio_seed);
     std::mt19937 speaker_rng(speaker_seed);
 
-    //if we can reuse an old generation, do so
-    if(!inputs.nocache
-    && last_generation_settings_audio_seed == inputs.audio_seed
-    && last_generation_settings_speaker_seed == inputs.speaker_seed
-    && last_generated_audio!=""
-    && last_generation_settings_prompt == std::string(inputs.prompt))
-    {
-        if (ttsdebugmode == 1 && !tts_is_quiet) {
-            printf("\nReusing Cached Audio.\n");
-        }
-        output.data = last_generated_audio.c_str();
-        output.status = 1;
-        return output;
-    }
-
 
     int n_decode = 0;
     int n_predict = 2048; //will be updated later