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

Merge branch 'feature/use-consistent-file-name-in-gradio' into jpg_config_image_extension

Browse Source 
# Conflicts:
#	modules/async_worker.py
#	modules/private_logger.py
This commit is contained in:
Manuel Schmid
2024-01-14 21:47:05 +01:00
parent 26f31ff2bd eeb57f3ff5
commit dc6c02540a
5 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/async_worker.py
+5 -4
View File
@@ -513,8 +513,8 @@ def worker():
if direct_return:
d = [('Upscale (Fast)', '2x')]
log(uov_input_image, d, image_extension)
yield_result(async_task, uov_input_image, do_not_show_finished_images=True)
uov_input_image_path = log(uov_input_image, d, image_extension)
yield_result(async_task, uov_input_image_path, do_not_show_finished_images=True)
return
tiled = True
@@ -776,6 +776,7 @@ def worker():
if inpaint_worker.current_task is not None:
imgs = [inpaint_worker.current_task.post_process(x) for x in imgs]
img_paths = []
for x in imgs:
d = [
('Prompt', task['log_positive_prompt']),
@@ -801,9 +802,9 @@ def worker():
if n != 'None':
d.append((f'LoRA {li + 1}', f'{n} : {w}'))
d.append(('Version', 'v' + fooocus_version.version))
log(x, d, image_extension)
img_paths.append(log(x, d, image_extension))
yield_result(async_task, imgs, do_not_show_finished_images=len(tasks) == 1)
yield_result(async_task, img_paths, do_not_show_finished_images=len(tasks) == 1)
except ldm_patched.modules.model_management.InterruptProcessingException as e:
if shared.last_stop == 'skip':
print('User skipped')