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

Fix loading for type

Browse Source
This commit is contained in:
somebody
2022-11-12 21:33:31 -06:00
parent d7110840ef
commit 61fd06d0c7
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
koboldai_settings.py
View File

@@ -1727,7 +1727,7 @@ class KoboldWorldInfo(object):
self.socketio.emit("world_info_folder", {x: self.world_info_folder[x] for x in self.world_info_folder}, broadcast=True, room="UI_2") self.socketio.emit("world_info_folder", {x: self.world_info_folder[x] for x in self.world_info_folder}, broadcast=True, room="UI_2")
def add_item(self, title, key, keysecondary, folder, constant, manual_text, def add_item(self, title, key, keysecondary, folder, constant, manual_text,
comment, wi_type="World Info", use_wpp=False, comment, wi_type="wi", use_wpp=False,
wpp={'name': "", 'type': "", 'format': "W++", 'attributes': {}}, wpp={'name': "", 'type': "", 'format': "W++", 'attributes': {}},
v1_uid=None, recalc=True, sync=True, send_to_ui=True): v1_uid=None, recalc=True, sync=True, send_to_ui=True):
if len(self.world_info) == 0: if len(self.world_info) == 0:
@@ -1928,10 +1928,19 @@ class KoboldWorldInfo(object):
"images": self.image_store "images": self.image_store
} }
def upgrade_entry(self, wi_entry: dict) -> dict:
# If we do not have a type, or it is incorrect, set to WI.
if wi_entry.get("type") not in ["constant", "chatcharacter", "wi"]:
wi_entry["type"] = "wi"
return wi_entry
def load_json(self, data, folder=None): def load_json(self, data, folder=None):
if "images" in data: if "images" in data:
self.image_store = data["images"] self.image_store = data["images"]
data["entries"] = {k: self.upgrade_entry(v) for k,v in data["entries"].items()}
if folder is None: if folder is None:
self.world_info = {int(x): data['entries'][x] for x in data['entries']} self.world_info = {int(x): data['entries'][x] for x in data['entries']}
self.world_info_folder = data['folders'] self.world_info_folder = data['folders']
@@ -1939,6 +1948,7 @@ class KoboldWorldInfo(object):
#Add the item #Add the item
for uid, item in data['entries'].items(): for uid, item in data['entries'].items():
start_time = time.time() start_time = time.time()
self.add_item(item['title'] if 'title' in item else item['key'][0], self.add_item(item['title'] if 'title' in item else item['key'][0],
item['key'] if 'key' in item else [], item['key'] if 'key' in item else [],
item['keysecondary'] if 'keysecondary' in item else [], item['keysecondary'] if 'keysecondary' in item else [],
@@ -1946,7 +1956,7 @@ class KoboldWorldInfo(object):
item['constant'] if 'constant' in item else False, item['constant'] if 'constant' in item else False,
item['manual_text'] if 'manual_text' in item else item['content'], item['manual_text'] if 'manual_text' in item else item['content'],
item['comment'] if 'comment' in item else '', item['comment'] if 'comment' in item else '',
item.get('type', "World Info"), wi_type=item["type"],
use_wpp=item['use_wpp'] if 'use_wpp' in item else False, use_wpp=item['use_wpp'] if 'use_wpp' in item else False,
wpp=item['wpp'] if 'wpp' in item else {'name': "", 'type': "", 'format': "W++", 'attributes': {}}, wpp=item['wpp'] if 'wpp' in item else {'name': "", 'type': "", 'format': "W++", 'attributes': {}},
recalc=False, sync=False) recalc=False, sync=False)

2
static/koboldai.js
View File

@@ -125,7 +125,6 @@ const chat = {
lastEdit: null, lastEdit: null,
get useV2() { get useV2() {
console.log(`v2 Check: style=${this.style} mode=${story.mode}`)
return [ return [
this.STYLES.MESSAGES, this.STYLES.MESSAGES,
this.STYLES.BUBBLES this.STYLES.BUBBLES
@@ -478,7 +477,6 @@ function do_story_text_updates(action) {
} }
function do_prompt(data) { function do_prompt(data) {
console.log("[prompt]", data);
var elements_to_change = document.getElementsByClassName("var_sync_story_prompt"); var elements_to_change = document.getElementsByClassName("var_sync_story_prompt");
for (item of elements_to_change) { for (item of elements_to_change) {
//clear out the item first //clear out the item first