@@ -4469,7 +4469,7 @@ Current version: 123
4469
4469
}
4470
4470
function is_using_kcpp_with_llava()
4471
4471
{
4472
- return (custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.61") >= 0);
4472
+ return (custom_kobold_endpoint!="" && koboldcpp_version && koboldcpp_version!="" && compare_version_str(koboldcpp_version, "1.61") >= 0 && koboldcpp_has_vision );
4473
4473
}
4474
4474
4475
4475
//0 is none, 1 is pseudostreaming, 2 is true poll-streaming, 3 is sse-streaming
@@ -8139,11 +8139,11 @@ Current version: 123
8139
8139
function update_genimg_button_visiblility()
8140
8140
{
8141
8141
if (localsettings.generate_images_mode==0) {
8142
- document.getElementById("btn_genimg ").classList.add("hidden") ;
8143
- document.getElementById("btn_genimg2 ").classList.add("hidden") ;
8142
+ document.getElementById("btn_inner_genimg_auto ").disabled = true ;
8143
+ document.getElementById("btn_inner_genimg_custom ").disabled = true ;
8144
8144
} else {
8145
- document.getElementById("btn_genimg ").classList.remove("hidden") ;
8146
- document.getElementById("btn_genimg2 ").classList.remove("hidden") ;
8145
+ document.getElementById("btn_inner_genimg_auto ").disabled = false ;
8146
+ document.getElementById("btn_inner_genimg_custom ").disabled = false ;
8147
8147
}
8148
8148
}
8149
8149
@@ -8973,11 +8973,11 @@ Current version: 123
8973
8973
generate_new_image(sentence);
8974
8974
document.getElementById("btn_genimg").disabled = true;
8975
8975
document.getElementById("btn_genimg2").disabled = true;
8976
- //disable it for 10 sec to prevent spam
8976
+ //disable it for 8 sec to prevent spam
8977
8977
setTimeout(() => {
8978
8978
document.getElementById("btn_genimg").disabled = false;
8979
8979
document.getElementById("btn_genimg2").disabled = false;
8980
- }, 10000 );
8980
+ }, 8000 );
8981
8981
}
8982
8982
8983
8983
function do_auto_gen_image(truncated_context)
@@ -10719,7 +10719,7 @@ Current version: 123
10719
10719
10720
10720
let origprompt = (savedmeta.prompt?replaceAll(savedmeta.prompt,"\n"," ") : "No Saved Description");
10721
10721
latest_orig_prompt = origprompt;
10722
- let hasllava = ( is_using_kcpp_with_llava() && koboldcpp_has_vision );
10722
+ let hasllava = is_using_kcpp_with_llava();
10723
10723
let visionstatus = "";
10724
10724
if(savedmeta.visionmode==3)
10725
10725
{
@@ -10737,7 +10737,7 @@ Current version: 123
10737
10737
<option value="3">Multimodal (LLaVA)</option>
10738
10738
</select>`;
10739
10739
document.getElementById("zoomedimgdesc").innerHTML = `
10740
- 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>
10740
+ 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>
10741
10741
`+togglebtn+`
10742
10742
<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>
10743
10743
`;
@@ -11171,7 +11171,8 @@ Current version: 123
11171
11171
console.log("Replacing with Image: " + matchstr);
11172
11172
gametext_arr[i] = gametext_arr[i].replace(matchstr, newstr);
11173
11173
let metaid = cyrb_hash(img.result);
11174
- completed_imgs_meta[metaid] = {prompt:image_db[key].prompt, desc:"", visionmode:0, aspect:image_db[key].aspect};
11174
+ //default to llava if supported
11175
+ completed_imgs_meta[metaid] = {prompt:image_db[key].prompt, desc:"", visionmode:(is_using_kcpp_with_llava()?3:0), aspect:image_db[key].aspect};
11175
11176
delete image_db[key];
11176
11177
}
11177
11178
}
@@ -14738,10 +14739,10 @@ Current version: 123
14738
14739
<div class="popuptitletext">Add New Image</div>
14739
14740
</div>
14740
14741
<div class="aidgpopuplistheader anotelabel">
14741
- <button type="button" class="btn btn-primary bg_green" onclick="add_img_btn_auto()">Generate Image (Automatic)</button>
14742
+ <button type="button" class="btn btn-primary bg_green" id="btn_inner_genimg_auto" onclick="add_img_btn_auto()">Generate Image (Automatic)</button>
14742
14743
</div>
14743
14744
<div class="aidgpopuplistheader anotelabel">
14744
- <button type="button" class="btn btn-primary bg_green" onclick="add_img_btn_custom()">Generate Image (Custom Prompt)</button>
14745
+ <button type="button" class="btn btn-primary bg_green" id="btn_inner_genimg_custom" onclick="add_img_btn_custom()">Generate Image (Custom Prompt)</button>
14745
14746
</div>
14746
14747
<div class="aidgpopuplistheader anotelabel">
14747
14748
<button type="button" class="btn btn-primary bg_green" onclick="add_img_btn_upload()">Upload Image File</button>
0 commit comments