mirrors/Fooocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put user styles on top + wild card seed

Browse Source
This commit is contained in:
lllyasviel 2023-10-17 01:42:51 -07:00
parent 9ec2f66fbe
commit 5e3728c839
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fooocus_version.py
View File

@ -1 +1 @@
version = '2.1.691' version = '2.1.692'

18
modules/sdxl_styles.py
View File

@ -1,6 +1,7 @@
import os import os
import json
import re import re
import random
import json
from modules.util import get_files_from_folder from modules.util import get_files_from_folder
@ -24,16 +25,15 @@ def normalize_key(k):
styles = {} styles = {}
styles_files = [ styles_files = get_files_from_folder(styles_path, ['.json'])
'sdxl_styles_fooocus.json',
for x in ['sdxl_styles_fooocus.json',
'sdxl_styles_sai.json', 'sdxl_styles_sai.json',
'sdxl_styles_mre.json', 'sdxl_styles_mre.json',
'sdxl_styles_twri.json', 'sdxl_styles_twri.json',
'sdxl_styles_diva.json' 'sdxl_styles_diva.json']:
] if x in styles_files:
styles_files.remove(x)
for x in get_files_from_folder(styles_path, ['.json']):
if x not in styles_files:
styles_files.append(x) styles_files.append(x)
for styles_file in styles_files: for styles_file in styles_files:
@ -104,7 +104,7 @@ def apply_wildcards(wildcard_text, seed=None, directory=wildcards_path):
try: try:
words = open(os.path.join(directory, f'{placeholder}.txt'), encoding='utf-8').read().splitlines() words = open(os.path.join(directory, f'{placeholder}.txt'), encoding='utf-8').read().splitlines()
words = [x for x in words if x != ''] words = [x for x in words if x != '']
wildcard_text = wildcard_text.replace(f'__{placeholder}__', words[int(seed) % len(words)]) wildcard_text = wildcard_text.replace(f'__{placeholder}__', random.Random(seed).choice(words))
except IOError: except IOError:
print(f'Error: could not open wildcard file {placeholder}.txt, using as normal word.') print(f'Error: could not open wildcard file {placeholder}.txt, using as normal word.')
wildcard_text = wildcard_text.replace(f'__{placeholder}__', placeholder) wildcard_text = wildcard_text.replace(f'__{placeholder}__', placeholder)