vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-11 01:24:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated lite

Browse source
This commit is contained in:
Concedo 2024-03-05 21:32:32 +08:00
parent d910f2354c
commit e64210ef16
1 changed files with 109 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

104
klite.embd
View file

@ -1489,6 +1489,7 @@ Current version: 120
float: right; float: right;
position: relative; position: relative;
padding: 4px; padding: 4px;
clear: both;
} }
.storyimgside .storyimgside
{ {
@ -3365,6 +3366,7 @@ Current version: 120
const scale_submit_endpoint = "https://dashboard.scale.com/spellbook/api/v2/deploy/" const scale_submit_endpoint = "https://dashboard.scale.com/spellbook/api/v2/deploy/"
const claude_submit_endpoint = "/complete"; const claude_submit_endpoint = "/complete";
const claude_submit_endpoint_v3 = "/messages";
const default_openrouter_base = "https://openrouter.ai/api/v1"; const default_openrouter_base = "https://openrouter.ai/api/v1";
const default_oai_base = "https://api.openai.com"; const default_oai_base = "https://api.openai.com";
@ -3431,7 +3433,7 @@ Current version: 120
var current_wi = []; //each item stores a wi object. var current_wi = []; //each item stores a wi object.
var wi_insertlocation = 0; //after memory var wi_insertlocation = 0; //after memory
var wi_searchdepth = 0; //search everything var wi_searchdepth = 0; //search everything
var generateimagesinterval = 650; //if generated images is enabled, it will trigger after every 600 new characters in context. var generateimagesinterval = 700; //if generated images is enabled, it will trigger after every 700 new characters in context.
var nextgeneratedimagemilestone = generateimagesinterval; //used to keep track of when to generate the next image var nextgeneratedimagemilestone = generateimagesinterval; //used to keep track of when to generate the next image
var image_db = {}; //stores a dictionary of pending images var image_db = {}; //stores a dictionary of pending images
var interrogation_db = {}; var interrogation_db = {};
@ -6736,6 +6738,22 @@ Current version: 120
}); });
} }
function toggleclaudemodel()
{
if (document.getElementById("custom_claude_model").value.toLowerCase().includes("claude-3"))
{
document.getElementById("claudesystemprompt").classList.remove("hidden");
document.getElementById("claudejailbreakprompt").classList.remove("hidden");
document.getElementById("clauderenamecompatdiv").classList.add("hidden");
}
else
{
document.getElementById("claudesystemprompt").classList.add("hidden");
document.getElementById("claudejailbreakprompt").classList.add("hidden");
document.getElementById("clauderenamecompatdiv").classList.remove("hidden");
}
}
function customapi_dropdown() function customapi_dropdown()
{ {
let epchoice = document.getElementById("customapidropdown").value; let epchoice = document.getElementById("customapidropdown").value;
@ -8891,7 +8909,7 @@ Current version: 120
function do_auto_gen_image(truncated_context) function do_auto_gen_image(truncated_context)
{ {
var tclen = truncated_context.length; var tclen = truncated_context.length;
var sentence = truncated_context.substring(tclen - 350, tclen); var sentence = truncated_context.substring(tclen - 380, tclen);
sentence = start_trim_to_sentence(sentence); sentence = start_trim_to_sentence(sentence);
sentence = end_trim_to_sentence(sentence,true); sentence = end_trim_to_sentence(sentence,true);
if (sentence.length > 0) { if (sentence.length > 0) {
@ -8920,7 +8938,7 @@ Current version: 120
let userinput = getInputBoxValue(); let userinput = getInputBoxValue();
if(userinput.trim()!="") if(userinput.trim()!="")
{ {
var sentence = userinput.trim().substring(0, 350); var sentence = userinput.trim().substring(0, 380);
do_manual_gen_image(sentence); do_manual_gen_image(sentence);
} }
},false); },false);
@ -9967,9 +9985,34 @@ Current version: 120
} }
else if (custom_claude_key != "")//handle for Claude else if (custom_claude_key != "")//handle for Claude
{ {
let targetep = cors_proxy + "?" + (custom_claude_endpoint + claude_submit_endpoint); let claudev3mode = custom_claude_model.toLowerCase().includes("claude-3");
let targetep = cors_proxy + "?" + (custom_claude_endpoint + (claudev3mode?claude_submit_endpoint_v3:claude_submit_endpoint));
let claude_payload = let claude_payload = null;
if(claudev3mode)
{
let sysprompt = document.getElementById("claudesystemprompt").value;
let assistantprompt = document.getElementById("claudejailbreakprompt").value;
claude_payload =
{
"model": custom_claude_model,
"messages": [{"role": "user", "content": submit_payload.prompt}],
"max_tokens": submit_payload.params.max_length,
"top_k": (submit_payload.params.top_k<1?300:submit_payload.params.top_k),
"temperature": submit_payload.params.temperature,
"top_p": submit_payload.params.top_p,
};
if(sysprompt)
{
claude_payload.system = sysprompt;
}
if(assistantprompt)
{
claude_payload.messages.push({"role": "assistant", "content": assistantprompt});
}
}
else
{
claude_payload =
{ {
"prompt": submit_payload.prompt, "prompt": submit_payload.prompt,
"max_tokens_to_sample": submit_payload.params.max_length, "max_tokens_to_sample": submit_payload.params.max_length,
@ -9977,7 +10020,8 @@ Current version: 120
"top_k": (submit_payload.params.top_k<1?300:submit_payload.params.top_k), "top_k": (submit_payload.params.top_k<1?300:submit_payload.params.top_k),
"temperature": submit_payload.params.temperature, "temperature": submit_payload.params.temperature,
"top_p": submit_payload.params.top_p, "top_p": submit_payload.params.top_p,
} };
if(document.getElementById("clauderenamecompat").checked) if(document.getElementById("clauderenamecompat").checked)
{ {
let assistant_correct_case = "Assistant:"; let assistant_correct_case = "Assistant:";
@ -10001,23 +10045,36 @@ Current version: 120
//replace final assistant with fixed case //replace final assistant with fixed case
claude_payload.prompt = claude_payload.prompt.slice(0, -(assistant_correct_case.length))+assistant_correct_case; claude_payload.prompt = claude_payload.prompt.slice(0, -(assistant_correct_case.length))+assistant_correct_case;
} }
}
last_request_str = JSON.stringify(claude_payload); last_request_str = JSON.stringify(claude_payload);
fetch(targetep, { let claudeheaders = {
method: 'POST',
headers: {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'x-api-key': custom_claude_key, 'x-api-key': custom_claude_key,
'anthropic-version': '2023-01-01',
'Authorization': 'Bearer '+custom_claude_key, 'Authorization': 'Bearer '+custom_claude_key,
}, };
if(claudev3mode)
{
claudeheaders["anthropic-version"] = '2023-06-01';
}else{
claudeheaders["anthropic-version"] = '2023-01-01';
}
fetch(targetep, {
method: 'POST',
headers: claudeheaders,
body: JSON.stringify(claude_payload), body: JSON.stringify(claude_payload),
referrerPolicy: 'no-referrer', referrerPolicy: 'no-referrer',
}) })
.then((response) => response.json()) .then((response) => response.json())
.then((data) => { .then((data) => {
console.log("sync finished response: " + JSON.stringify(data)); console.log("sync finished response: " + JSON.stringify(data));
if(custom_claude_key != "" && data.content && data.content.length > 0 && data.content[0].text)
{
data.completion = data.content[0].text; //for claudev3
}
if (custom_claude_key != "" && data.completion != null && data.completion != "") if (custom_claude_key != "" && data.completion != null && data.completion != "")
{ {
synchro_polled_response = data.completion; synchro_polled_response = data.completion;
@ -10584,11 +10641,12 @@ Current version: 120
} }
function render_image_html(data, pend_txt = "", float=true, center=false) { function render_image_html(data, pend_txt = "", float=true, center=false) {
var dim = (localsettings.opmode == 2 ? 160 : 200); //adventure mode has smaller pictures var dim = (localsettings.opmode == 2 ? 160 : 180); //adventure mode has smaller pictures
let siclass = (float?"storyimgfloat":(center?"storyimgcenter":"storyimgside")); let siclass = (float?"storyimgfloat":(center?"storyimgcenter":"storyimgside"));
let reinvertcolor = localsettings.invert_colors?" invert_colors":""; let reinvertcolor = localsettings.invert_colors?" invert_colors":"";
let alttxt = ""; let alttxt = "";
let suffix = ((float==false&&center==false)?"<br>":""); let suffix = "";
let prefix = ((float==false&&center==false)?"<br>":"");
if (!data || data == "") { if (!data || data == "") {
let waittime = "Unavailable"; let waittime = "Unavailable";
if (image_db[pend_txt] != null) { if (image_db[pend_txt] != null) {
@ -10599,13 +10657,13 @@ Current version: 120
console.log("Cannot render " + pend_txt); console.log("Cannot render " + pend_txt);
} }
return `<div class="`+siclass+reinvertcolor+`" contenteditable="false"><img src="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD/2wBDABsSFBcUERsXFhceHBsgKEIrKCUlKFE6PTBCYFVlZF9VXVtqeJmBanGQc1tdhbWGkJ6jq62rZ4C8ybqmx5moq6T/2wBDARweHigjKE4rK06kbl1upKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKT/wAARCAEAAQADASIAAhEBAxEB/8QAGQABAQEBAQEAAAAAAAAAAAAAAAEDAgQF/8QAIBABAAIBBQEBAQEAAAAAAAAAAAECEgMRMVKRIWFBof/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwD7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABETPENNPT3je3jUHm22HpmInljqUx+xwDgAAAAAAAAAAAAAAAAAAAAAAAAABaxvaIRaztaJB6AAEmN4mFSZ2iZB5wAAAAAAAAAAAAAAAAAAAAAAAAAAAaaeptG1vWrzETMcSD0zMRyx1L5fI4cb7gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA7rpzNd/HAAAAAAAAAAAAAAAAAAAAAAAAAAAAADTT09/s8Gnp7/Z4agONSmX2OXYDzDbUpl9jliAAAAAAAAAAAAAAAAAAAsVmd9o4KVm0/jeIiI2gHnGupp/2vjIAABpp6e/2TT09/s8NQAAAAHGpTL7HLsB5htqUy+xyxAAAAAAAAAAAAAAAWlZtP4UrNp/G8RFY2gCIiI2hQAZ6mn/a+NAHmaaenv8AZ4dzp1m2/wDjoAAAAAAAABxqUy+xy7AeYbalMvscsQAAAAAAAAAAFpWbT+FKzafxvEREbQBEREbQoAAAAAAAAAAAAAAAAAONSmX2OXYDzDbUpl9jliAAAAAAAtKzafxaVm0/jaIiI2gCIiI2hQAAAAAAAAAAAAAAAAAAAAAcalMvscuwHmG2pTL7HLEAAAAFi0xxMwZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6kzvyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/Z" width=` + dim + ` height=` + dim + ` style="border-radius: 6%;" title="`+alttxt+`" alt="` + pend_txt + `"><div class=\"loader2\"></div><div class=\"imagelabel\">` + waittime + `</div></div>` + suffix; return prefix + `<div class="`+siclass+reinvertcolor+`" contenteditable="false"><img src="data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD/2wBDABsSFBcUERsXFhceHBsgKEIrKCUlKFE6PTBCYFVlZF9VXVtqeJmBanGQc1tdhbWGkJ6jq62rZ4C8ybqmx5moq6T/2wBDARweHigjKE4rK06kbl1upKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKSkpKT/wAARCAEAAQADASIAAhEBAxEB/8QAGQABAQEBAQEAAAAAAAAAAAAAAAEDAgQF/8QAIBABAAIBBQEBAQEAAAAAAAAAAAECEgMRMVKRIWFBof/EABQBAQAAAAAAAAAAAAAAAAAAAAD/xAAUEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwD7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABETPENNPT3je3jUHm22HpmInljqUx+xwDgAAAAAAAAAAAAAAAAAAAAAAAAABaxvaIRaztaJB6AAEmN4mFSZ2iZB5wAAAAAAAAAAAAAAAAAAAAAAAAAAAaaeptG1vWrzETMcSD0zMRyx1L5fI4cb7gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA7rpzNd/HAAAAAAAAAAAAAAAAAAAAAAAAAAAAADTT09/s8Gnp7/Z4agONSmX2OXYDzDbUpl9jliAAAAAAAAAAAAAAAAAAAsVmd9o4KVm0/jeIiI2gHnGupp/2vjIAABpp6e/2TT09/s8NQAAAAHGpTL7HLsB5htqUy+xyxAAAAAAAAAAAAAAAWlZtP4UrNp/G8RFY2gCIiI2hQAZ6mn/a+NAHmaaenv8AZ4dzp1m2/wDjoAAAAAAAABxqUy+xy7AeYbalMvscsQAAAAAAAAAAFpWbT+FKzafxvEREbQBEREbQoAAAAAAAAAAAAAAAAAONSmX2OXYDzDbUpl9jliAAAAAAAtKzafxaVm0/jaIiI2gCIiI2hQAAAAAAAAAAAAAAAAAAAAAcalMvscuwHmG2pTL7HLEAAAAFi0xxMwZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6ZW7T6gC5W7T6kzvyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/Z" width=` + dim + ` height=` + dim + ` style="border-radius: 6%;" title="`+alttxt+`" alt="` + pend_txt + `"><div class=\"loader2\"></div><div class=\"imagelabel\">` + waittime + `</div></div>` + suffix;
} else { } else {
let imghash = cyrb_hash(data).trim(); let imghash = cyrb_hash(data).trim();
if (completed_imgs_meta[imghash] != null) { if (completed_imgs_meta[imghash] != null) {
alttxt = completed_imgs_meta[imghash].prompt?escapeHtml(completed_imgs_meta[imghash].prompt):""; alttxt = completed_imgs_meta[imghash].prompt?escapeHtml(completed_imgs_meta[imghash].prompt):"";
} }
return `<div class="`+siclass+reinvertcolor+`"><img src="` + data + `" width=` + dim + ` height=` + dim + ` title="`+alttxt+`" style="border-radius: 6%; cursor: pointer;" onclick="return click_image(this,\'`+imghash+`\');"></div>` + suffix; return prefix + `<div class="`+siclass+reinvertcolor+`"><img src="` + data + `" width=` + dim + ` height=` + dim + ` title="`+alttxt+`" style="border-radius: 6%; cursor: pointer;" onclick="return click_image(this,\'`+imghash+`\');"></div>` + suffix;
} }
} }
@ -13542,7 +13600,7 @@ Current version: 120
<input class="form-control" type="text" id="custom_claude_endpoint" placeholder="Claude API URL" value=""> <input class="form-control" type="text" id="custom_claude_endpoint" placeholder="Claude API URL" value="">
<input class="form-control" type="password" id="custom_claude_key" placeholder="Claude API Key" value="" onfocus="focus_api_keys()" onblur="blur_api_keys()"><br> <input class="form-control" type="password" id="custom_claude_key" placeholder="Claude API Key" value="" onfocus="focus_api_keys()" onblur="blur_api_keys()"><br>
Model Choice:<br> Model Choice:<br>
<select style="padding:4px;" class="form-control" id="custom_claude_model"> <select style="padding:4px;" class="form-control" id="custom_claude_model" onload="toggleclaudemodel()" onchange="toggleclaudemodel()">
<option value="claude-v1">claude-v1</option> <option value="claude-v1">claude-v1</option>
<option value="claude-v1-100k">claude-v1-100k</option> <option value="claude-v1-100k">claude-v1-100k</option>
<option value="claude-instant-v1">claude-instant-v1</option> <option value="claude-instant-v1">claude-instant-v1</option>
@ -13550,11 +13608,21 @@ Current version: 120
<option value="claude-2" selected="selected">claude-2</option> <option value="claude-2" selected="selected">claude-2</option>
<option value="claude-2.1">claude-2.1</option> <option value="claude-2.1">claude-2.1</option>
<option value="claude-2.0">claude-2.0</option> <option value="claude-2.0">claude-2.0</option>
<option value="claude-3-opus-20240229">claude-3-opus</option>
<option value="claude-3-sonnet-20240229">claude-3-sonnet</option>
</select> </select>
<input type="checkbox" id="claudeaddversion" onchange="" checked> <input type="checkbox" id="claudeaddversion" onchange="" checked>
<div class="box-label" title="Add endpoint version">Add Endpoint Version</div> <div class="box-label" title="Add endpoint version">Add Endpoint Version</div>
<span id="clauderenamecompatdiv">
<input type="checkbox" id="clauderenamecompat" onchange="" checked> <input type="checkbox" id="clauderenamecompat" onchange="" checked>
<div class="box-label" title="Rename User and Bot tags to work with claude, force inject them otherwise">Claude Compatibility Rename Fix</div> <div class="box-label" title="Rename User and Bot tags to work with claude, force inject them otherwise">Claude Compatibility Rename Fix</div>
</span>
<input class="form-control hidden" type="text" id="claudesystemprompt" placeholder="(Enter System Prompt)"
value="" onload="">
<input class="form-control hidden" type="text" id="claudejailbreakprompt" placeholder="(Enter Assistant Postfix)"
value="" onload="">
</div> </div>
<div id="palmcustom" class="aidgpopuplistheader anotelabel hidden"> <div id="palmcustom" class="aidgpopuplistheader anotelabel hidden">
Uses Gemini or PaLM Text Bison by Google.<br><br> Uses Gemini or PaLM Text Bison by Google.<br><br>
@ -13989,7 +14057,7 @@ Current version: 120
<div class="settinglabel"> <div class="settinglabel">
<div class="justifyleft settingsmall">Generate Images <span class="helpicon">?<span class="helptext">Use the AI Horde or a local A1111 instance to insert AI generated images into your story.</span></span></div> <div class="justifyleft settingsmall">Generate Images <span class="helpicon">?<span class="helptext">Use the AI Horde or a local A1111 instance to insert AI generated images into your story.</span></span></div>
</div> </div>
<select class="form-control" id="generate_images_mode" style="height:20px;padding:0;margin:0px 0 0;" onchange="toggle_generate_images_mode()"> <select class="form-control" id="generate_images_mode" style="height:20px;padding:0;margin:0px 0 0;" onchange="toggle_generate_images_mode(true)">
<option value="0">[Disabled]</option> <option value="0">[Disabled]</option>
<option value="1">AI Horde</option> <option value="1">AI Horde</option>
<option value="2">Local A1111</option> <option value="2">Local A1111</option>