From 2dc647f89235389fefbb1bf8e06f4bc9ada5f58d Mon Sep 17 00:00:00 2001
From: Concedo <39025047+LostRuins@users.noreply.github.com>
Date: Mon, 11 Mar 2024 20:03:14 +0800
Subject: [PATCH] updated lite (+1 squashed commits)

Squashed commits:

[f33ea44a] updated lite
---
 klite.embd | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/klite.embd b/klite.embd
index 163fbfe3f..7446476b4 100644
--- a/klite.embd
+++ b/klite.embd
@@ -4469,7 +4469,7 @@ Current version: 123
 	}
 	function is_using_kcpp_with_llava()
 	{
-		return (custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.61") >= 0);
+		return (custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.61") >= 0 && koboldcpp_has_vision);
 	}
 
 	//0 is none, 1 is pseudostreaming, 2 is true poll-streaming, 3 is sse-streaming
@@ -8139,11 +8139,11 @@ Current version: 123
 	function update_genimg_button_visiblility()
 	{
 		if (localsettings.generate_images_mode==0) {
-			document.getElementById("btn_genimg").classList.add("hidden");
-			document.getElementById("btn_genimg2").classList.add("hidden");
+			document.getElementById("btn_inner_genimg_auto").disabled = true;
+			document.getElementById("btn_inner_genimg_custom").disabled = true;
 		} else {
-			document.getElementById("btn_genimg").classList.remove("hidden");
-			document.getElementById("btn_genimg2").classList.remove("hidden");
+			document.getElementById("btn_inner_genimg_auto").disabled = false;
+			document.getElementById("btn_inner_genimg_custom").disabled = false;
 		}
 	}
 
@@ -8973,11 +8973,11 @@ Current version: 123
 		generate_new_image(sentence);
 		document.getElementById("btn_genimg").disabled = true;
 		document.getElementById("btn_genimg2").disabled = true;
-		//disable it for 10 sec to prevent spam
+		//disable it for 8 sec to prevent spam
 		setTimeout(() => {
 			document.getElementById("btn_genimg").disabled = false;
 			document.getElementById("btn_genimg2").disabled = false;
-		}, 10000);
+		}, 8000);
 	}
 
 	function do_auto_gen_image(truncated_context)
@@ -10719,7 +10719,7 @@ Current version: 123
 
 			let origprompt = (savedmeta.prompt?replaceAll(savedmeta.prompt,"\n"," ") : "No Saved Description");
 			latest_orig_prompt = origprompt;
-			let hasllava = (is_using_kcpp_with_llava() && koboldcpp_has_vision);
+			let hasllava = is_using_kcpp_with_llava();
 			let visionstatus = "";
 			if(savedmeta.visionmode==3)
 			{
@@ -10737,7 +10737,7 @@ Current version: 123
 								<option value="3">Multimodal (LLaVA)</option>
 							</select>`;
 			document.getElementById("zoomedimgdesc").innerHTML = `
-			AI Vision: `+visionstatus+` <span class="helpicon">?<span class="helptext">This allows the AI to visually recognize this image, to see and react to this image. On KoboldCpp, LLaVA support can be used with multimodal models. Otherwise, uses Horde or Local A1111 for image interrogation if enabled.</span></span>
+			AI Vision: `+visionstatus+` <span class="helpicon">?<span class="helptext">This allows the AI to visually recognize this image and react to it. On KoboldCpp, LLaVA models can be used. Otherwise, uses Horde or Local A1111 for image interrogation if enabled.</span></span>
 			`+togglebtn+`
 			<br><button type="button" class="btn btn-primary" style="width: 140px; padding: 2px; margin: 3px; font-size:12px;" onclick="show_orig_prompt()">View Original Prompt</button>
 			`;
@@ -11171,7 +11171,8 @@ Current version: 123
 							console.log("Replacing with Image: " + matchstr);
 							gametext_arr[i] = gametext_arr[i].replace(matchstr, newstr);
 							let metaid = cyrb_hash(img.result);
-							completed_imgs_meta[metaid] = {prompt:image_db[key].prompt, desc:"", visionmode:0, aspect:image_db[key].aspect};
+							//default to llava if supported
+							completed_imgs_meta[metaid] = {prompt:image_db[key].prompt, desc:"", visionmode:(is_using_kcpp_with_llava()?3:0), aspect:image_db[key].aspect};
 							delete image_db[key];
 						}
 					}
@@ -14738,10 +14739,10 @@ Current version: 123
 				<div class="popuptitletext">Add New Image</div>
 			</div>
 			<div class="aidgpopuplistheader anotelabel">
-				<button type="button" class="btn btn-primary bg_green" onclick="add_img_btn_auto()">Generate Image (Automatic)</button>
+				<button type="button" class="btn btn-primary bg_green" id="btn_inner_genimg_auto" onclick="add_img_btn_auto()">Generate Image (Automatic)</button>
 			</div>
 			<div class="aidgpopuplistheader anotelabel">
-				<button type="button" class="btn btn-primary bg_green" onclick="add_img_btn_custom()">Generate Image (Custom Prompt)</button>
+				<button type="button" class="btn btn-primary bg_green" id="btn_inner_genimg_custom" onclick="add_img_btn_custom()">Generate Image (Custom Prompt)</button>
 			</div>
 			<div class="aidgpopuplistheader anotelabel">
 				<button type="button" class="btn btn-primary bg_green" onclick="add_img_btn_upload()">Upload Image File</button>