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

Changed image return to show last image rather than returning null if the action doesn't have an image

Browse Source
This commit is contained in:
ebolam
2023-01-19 12:35:55 -05:00
parent 33f7478bf4
commit a0249d7ffa
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
koboldai_settings.py
View File

@@ -2090,8 +2090,8 @@ class KoboldStoryRegister(object):
if self.story_settings.gen_audio and self.koboldai_vars.experimental_features: if self.story_settings.gen_audio and self.koboldai_vars.experimental_features:
for i in reversed([-1]+list(self.actions.keys())): for i in reversed([-1]+list(self.actions.keys())):
self.gen_audio(i, overwrite=False) self.gen_audio(i, overwrite=False)
else: #else:
print("{} and {}".format(self.story_settings.gen_audio, self.koboldai_vars.experimental_features)) # print("{} and {}".format(self.story_settings.gen_audio, self.koboldai_vars.experimental_features))
def set_picture(self, action_id, filename, prompt): def set_picture(self, action_id, filename, prompt):
if action_id == -1: if action_id == -1:
@@ -2111,6 +2111,21 @@ class KoboldStoryRegister(object):
filename = os.path.join(self.koboldai_vars.save_paths.generated_images, self.actions[action_id]['picture_filename']) filename = os.path.join(self.koboldai_vars.save_paths.generated_images, self.actions[action_id]['picture_filename'])
prompt = self.actions[action_id]['picture_prompt'] prompt = self.actions[action_id]['picture_prompt']
else: else:
#Let's find the last picture if there is one
found = False
for i in reversed(range(-1, action_id)):
if i in self.actions and 'picture_filename' in self.actions[i]:
filename = os.path.join(self.koboldai_vars.save_paths.generated_images, self.actions[i]['picture_filename'])
prompt = self.actions[i]['picture_prompt']
found = True
break
elif i == -1:
if self.story_settings.prompt_picture_filename == "":
return None, None
filename = os.path.join(self.koboldai_vars.save_paths.generated_images, self.story_settings.prompt_picture_filename)
prompt = self.story_settings.prompt_picture_prompt
found = True
if not found:
return None, None return None, None
if os.path.exists(filename): if os.path.exists(filename):