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

Working sentence splits for AI context for actions only (ignores prompt)

Browse Source
This commit is contained in:
ebolam
2022-09-22 10:55:30 -04:00
parent bfc46bb2e9
commit faed1444ef
1 changed files with 80 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
koboldai_settings.py
View File

@@ -199,45 +199,88 @@ class koboldai_vars(object):
game_context = [] game_context = []
authors_note_final = self.authornotetemplate.replace("<|>", self.authornote) authors_note_final = self.authornotetemplate.replace("<|>", self.authornote)
used_all_tokens = False used_all_tokens = False
for i in range(len(self.actions)-1, -1, -1): #we're going to split our actions by sentence for better context. We'll add in which actions the sentence covers
if len(self.actions) - i - 1 == self.andepth and self.authornote != "": if self.actions.action_count >= 0:
game_text = "{}{}".format(authors_note_final, game_text) action_text = str(self.actions)
game_context.insert(0, {"type": "authors_note", "text": authors_note_final}) action_text_split = [[x+" ", []] for x in re.split("(?<=[.!?])\s+", action_text)]
if self.actions.actions[i]["Selected Text Length"]+used_tokens <= token_budget and not used_all_tokens: action_text_split[-1][0] = action_text_split[-1][0][:-1]
used_tokens += self.actions.actions[i]["Selected Text Length"] Action_Position = [0, len(self.actions[0])] #First element is the action item, second is how much text is left
selected_text = self.actions.actions[i]["Selected Text"] Sentence_Position = [0, len(action_text_split[0][0])]
game_text = "{}{}".format(selected_text, game_text) while True:
game_context.insert(0, {"type": "action", "text": selected_text}) advance_action = False
self.actions.set_action_in_ai(i) advance_sentence = False
#Now we need to check for used world info entries if Action_Position[1] <= Sentence_Position[1]:
for wi in self.worldinfo_v2: #We have enough text in the sentence to completely cover the action. Advance it to the next action
if wi['uid'] not in used_world_info: advance_action = True
#Check to see if we have the keys/secondary keys in the text so far if Sentence_Position[1] <= Action_Position[1]:
match = False advance_sentence = True
for key in wi['key']: if Action_Position[0] not in action_text_split[Sentence_Position[0]][1]:
if key in self.actions.actions[i]["Selected Text"]: #Since this action is in the sentence, add it to the list if it's not already there
match = True action_text_split[Sentence_Position[0]][1].append(Action_Position[0])
break #Fix the text length leftovers first since they interact with each other
if wi['selective'] and match: if not advance_action:
Action_Position[1] -= Sentence_Position[1]
if not advance_sentence:
Sentence_Position[1] -= Action_Position[1]
if advance_action:
Action_Position[0] += 1
if Action_Position[0] >= len(self.actions):
break
Action_Position[1] = len(self.actions[Action_Position[0]])
if advance_sentence:
Sentence_Position[0] += 1
if Sentence_Position[0] >= len(action_text_split):
break
Sentence_Position[1] = len(action_text_split[Sentence_Position[0]][0])
#OK, action_text_split now contains a list of [sentence including trailing space if needed, [action IDs that sentence includes]]
for action in range(len(self.actions)):
self.actions.set_action_in_ai(action, used=False)
for i in range(len(action_text_split)-1, -1, -1):
if len(action_text_split) - i - 1 == self.andepth and self.authornote != "":
game_text = "{}{}".format(authors_note_final, game_text)
game_context.insert(0, {"type": "authors_note", "text": authors_note_final})
length = 0 if self.tokenizer is None else len(self.tokenizer.encode(action_text_split[i][0]))
if length+used_tokens <= token_budget and not used_all_tokens:
used_tokens += length
selected_text = action_text_split[i][0]
game_text = "{}{}".format(selected_text, game_text)
game_context.insert(0, {"type": "action", "text": selected_text})
for action in action_text_split[i][1]:
self.actions.set_action_in_ai(action)
#Now we need to check for used world info entries
for wi in self.worldinfo_v2:
if wi['uid'] not in used_world_info:
#Check to see if we have the keys/secondary keys in the text so far
match = False match = False
for key in wi['keysecondary']: for key in wi['key']:
if key in self.actions.actions[i]["Selected Text"]: if key in selected_text:
match=True match = True
break break
if match: if wi['selective'] and match:
if used_tokens+0 if 'token_length' not in wi or wi['token_length'] is None else wi['token_length'] <= token_budget: match = False
used_tokens+=wi['token_length'] for key in wi['keysecondary']:
used_world_info.append(wi['uid']) if key in selected_text:
wi_text = wi["content"] match=True
game_text = "{}{}".format(wi_text, game_text) break
game_context.insert(0, {"type": "world_info", "text": wi_text}) if match:
self.worldinfo_v2.set_world_info_used(wi['uid']) if used_tokens+0 if 'token_length' not in wi or wi['token_length'] is None else wi['token_length'] <= token_budget:
else: used_tokens+=wi['token_length']
self.actions.set_action_in_ai(i, used=False) used_world_info.append(wi['uid'])
used_all_tokens = True wi_text = wi["content"]
game_text = "{}{}".format(wi_text, game_text)
game_context.insert(0, {"type": "world_info", "text": wi_text})
self.worldinfo_v2.set_world_info_used(wi['uid'])
else:
used_all_tokens = True
else:
action_text_split = []
#if we don't have enough actions to get to author's note depth then we just add it right before the game text #if we don't have enough actions to get to author's note depth then we just add it right before the game text
if len(self.actions) < self.andepth and self.authornote != "": if len(action_text_split) < self.andepth and self.authornote != "":
game_text = "{}{}".format(authors_note_final, game_text) game_text = "{}{}".format(authors_note_final, game_text)
game_context.insert(0, {"type": "authors_note", "text": authors_note_final}) game_context.insert(0, {"type": "authors_note", "text": authors_note_final})
@@ -448,7 +491,7 @@ class model_settings(settings):
self.horde_wait_time = 0 self.horde_wait_time = 0
self.horde_queue_position = 0 self.horde_queue_position = 0
self.horde_queue_size = 0 self.horde_queue_size = 0
self.cluster_requested_models = [] # The models which we allow to generate during cluster mode
#dummy class to eat the tqdm output #dummy class to eat the tqdm output
@@ -722,6 +765,7 @@ class user_settings(settings):
self.beep_on_complete = False self.beep_on_complete = False
self.img_gen_priority = 1 self.img_gen_priority = 1
self.show_budget = False self.show_budget = False
self.cluster_requested_models = [] # The models which we allow to generate during cluster mode
def __setattr__(self, name, value): def __setattr__(self, name, value):