From d71b5477c5723b2014ff79ccc7ae74af837baee4 Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Sun, 18 Aug 2024 00:48:53 +0800
Subject: [PATCH] update lite, cleanup, fix interrogate format

---
 klite.embd                                    | 29 ++++++++++++++++---
 koboldcpp.py                                  |  6 +++-
 otherarch/tools/make_old_pyinstaller.bat      |  4 ---
 otherarch/tools/make_old_pyinstaller_cuda.bat |  4 ---
 .../tools/make_pyinstaller_hybrid_henk.bat    |  5 ----
 5 files changed, 30 insertions(+), 18 deletions(-)
 delete mode 100644 otherarch/tools/make_old_pyinstaller.bat
 delete mode 100644 otherarch/tools/make_old_pyinstaller_cuda.bat
 delete mode 100644 otherarch/tools/make_pyinstaller_hybrid_henk.bat

diff --git a/klite.embd b/klite.embd
index 4df5bc5a1..f64c54e48 100644
--- a/klite.embd
+++ b/klite.embd
@@ -2293,6 +2293,7 @@ Current version indicated by LITEVER below.
 		padding:4px;
 		margin-right:6px;
 		border-radius:50%;
+		cursor:pointer;
 	}
 	.corpostyleitemheading
 	{
@@ -6045,7 +6046,7 @@ Current version indicated by LITEVER below.
 
 	function is_kai_json(obj)
 	{
-		let is_kai = (!(tmpstory.prompt==null) || tmpstory.savedsettings!=null);
+		let is_kai = (!(obj.prompt==null) || obj.savedsettings!=null);
 		return is_kai;
 	}
 
@@ -15314,6 +15315,22 @@ Current version indicated by LITEVER below.
 		render_gametext(needsave);
 	}
 
+	var cosmetic_corpo_ai_nick = "KoboldAI";
+	function corpo_click_avatar()
+	{
+		inputBox("Set Cosmetic AI Nickname\n(This is purely cosmetic and does not affect responses, and is not saved).","Set Cosmetic AI Nickname",cosmetic_corpo_ai_nick,"Set Cosmetic AI Nickname", ()=>{
+			let userinput = getInputBoxValue();
+			userinput = userinput.trim();
+			if (userinput != null && userinput!="") {
+				cosmetic_corpo_ai_nick = userinput;
+			}else
+			{
+				cosmetic_corpo_ai_nick = "KoboldAI";
+			}
+			render_gametext(false);
+		},false,false,false);
+	}
+
 	var corpo_editing_turn = -1;
 	function render_corpo_ui(input)
 	{
@@ -15368,7 +15385,7 @@ Current version indicated by LITEVER below.
 				processed_msg = processed_msg.replace(/\[<\|.+?\|>\]/g, ""); //remove normal comments too
 			}
 
-			let namepart = (curr.myturn ? "User" : "KoboldAI");
+			let namepart = (curr.myturn ? "User" : cosmetic_corpo_ai_nick);
 			//advanced name replacement
 			if(localsettings.opmode==3 && curr.name) //chat mode
 			{
@@ -15432,7 +15449,7 @@ Current version indicated by LITEVER below.
 				+ `</div>`);
 
 			newbodystr += `<div class="corpostyleitem">
-				<div><img src="`+ (curr.myturn ? human_square : niko_square) + `" class="corpoavatar"/></div>
+				<div><img ${(curr.myturn ? "" : `onclick="corpo_click_avatar()"`)} src="${(curr.myturn ? human_square : niko_square)}" class="corpoavatar"/></div>
 				<div style="width:100%">
 				<div class="corpostyleitemheading">`+ namepart + `</div>
 				`+ bodypart + chunkbtns + `
@@ -15441,7 +15458,7 @@ Current version indicated by LITEVER below.
 		}
 		if(incomplete_resp)
 		{
-			let namepart = "KoboldAI";
+			let namepart = cosmetic_corpo_ai_nick;
 			let futuretext = (synchro_pending_stream!=""?(escapeHtml(pending_context_preinjection) + escapeHtml(synchro_pending_stream)):"...");
 			if(localsettings.opmode==3)
 			{
@@ -16862,6 +16879,10 @@ Current version indicated by LITEVER below.
 					replacedText = replacedText.replace(italics_regex, wrapperSpan(styleRole, 'action')); 		// Apply the actions style to *actions*.
 					replacedText = replacedText.replace(/“(.*?)”/g, wrapperSpan(styleRole, 'speech')); 	// Apply the speech style to "speech".
 					replacedText = replacedText.replace(/&quot;(.*?)&quot;/g, wrapperSpan(styleRole, 'speech')); 	// Apply the speech style to "speech".
+					if(localsettings.opmode==4)
+					{
+						replacedText = simpleMarkdown(replacedText);
+					}
 					return replacedText;
 				});
 			}
diff --git a/koboldcpp.py b/koboldcpp.py
index 2b1cc8847..1aaf6d0ef 100644
--- a/koboldcpp.py
+++ b/koboldcpp.py
@@ -1348,10 +1348,14 @@ ws ::= | " " | "\n" [ \t]{0,20}
 
 
     elif api_format==5:
+        global chatcompl_adapter
         firstimg = genparams.get('image', "")
         genparams["images"] = [firstimg]
         genparams["max_length"] = 42
-        genparams["prompt"] = "### Instruction: In one sentence, write a descriptive caption for this image.\n### Response:"
+        adapter_obj = {} if chatcompl_adapter is None else chatcompl_adapter
+        user_message_start = adapter_obj.get("user_start", "### Instruction:")
+        assistant_message_start = adapter_obj.get("assistant_start", "### Response:")
+        genparams["prompt"] = f"{user_message_start} In one sentence, write a descriptive caption for this image.\n{assistant_message_start}"
 
     return genparams
 
diff --git a/otherarch/tools/make_old_pyinstaller.bat b/otherarch/tools/make_old_pyinstaller.bat
deleted file mode 100644
index 826d7c52a..000000000
--- a/otherarch/tools/make_old_pyinstaller.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-echo This file is only for my own usage, please do not use it. I am lazy.
-
-set PATH=d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python;d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python\\Scripts;%PATH%
-PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --collect-all psutil --icon "./niko.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./kcpp_adapters;./kcpp_adapters" --add-data "./koboldcpp.py;." --add-data "./klite.embd;." --add-data "./kcpp_docs.embd;." --add-data "./kcpp_sdui.embd;." --add-data "./taesd.embd;." --add-data "./taesd_xl.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./koboldcpp_vulkan_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp_nocuda.exe"
\ No newline at end of file
diff --git a/otherarch/tools/make_old_pyinstaller_cuda.bat b/otherarch/tools/make_old_pyinstaller_cuda.bat
deleted file mode 100644
index 269b2f15c..000000000
--- a/otherarch/tools/make_old_pyinstaller_cuda.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-echo This file is only for my own usage, please do not use it. I am lazy.
-
-set PATH=d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python;d:\\MainApplications\\KoboldAIGPT\\KoboldAI-Horde-Bridge\\python\\Scripts;%PATH%
-PyInstaller --noconfirm --onefile --clean --console --collect-all customtkinter --collect-all psutil --icon "./nikogreen.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./kcpp_adapters;./kcpp_adapters" --add-data "./koboldcpp.py;." --add-data "./klite.embd;." --add-data "./kcpp_docs.embd;." --add-data "./kcpp_sdui.embd;." --add-data "./taesd.embd;." --add-data "./taesd_xl.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./koboldcpp_vulkan_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "./koboldcpp_cublas.dll;." --add-data "./cublas64_11.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cudart64_110.dll;." --add-data "./msvcp140.dll;." --add-data "./msvcp140_codecvt_ids.dll;." --add-data "./vcruntime140.dll;." --add-data "./vcruntime140_1.dll;." --add-data "./rwkv_vocab.embd;." --add-data "./rwkv_world_vocab.embd;." "./koboldcpp.py" -n "koboldcpp.exe"
\ No newline at end of file
diff --git a/otherarch/tools/make_pyinstaller_hybrid_henk.bat b/otherarch/tools/make_pyinstaller_hybrid_henk.bat
deleted file mode 100644
index de828bd30..000000000
--- a/otherarch/tools/make_pyinstaller_hybrid_henk.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-cd /d "%~dp0"
-copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cudart64_110.dll" .\ /Y
-copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cublasLt64_11.dll" .\ /Y
-copy "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v11.4\bin\cublas64_11.dll" .\ /Y
-PyInstaller --noconfirm --onefile --collect-all customtkinter --collect-all psutil --clean --console --icon ".\niko.ico" --add-data "./winclinfo.exe;." --add-data "./OpenCL.dll;." --add-data "./kcpp_adapters;./kcpp_adapters" --add-data "./koboldcpp.py;." --add-data "./klite.embd;." --add-data "./kcpp_docs.embd;." --add-data "./kcpp_sdui.embd;." --add-data "./taesd.embd;." --add-data "./taesd_xl.embd;." --add-data "./koboldcpp_default.dll;." --add-data "./koboldcpp_openblas.dll;." --add-data "./koboldcpp_failsafe.dll;." --add-data "./koboldcpp_noavx2.dll;." --add-data "./libopenblas.dll;." --add-data "./koboldcpp_clblast.dll;." --add-data "./koboldcpp_clblast_noavx2.dll;." --add-data "./koboldcpp_vulkan_noavx2.dll;." --add-data "./clblast.dll;." --add-data "./koboldcpp_vulkan.dll;." --add-data "./vulkan-1.dll;." --add-data "./koboldcpp_cublas.dll;." --add-data "./cudart64_110.dll;." --add-data "./cublasLt64_11.dll;." --add-data "./cublas64_11.dll;." --add-data "./rwkv_vocab.embd;." --add-data "C:/Windows/System32/msvcp140.dll;." --add-data "C:/Windows/System32/vcruntime140_1.dll;." "./koboldcpp.py" -n "koboldcpp.exe"
\ No newline at end of file