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 for editting an action with a matched world info

Browse Source
This commit is contained in:
ebolam
2023-01-10 20:15:26 -05:00
parent 489c1ffd80
commit bd72b05e12
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
koboldai_settings.py
View File

@@ -1020,8 +1020,10 @@ class story_settings(settings):
logger.debug("Calcing WI Assignment for action_id: {} wuid: {}".format(action_id, wuid))
if action_id != -1 and (action_id is None or action_id not in self.actions.actions):
actions_to_check = self.actions.actions
else:
elif action_id == -1:
actions_to_check = {}
else:
actions_to_check = {action_id: self.actions.actions[action_id]}
if wuid is None or wuid not in self.worldinfo_v2.world_info:
wi_to_check = self.worldinfo_v2.world_info
else:
@@ -1369,6 +1371,7 @@ class KoboldStoryRegister(object):
def add_wi_to_action(self, action_id, key, content, uid, no_transmit=False):
old = self.story_settings.prompt_wi_highlighted_text.copy() if action_id == -1 else self.actions[action_id].copy()
force_changed = False
#First check to see if we have the wi_highlighted_text variable
if action_id != -1:
if 'wi_highlighted_text' not in self.actions[action_id]:
@@ -1399,14 +1402,18 @@ class KoboldStoryRegister(object):
if post_text is not None:
action.insert(i+adder, {"text": post_text, "WI matches": None, "WI Text": ""})
break;
elif action[i]['WI matches'] == uid:
action[i]['WI Text'] = content
force_changed = True
i+=1
else:
i+=1
if action_id != -1:
if old != self.actions[action_id]:
if old != self.actions[action_id] or force_changed:
if not no_transmit:
process_variable_changes(self.socketio, "story", 'actions', {"id": action_id, 'action': self.actions[action_id]}, old)
else:
if old != self.story_settings.prompt_wi_highlighted_text:
if old != self.story_settings.prompt_wi_highlighted_text or force_changed:
if not no_transmit:
process_variable_changes(self.socketio, "story", 'prompt_wi_highlighted_text', self.story_settings.prompt_wi_highlighted_text, old)
@@ -1451,6 +1458,8 @@ class KoboldStoryRegister(object):
old_text = self.actions[i]["Selected Text"]
if self.actions[i]["Selected Text"] != text:
self.actions[i]["Selected Text"] = text
if 'wi_highlighted_text' in self.actions[i]:
del self.actions[i]['wi_highlighted_text']
if self.koboldai_vars.tokenizer is not None:
tokens = self.koboldai_vars.tokenizer.encode(text)
if 'Probabilities' in self.actions[i]: