Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

update backend + revise styles

Browse Source 
update backend + revise styles
This commit is contained in:
lllyasviel
2023-10-26 08:24:45 -07:00
parent 214c2ba04c
commit 175f3e3040
8 changed files with 51 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/async_worker.py
+4 -4
View File
@@ -210,8 +210,8 @@ def worker():
if not skip_prompt_processing:
prompts = remove_empty_str([safe_str(p) for p in prompt.split('\n')], default='')
negative_prompts = remove_empty_str([safe_str(p) for p in negative_prompt.split('\n')], default='')
prompts = remove_empty_str([safe_str(p) for p in prompt.splitlines()], default='')
negative_prompts = remove_empty_str([safe_str(p) for p in negative_prompt.splitlines()], default='')
prompt = prompts[0]
negative_prompt = negative_prompts[0]
@@ -239,8 +239,8 @@ def worker():
if use_style:
for s in style_selections:
p, n = apply_style(s, positive=task_prompt)
positive_basic_workloads.append(p)
negative_basic_workloads.append(n)
positive_basic_workloads += p
negative_basic_workloads += n
else:
positive_basic_workloads.append(task_prompt)
modules/sdxl_styles.py
+4 -2
View File
@@ -40,7 +40,9 @@ for styles_file in styles_files:
try:
with open(os.path.join(styles_path, styles_file), encoding='utf-8') as f:
for entry in json.load(f):
name, prompt, negative_prompt = normalize_key(entry['name']), entry['prompt'], entry['negative_prompt']
name = normalize_key(entry['name'])
prompt = entry['prompt'] if 'prompt' in entry else ''
negative_prompt = entry['negative_prompt'] if 'negative_prompt' in entry else ''
styles[name] = (prompt, negative_prompt)
except Exception as e:
print(str(e))
@@ -53,7 +55,7 @@ legal_style_names = [fooocus_expansion] + style_keys
def apply_style(style, positive):
p, n = styles[style]
return p.replace('{prompt}', positive), n
return p.replace('{prompt}', positive).splitlines(), n.splitlines()
def apply_wildcards(wildcard_text, rng, directory=wildcards_path):