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

fix: move current_task_id increase to handler again

Browse Source 
allows access of correct value by callback, does not show 2/1 anymore
This commit is contained in:
Manuel Schmid
2024-06-26 21:04:39 +02:00
parent b3a4b4e532
commit 96306616bb
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/async_worker.py
+3 -2
View File
@@ -1029,7 +1029,6 @@ def worker():
# reset inpaint worker to prevent tensor size issues and not mix upscale and inpainting # reset inpaint worker to prevent tensor size issues and not mix upscale and inpainting
inpaint_worker.current_task = None inpaint_worker.current_task = None
current_task_id += 1
current_progress = int(base_progress + (100 - preparation_steps) / float(all_steps) * (done_steps_upscaling + done_steps_inpainting)) current_progress = int(base_progress + (100 - preparation_steps) / float(all_steps) * (done_steps_upscaling + done_steps_inpainting))
goals_enhance = [] goals_enhance = []
img, skip_prompt_processing, steps = prepare_upscale( img, skip_prompt_processing, steps = prepare_upscale(
@@ -1314,7 +1313,7 @@ def worker():
total_count = len(images_to_enhance) * active_enhance_tabs total_count = len(images_to_enhance) * active_enhance_tabs
base_progress = current_progress base_progress = current_progress
current_task_id = 0 current_task_id = -1
done_steps_upscaling = 0 done_steps_upscaling = 0
done_steps_inpainting = 0 done_steps_inpainting = 0
enhance_steps, _, _, _ = apply_overrides(async_task, async_task.original_steps, height, width) enhance_steps, _, _, _ = apply_overrides(async_task, async_task.original_steps, height, width)
@@ -1325,6 +1324,7 @@ def worker():
last_enhance_negative_prompt = async_task.negative_prompt last_enhance_negative_prompt = async_task.negative_prompt
if should_process_enhance_uov and async_task.enhance_uov_processing_order == flags.enhancement_uov_before: if should_process_enhance_uov and async_task.enhance_uov_processing_order == flags.enhancement_uov_before:
current_task_id += 1
current_task_id, done_steps_inpainting, done_steps_upscaling, img, exception_result = enhance_upscale( current_task_id, done_steps_inpainting, done_steps_upscaling, img, exception_result = enhance_upscale(
all_steps, async_task, base_progress, callback, controlnet_canny_path, controlnet_cpds_path, all_steps, async_task, base_progress, callback, controlnet_canny_path, controlnet_cpds_path,
current_task_id, denoising_strength, done_steps_inpainting, done_steps_upscaling, enhance_steps, current_task_id, denoising_strength, done_steps_inpainting, done_steps_upscaling, enhance_steps,
@@ -1414,6 +1414,7 @@ def worker():
print(f'Enhancement time: {enhancement_task_time:.2f} seconds') print(f'Enhancement time: {enhancement_task_time:.2f} seconds')
if should_process_enhance_uov and async_task.enhance_uov_processing_order == flags.enhancement_uov_after: if should_process_enhance_uov and async_task.enhance_uov_processing_order == flags.enhancement_uov_after:
current_task_id += 1
current_task_id, done_steps_inpainting, done_steps_upscaling, img, exception_result = enhance_upscale( current_task_id, done_steps_inpainting, done_steps_upscaling, img, exception_result = enhance_upscale(
all_steps, async_task, base_progress, callback, controlnet_canny_path, controlnet_cpds_path, all_steps, async_task, base_progress, callback, controlnet_canny_path, controlnet_cpds_path,
current_task_id, denoising_strength, done_steps_inpainting, done_steps_upscaling, enhance_steps, current_task_id, denoising_strength, done_steps_inpainting, done_steps_upscaling, enhance_steps,