mirror of
https://github.com/lllyasviel/Fooocus.git
synced 2026-08-16 13:13:16 +02:00
ling
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
|||||||
version = '2.1.689'
|
version = '2.1.690'
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
import os
|
import os
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
import random
|
|
||||||
|
|
||||||
|
|
||||||
from modules.util import get_files_from_folder
|
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)
|
placeholders = re.findall(r'__(\w+)__', wildcard_text)
|
||||||
for placeholder in placeholders:
|
for placeholder in placeholders:
|
||||||
try:
|
try:
|
||||||
with open(os.path.join(directory, f'{placeholder}.txt'), encoding='utf-8') as f:
|
words = open(os.path.join(directory, f'{placeholder}.txt'), encoding='utf-8').read().splitlines()
|
||||||
words = f.read().splitlines()
|
wildcard_text = wildcard_text.replace(f'__{placeholder}__', words[int(seed) % len(words)])
|
||||||
|
|
||||||
rng = random.Random(seed)
|
|
||||||
wildcard_text = re.sub(rf'__{placeholder}__', rng.choice(words), wildcard_text)
|
|
||||||
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)
|
||||||
|
|||||||
Reference in New Issue
Block a user