happyz
/
Fooocus
mirror of https://github.com/lllyasviel/Fooocus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ling

This commit is contained in:
lllyasviel 2023-10-17 00:10:32 -07:00
parent ef4e120d0a
commit e3ac360396
2 changed files with 3 additions and 8 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.689'
version = '2.1.690'

9
modules/sdxl_styles.py
View File

@ -1,8 +1,6 @@
import os
import json
import re
import random
from modules.util import get_files_from_folder
@ -121,11 +119,8 @@ def apply_wildcards(wildcard_text, seed=None, directory=wildcards_path):
placeholders = re.findall(r'__(\w+)__', wildcard_text)
for placeholder in placeholders:
try:
with open(os.path.join(directory, f'{placeholder}.txt'), encoding='utf-8') as f:
words = f.read().splitlines()
rng = random.Random(seed)
wildcard_text = re.sub(rf'__{placeholder}__', rng.choice(words), wildcard_text)
words = open(os.path.join(directory, f'{placeholder}.txt'), encoding='utf-8').read().splitlines()
wildcard_text = wildcard_text.replace(f'__{placeholder}__', words[int(seed) % len(words)])
except IOError:
print(f'Error: could not open wildcard file {placeholder}.txt, using as normal word.')
wildcard_text = wildcard_text.replace(f'__{placeholder}__', placeholder)