rixty/KoboldAI-Client
1
1
Fork 0
mirror of https://github.com/KoboldAI/KoboldAI-Client.git synced 2025-06-05 21:59:24 +02:00
Code Issues Projects Releases Wiki Activity

Bug fix for world info highlighting

Browse Source
This commit is contained in:
ebolam
2022-09-22 14:21:06 -04:00
parent 2fb1214709
commit 942839d48d
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
koboldai_settings.py
View File

@@ -145,7 +145,7 @@ class koboldai_vars(object):
for wi in self.worldinfo_v2: for wi in self.worldinfo_v2:
if wi['constant']: if wi['constant']:
if used_tokens+0 if 'token_length' not in wi else wi['token_length'] <= token_budget: if used_tokens+0 if 'token_length' not in wi else wi['token_length'] <= token_budget:
used_tokens+=wi['token_length'] used_tokens+=0 if wi['token_length'] is None else wi['token_length']
used_world_info.append(wi['uid']) used_world_info.append(wi['uid'])
self.worldinfo_v2.set_world_info_used(wi['uid']) self.worldinfo_v2.set_world_info_used(wi['uid'])
wi_text = wi['content'] wi_text = wi['content']
@@ -226,7 +226,7 @@ class koboldai_vars(object):
break break
if match: if match:
if used_tokens+0 if 'token_length' not in wi else wi['token_length'] <= token_budget: if used_tokens+0 if 'token_length' not in wi else wi['token_length'] <= token_budget:
used_tokens+=wi['token_length'] used_tokens+=0 if wi['token_length'] is None else wi['token_length']
used_world_info.append(wi['uid']) used_world_info.append(wi['uid'])
wi_text = wi['content'] wi_text = wi['content']
context.append({"type": "world_info", "text": wi_text}) context.append({"type": "world_info", "text": wi_text})
@@ -291,7 +291,7 @@ class koboldai_vars(object):
match = False match = False
if match: if match:
if used_tokens+0 if 'token_length' not in wi or wi['token_length'] is None else wi['token_length'] <= token_budget: if used_tokens+0 if 'token_length' not in wi or wi['token_length'] is None else wi['token_length'] <= token_budget:
used_tokens+=wi['token_length'] used_tokens+=0 if wi['token_length'] is None else wi['token_length']
used_world_info.append(wi['uid']) used_world_info.append(wi['uid'])
wi_text = wi["content"] wi_text = wi["content"]
if method == 1: if method == 1:
@@ -342,7 +342,7 @@ class koboldai_vars(object):
break break
if match: if match:
if used_tokens+0 if 'token_length' not in wi else wi['token_length'] <= token_budget: if used_tokens+0 if 'token_length' not in wi else wi['token_length'] <= token_budget:
used_tokens+=wi['token_length'] used_tokens+=0 if wi['token_length'] is None else wi['token_length']
used_world_info.append(wi['uid']) used_world_info.append(wi['uid'])
wi_text = wi['content'] wi_text = wi['content']
context.append({"type": "world_info", "text": wi_text}) context.append({"type": "world_info", "text": wi_text})

29
static/koboldai.js
View File

@@ -3113,39 +3113,50 @@ function highlight_world_info_text_in_chunk(action, wi) {
var to_check = words.slice(i, i+len_of_keyword).join(" ").replace(/[^0-9a-z \'\"]/gi, '').trim(); var to_check = words.slice(i, i+len_of_keyword).join(" ").replace(/[^0-9a-z \'\"]/gi, '').trim();
if (largest_key == to_check) { if (largest_key == to_check) {
var start_word = i; var start_word = i;
var end_word = i+len_of_keyword; var end_word = i+len_of_keyword-1;
var passed_words = 0; var passed_words = 0;
//console.log("Finding "+to_check);
for (span of action.childNodes) { for (span of action.childNodes) {
if (passed_words + span.textContent.split(" ").length < start_word) { //console.log(span);
//console.log("passed_words("+passed_words+")+span("+(span.textContent.trim().split(" ").length)+")<start_word("+start_word+"): "+(passed_words + span.textContent.trim().split(" ").length < start_word));
if (passed_words + span.textContent.trim().split(" ").length < start_word+1) {
passed_words += span.textContent.trim().split(" ").length; passed_words += span.textContent.trim().split(" ").length;
} else if (passed_words < end_word) { } else if (passed_words <= end_word) {
//OK, we have text that matches, let's do the highlighting //OK, we have text that matches, let's do the highlighting
//we can skip the highlighting if it's already done though //we can skip the highlighting if it's already done though
//console.log(span.textContent.trim().split(" "));
//console.log("start_word: "+start_word+" end_word: "+end_word+" passed_words: "+passed_words);
//console.log(span.textContent.trim().split(" ").slice(start_word-passed_words, end_word-passed_words+1).join(" "));
if (~(span.classList.contains('wi_match'))) { if (~(span.classList.contains('wi_match'))) {
var span_text = span.textContent.trim().split(" "); var span_text = span.textContent.trim().split(" ");
//console.log(span_text);
if (start_word-passed_words == 0) {
var before_highlight_text = "";
} else {
var before_highlight_text = span_text.slice(0, start_word-passed_words).join(" ")+" "; var before_highlight_text = span_text.slice(0, start_word-passed_words).join(" ")+" ";
var highlight_text = span_text.slice(start_word-passed_words, end_word-passed_words).join(" "); }
if (end_word-passed_words <= span_text.length) { var highlight_text = span_text.slice(start_word-passed_words, end_word-passed_words+1).join(" ");
if (end_word-passed_words-1 <= span_text.length) {
highlight_text += " "; highlight_text += " ";
} }
var after_highlight_text = span_text.slice((end_word-passed_words)).join(" ")+" "; var after_highlight_text = span_text.slice((end_word-passed_words+1)).join(" ")+" ";
if (after_highlight_text[0] == ' ') { if (after_highlight_text[0] == ' ') {
after_highlight_text = after_highlight_text.substring(1); after_highlight_text = after_highlight_text.substring(1);
} }
if (before_highlight_text != "") { if (before_highlight_text != "") {
//console.log("'"+before_highlight_text+"'"); //console.log("Before Text:'"+before_highlight_text+"'");
var before_span = document.createElement("span"); var before_span = document.createElement("span");
before_span.textContent = before_highlight_text; before_span.textContent = before_highlight_text;
action.insertBefore(before_span, span); action.insertBefore(before_span, span);
} }
//console.log("'"+highlight_text+"'"); //console.log("Highlight Text: '"+highlight_text+"'");
var hightlight_span = document.createElement("span"); var hightlight_span = document.createElement("span");
hightlight_span.classList.add("wi_match"); hightlight_span.classList.add("wi_match");
hightlight_span.textContent = highlight_text; hightlight_span.textContent = highlight_text;
hightlight_span.title = wi['content']; hightlight_span.title = wi['content'];
action.insertBefore(hightlight_span, span); action.insertBefore(hightlight_span, span);
if (after_highlight_text != "") { if (after_highlight_text != "") {
//console.log("'"+after_highlight_text+"'"); //console.log("After Text: '"+after_highlight_text+"'");
var after_span = document.createElement("span"); var after_span = document.createElement("span");
after_span.textContent = after_highlight_text; after_span.textContent = after_highlight_text;
action.insertBefore(after_span, span); action.insertBefore(after_span, span);