Merge branch 'concedo_experimental' into croco_nex_0

Author: Nexesenex

kcpp_docs.embd

@@ -1453,7 +1453,7 @@
                             "application/json": {
                                "example": {
                                   "input": "hello world, how are you today?",
-                                  "voice": "fire",
+                                  "voice": "kobo",
                                },
                                "schema": {
                                   "properties": {
@@ -1463,7 +1463,7 @@
                                      },
                                      "voice": {
                                         "type": "string",
-                                        "description": "The voice to use when generating the audio. You can enter anything you like, a qunique speaker will be generated."
+                                        "description": "The voice to use when generating the audio. You can enter anything you like, a unique speaker will be generated. There are a few preset voices you can use: kobo,cheery,sleepy,tutor,shouty,bored,record"
                                      }
                                   },
                                   "type": "object"

klite.embd

@@ -12,7 +12,7 @@ Current version indicated by LITEVER below.
 -->
 
 <script>
-	const LITEVER = 202;
+	const LITEVER = 203;
 	const urlParams = new URLSearchParams(window.location.search);
 	var localflag = true;
 	const STORAGE_PREFIX = (localflag?"e_":"")+"kaihordewebui_";
@@ -11391,6 +11391,8 @@ initializeInstructUIFunctionality();
 			pick_default_horde_models();
 			indexeddb_save("savedusermod","");
 			indexeddb_save("savedcustomcss", "");
+			let styleElement = document.getElementById('custom_css');
+			styleElement.innerHTML = "";
 		},null);
 
 	}
@@ -11939,6 +11941,7 @@ initializeInstructUIFunctionality();
 			}else{
 				document.getElementById("nokcpptts").classList.remove("hidden");
 			}
+			adjust_kcpptts_controls();
 		}
 	}
 
@@ -11982,6 +11985,15 @@ initializeInstructUIFunctionality();
 		rvcPitch.disabled = streamingMode;
 	}
 
+	function adjust_kcpptts_controls() {
+		if (document.getElementById("kcpp_tts_voice").value == "custom") {
+			document.getElementById("kcpp_tts_voice_custom").classList.remove("hidden");
+		} else {
+			document.getElementById("kcpp_tts_voice_custom").classList.add("hidden");
+		}
+
+	}
+
 	// Update set_xtts_url to use the new fetch_rvc_voices function
 	function set_xtts_url() {
 		let is_xtts = (document.getElementById("ttsselect").value==XTTS_ID);
@@ -12074,7 +12086,7 @@ initializeInstructUIFunctionality();
 					payload =
 					{
 						"input": text,
-						"voice": document.getElementById("kcpp_tts_voice").value
+						"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();
 				}
@@ -14497,7 +14509,7 @@ initializeInstructUIFunctionality();
 		gentxt = trim_extra_stop_seqs(gentxt,false);
 
 		//fix alpaca leakage
-		if(localsettings.fix_alpaca_leak && get_instruct_starttag(true).toLowerCase().includes("### instruction"))
+		if(localsettings.fix_alpaca_leak && (localsettings.opmode == 2 || localsettings.opmode == 3 || localsettings.opmode == 4) && get_instruct_starttag(true).toLowerCase().includes("### instruction"))
 		{
 			let matches = gentxt.match(/\n### (.+?):/g);
 			for(let m in matches)
@@ -20250,7 +20262,18 @@ initializeInstructUIFunctionality();
 								<div class="color_red hidden" id="nokcpptts">KoboldCpp Not Connected</div>
 								<div class="settinglabel">
 								<table width="100%">
-								<tr style="font-size:12px;padding:2px;margin:0px 0 0;"><td>TTS Voice </td><td><input class="settinglabel miniinput" type="text" value="kobo" placeholder="(Anything)" id="kcpp_tts_voice" style="margin-left:3px; height:18px; width: 80px; padding: 2px;"></td></tr>
+								<tr style="font-size:12px;padding:2px;margin:0px 0 0;"><td>TTS Voice </td><td>
+									<select onchange="adjust_kcpptts_controls();" class="form-control" id="kcpp_tts_voice" style="font-size:12px;height:20px;padding:0;margin:0px 0 0;">
+									<option value="kobo" selected>kobo</option>
+									<option value="cheery">cheery</option>
+									<option value="sleepy">sleepy</option>
+									<option value="tutor">tutor</option>
+									<option value="shouty">shouty</option>
+									<option value="bored">bored</option>
+									<option value="record">record</option>
+									<option value="custom">custom</option>
+									</select></td>
+									<td><input class="settinglabel miniinput" type="text" value="" placeholder="(Name)" id="kcpp_tts_voice_custom" style="margin-left:3px; height:18px; width:44px; padding: 2px;"></td></tr>
 								</table>
 								</div>
 							</div>