From 2e8cff296efdabf4f0616626605c3969e637630d Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Sun, 21 Jul 2024 11:49:28 +0200 Subject: [PATCH 01/13] fix: correctly debug preprocessor again (#3332) fixes https://github.com/lllyasviel/Fooocus/issues/3327 as discussed in https://github.com/lllyasviel/Fooocus/discussions/3323 add missing inheritance for EarlyReturnException from BaseException to correctly throw and catch --- modules/async_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/async_worker.py b/modules/async_worker.py index 71cfba3f5..66b3d8956 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -158,7 +158,7 @@ def __init__(self, args): async_tasks = [] -class EarlyReturnException: +class EarlyReturnException(BaseException): pass From 56928b769b7b22956a96afffdfcca2f404d1c0f6 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Sun, 21 Jul 2024 12:31:17 +0200 Subject: [PATCH 02/13] docs: update attributes and add add inline prompt features section to readme --- readme.md | 146 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 110 insertions(+), 36 deletions(-) diff --git a/readme.md b/readme.md index 39a961027..bc85e02ea 100644 --- a/readme.md +++ b/readme.md @@ -365,52 +365,126 @@ A safer way is just to try "run_anime.bat" or "run_realistic.bat" - they should ### All CMD Flags ``` -entry_with_update.py [-h] [--listen [IP]] [--port PORT] - [--disable-header-check [ORIGIN]] - [--web-upload-size WEB_UPLOAD_SIZE] - [--hf-mirror HF_MIRROR] - [--external-working-path PATH [PATH ...]] - [--output-path OUTPUT_PATH] - [--temp-path TEMP_PATH] - [--cache-path CACHE_PATH] [--in-browser] - [--disable-in-browser] - [--gpu-device-id DEVICE_ID] - [--async-cuda-allocation | --disable-async-cuda-allocation] - [--disable-attention-upcast] - [--all-in-fp32 | --all-in-fp16] - [--unet-in-bf16 | --unet-in-fp16 | --unet-in-fp8-e4m3fn | --unet-in-fp8-e5m2] - [--vae-in-fp16 | --vae-in-fp32 | --vae-in-bf16] - [--vae-in-cpu] - [--clip-in-fp8-e4m3fn | --clip-in-fp8-e5m2 | --clip-in-fp16 | --clip-in-fp32] - [--directml [DIRECTML_DEVICE]] - [--disable-ipex-hijack] - [--preview-option [none,auto,fast,taesd]] - [--attention-split | --attention-quad | --attention-pytorch] - [--disable-xformers] - [--always-gpu | --always-high-vram | --always-normal-vram | - --always-low-vram | --always-no-vram | --always-cpu [CPU_NUM_THREADS]] - [--always-offload-from-vram] - [--pytorch-deterministic] [--disable-server-log] - [--debug-mode] [--is-windows-embedded-python] - [--disable-server-info] [--multi-user] [--share] - [--preset PRESET] [--disable-preset-selection] - [--language LANGUAGE] - [--disable-offload-from-vram] [--theme THEME] - [--disable-image-log] [--disable-analytics] - [--disable-metadata] [--disable-preset-download] - [--enable-describe-uov-image] - [--always-download-new-model] +entry_with_update.py +options: + -h, --help show this help message and exit + --listen [IP] + --port PORT + --disable-header-check [ORIGIN] + --web-upload-size WEB_UPLOAD_SIZE + --hf-mirror HF_MIRROR + --external-working-path PATH [PATH ...] + --output-path OUTPUT_PATH + --temp-path TEMP_PATH + --cache-path CACHE_PATH + --in-browser + --disable-in-browser + --gpu-device-id DEVICE_ID + --async-cuda-allocation + --disable-async-cuda-allocation + --disable-attention-upcast + --all-in-fp32 + --all-in-fp16 + --unet-in-bf16 + --unet-in-fp16 + --unet-in-fp8-e4m3fn + --unet-in-fp8-e5m2 + --vae-in-fp16 + --vae-in-fp32 + --vae-in-bf16 + --vae-in-cpu + --clip-in-fp8-e4m3fn + --clip-in-fp8-e5m2 + --clip-in-fp16 + --clip-in-fp32 + --directml [DIRECTML_DEVICE] + --disable-ipex-hijack + --preview-option [none,auto,fast,taesd] + --attention-split + --attention-quad + --attention-pytorch + --disable-xformers + --always-gpu + --always-high-vram + --always-normal-vram + --always-low-vram + --always-no-vram + --always-cpu [CPU_NUM_THREADS] + --always-offload-from-vram + --pytorch-deterministic + --disable-server-log + --debug-mode + --is-windows-embedded-python + --disable-server-info + --multi-user + --share Set whether to share on Gradio. + --preset PRESET Apply specified UI preset. + --disable-preset-selection + Disables preset selection in Gradio. + --language LANGUAGE Translate UI using json files in [language] folder. + For example, [--language example] will use + [language/example.json] for translation. + --disable-offload-from-vram + Force loading models to vram when the unload can be + avoided. Some Mac users may need this. + --theme THEME launches the UI with light or dark theme + --disable-image-log Prevent writing images and logs to hard drive. + --disable-analytics Disables analytics for Gradio. + --disable-metadata Disables saving metadata to images. + --disable-preset-download + Disables downloading models for presets + --enable-auto-describe-image + Enables automatic description of uov and enhance image + when prompt is empty + --always-download-new-model + Always download newer models + --rebuild-hash-cache [CPU_NUM_THREADS] + Generates missing model and LoRA hashes. ``` +## Inline Prompt Features + +### Wildcards +Example prompt: `__color__ flower` + +Processed for positive and negative prompt. + +Selects a random wildcard from a predefined list of options, in this case the `wildcards/color.txt` file. +The wildcard will be replaced with a random color (randomness based on seed). +You can also disable randomness and process a wildcard file from top to bottom by enabling the checkbox `Read wildcards in order` in Developer Debug Mode. + +Wildcards can be nested and combined, and multiple wildcards can be used in the same prompt (example see `wildcards/color_flower.txt`). + +### Array Processing +Example prompt: `[[red, green, blue]] flower` + +Processed only for positive prompt. + +Processes the array from left to right, generating a separate image for each element in the array. In this case 3 images would be generated, one for each color. +Increase the image number to 3 to generate all 3 variants. + +Arrays can not be nested, but multiple arrays can be used in the same prompt. +Does support inline LoRAs as array elements! + +### Inline LoRAs + +Example prompt: `flower ` + +Processed only for positive prompt. + +Applies a LoRA to the prompt. The LoRA file must be located in the `models/loras` directory. + + ## Advanced Features [Click here to browse the advanced features.](https://github.com/lllyasviel/Fooocus/discussions/117) +## Forks Fooocus also has many community forks, just like SD-WebUI's [vladmandic/automatic](https://github.com/vladmandic/automatic) and [anapnoe/stable-diffusion-webui-ux](https://github.com/anapnoe/stable-diffusion-webui-ux), for enthusiastic users who want to try! | Fooocus' forks | | - | -| [fenneishi/Fooocus-Control](https://github.com/fenneishi/Fooocus-Control)
[runew0lf/RuinedFooocus](https://github.com/runew0lf/RuinedFooocus)
[MoonRide303/Fooocus-MRE](https://github.com/MoonRide303/Fooocus-MRE)
[metercai/SimpleSDXL](https://github.com/metercai/SimpleSDXL)
and so on ... | +| [fenneishi/Fooocus-Control](https://github.com/fenneishi/Fooocus-Control)
[runew0lf/RuinedFooocus](https://github.com/runew0lf/RuinedFooocus)
[MoonRide303/Fooocus-MRE](https://github.com/MoonRide303/Fooocus-MRE)
[metercai/SimpleSDXL](https://github.com/metercai/SimpleSDXL)
[mashb1t/Fooocus](https://github.com/mashb1t/Fooocus)
and so on ... | See also [About Forking and Promotion of Forks](https://github.com/lllyasviel/Fooocus/discussions/699). From 22620611450ab8640ce4ec3b9ceb5035be03b216 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Sun, 21 Jul 2024 12:36:04 +0200 Subject: [PATCH 03/13] docs: update attributes to better show corresponding mutually exclusive groups --- readme.md | 109 +++++++++++++++++------------------------------------- 1 file changed, 34 insertions(+), 75 deletions(-) diff --git a/readme.md b/readme.md index bc85e02ea..47edf33ef 100644 --- a/readme.md +++ b/readme.md @@ -365,81 +365,40 @@ A safer way is just to try "run_anime.bat" or "run_realistic.bat" - they should ### All CMD Flags ``` -entry_with_update.py -options: - -h, --help show this help message and exit - --listen [IP] - --port PORT - --disable-header-check [ORIGIN] - --web-upload-size WEB_UPLOAD_SIZE - --hf-mirror HF_MIRROR - --external-working-path PATH [PATH ...] - --output-path OUTPUT_PATH - --temp-path TEMP_PATH - --cache-path CACHE_PATH - --in-browser - --disable-in-browser - --gpu-device-id DEVICE_ID - --async-cuda-allocation - --disable-async-cuda-allocation - --disable-attention-upcast - --all-in-fp32 - --all-in-fp16 - --unet-in-bf16 - --unet-in-fp16 - --unet-in-fp8-e4m3fn - --unet-in-fp8-e5m2 - --vae-in-fp16 - --vae-in-fp32 - --vae-in-bf16 - --vae-in-cpu - --clip-in-fp8-e4m3fn - --clip-in-fp8-e5m2 - --clip-in-fp16 - --clip-in-fp32 - --directml [DIRECTML_DEVICE] - --disable-ipex-hijack - --preview-option [none,auto,fast,taesd] - --attention-split - --attention-quad - --attention-pytorch - --disable-xformers - --always-gpu - --always-high-vram - --always-normal-vram - --always-low-vram - --always-no-vram - --always-cpu [CPU_NUM_THREADS] - --always-offload-from-vram - --pytorch-deterministic - --disable-server-log - --debug-mode - --is-windows-embedded-python - --disable-server-info - --multi-user - --share Set whether to share on Gradio. - --preset PRESET Apply specified UI preset. - --disable-preset-selection - Disables preset selection in Gradio. - --language LANGUAGE Translate UI using json files in [language] folder. - For example, [--language example] will use - [language/example.json] for translation. - --disable-offload-from-vram - Force loading models to vram when the unload can be - avoided. Some Mac users may need this. - --theme THEME launches the UI with light or dark theme - --disable-image-log Prevent writing images and logs to hard drive. - --disable-analytics Disables analytics for Gradio. - --disable-metadata Disables saving metadata to images. - --disable-preset-download - Disables downloading models for presets - --enable-auto-describe-image - Enables automatic description of uov and enhance image - when prompt is empty - --always-download-new-model - Always download newer models - --rebuild-hash-cache [CPU_NUM_THREADS] - Generates missing model and LoRA hashes. +entry_with_update.py [-h] [--listen [IP]] [--port PORT] + [--disable-header-check [ORIGIN]] + [--web-upload-size WEB_UPLOAD_SIZE] + [--hf-mirror HF_MIRROR] + [--external-working-path PATH [PATH ...]] + [--output-path OUTPUT_PATH] + [--temp-path TEMP_PATH] [--cache-path CACHE_PATH] + [--in-browser] [--disable-in-browser] + [--gpu-device-id DEVICE_ID] + [--async-cuda-allocation | --disable-async-cuda-allocation] + [--disable-attention-upcast] + [--all-in-fp32 | --all-in-fp16] + [--unet-in-bf16 | --unet-in-fp16 | --unet-in-fp8-e4m3fn | --unet-in-fp8-e5m2] + [--vae-in-fp16 | --vae-in-fp32 | --vae-in-bf16] + [--vae-in-cpu] + [--clip-in-fp8-e4m3fn | --clip-in-fp8-e5m2 | --clip-in-fp16 | --clip-in-fp32] + [--directml [DIRECTML_DEVICE]] + [--disable-ipex-hijack] + [--preview-option [none,auto,fast,taesd]] + [--attention-split | --attention-quad | --attention-pytorch] + [--disable-xformers] + [--always-gpu | --always-high-vram | --always-normal-vram | --always-low-vram | --always-no-vram | --always-cpu [CPU_NUM_THREADS]] + [--always-offload-from-vram] + [--pytorch-deterministic] [--disable-server-log] + [--debug-mode] [--is-windows-embedded-python] + [--disable-server-info] [--multi-user] [--share] + [--preset PRESET] [--disable-preset-selection] + [--language LANGUAGE] + [--disable-offload-from-vram] [--theme THEME] + [--disable-image-log] [--disable-analytics] + [--disable-metadata] [--disable-preset-download] + [--enable-auto-describe-image] + [--always-download-new-model] + [--rebuild-hash-cache [CPU_NUM_THREADS]] ``` ## Inline Prompt Features From 3a20e14ca0bf0e2d4aabd6efa7b9ef9c877e5798 Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Sun, 21 Jul 2024 12:36:54 +0200 Subject: [PATCH 04/13] docs: update attributes and add add inline prompt features section to readme (#3333) * docs: update attributes and add add inline prompt features section to readme * docs: update attributes to better show corresponding mutually exclusive groups --- readme.md | 63 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 15 deletions(-) diff --git a/readme.md b/readme.md index 39a961027..47edf33ef 100644 --- a/readme.md +++ b/readme.md @@ -371,15 +371,14 @@ entry_with_update.py [-h] [--listen [IP]] [--port PORT] [--hf-mirror HF_MIRROR] [--external-working-path PATH [PATH ...]] [--output-path OUTPUT_PATH] - [--temp-path TEMP_PATH] - [--cache-path CACHE_PATH] [--in-browser] - [--disable-in-browser] + [--temp-path TEMP_PATH] [--cache-path CACHE_PATH] + [--in-browser] [--disable-in-browser] [--gpu-device-id DEVICE_ID] [--async-cuda-allocation | --disable-async-cuda-allocation] [--disable-attention-upcast] [--all-in-fp32 | --all-in-fp16] [--unet-in-bf16 | --unet-in-fp16 | --unet-in-fp8-e4m3fn | --unet-in-fp8-e5m2] - [--vae-in-fp16 | --vae-in-fp32 | --vae-in-bf16] + [--vae-in-fp16 | --vae-in-fp32 | --vae-in-bf16] [--vae-in-cpu] [--clip-in-fp8-e4m3fn | --clip-in-fp8-e5m2 | --clip-in-fp16 | --clip-in-fp32] [--directml [DIRECTML_DEVICE]] @@ -387,30 +386,64 @@ entry_with_update.py [-h] [--listen [IP]] [--port PORT] [--preview-option [none,auto,fast,taesd]] [--attention-split | --attention-quad | --attention-pytorch] [--disable-xformers] - [--always-gpu | --always-high-vram | --always-normal-vram | - --always-low-vram | --always-no-vram | --always-cpu [CPU_NUM_THREADS]] + [--always-gpu | --always-high-vram | --always-normal-vram | --always-low-vram | --always-no-vram | --always-cpu [CPU_NUM_THREADS]] [--always-offload-from-vram] - [--pytorch-deterministic] [--disable-server-log] - [--debug-mode] [--is-windows-embedded-python] - [--disable-server-info] [--multi-user] [--share] - [--preset PRESET] [--disable-preset-selection] + [--pytorch-deterministic] [--disable-server-log] + [--debug-mode] [--is-windows-embedded-python] + [--disable-server-info] [--multi-user] [--share] + [--preset PRESET] [--disable-preset-selection] [--language LANGUAGE] - [--disable-offload-from-vram] [--theme THEME] - [--disable-image-log] [--disable-analytics] - [--disable-metadata] [--disable-preset-download] - [--enable-describe-uov-image] + [--disable-offload-from-vram] [--theme THEME] + [--disable-image-log] [--disable-analytics] + [--disable-metadata] [--disable-preset-download] + [--enable-auto-describe-image] [--always-download-new-model] + [--rebuild-hash-cache [CPU_NUM_THREADS]] ``` +## Inline Prompt Features + +### Wildcards +Example prompt: `__color__ flower` + +Processed for positive and negative prompt. + +Selects a random wildcard from a predefined list of options, in this case the `wildcards/color.txt` file. +The wildcard will be replaced with a random color (randomness based on seed). +You can also disable randomness and process a wildcard file from top to bottom by enabling the checkbox `Read wildcards in order` in Developer Debug Mode. + +Wildcards can be nested and combined, and multiple wildcards can be used in the same prompt (example see `wildcards/color_flower.txt`). + +### Array Processing +Example prompt: `[[red, green, blue]] flower` + +Processed only for positive prompt. + +Processes the array from left to right, generating a separate image for each element in the array. In this case 3 images would be generated, one for each color. +Increase the image number to 3 to generate all 3 variants. + +Arrays can not be nested, but multiple arrays can be used in the same prompt. +Does support inline LoRAs as array elements! + +### Inline LoRAs + +Example prompt: `flower ` + +Processed only for positive prompt. + +Applies a LoRA to the prompt. The LoRA file must be located in the `models/loras` directory. + + ## Advanced Features [Click here to browse the advanced features.](https://github.com/lllyasviel/Fooocus/discussions/117) +## Forks Fooocus also has many community forks, just like SD-WebUI's [vladmandic/automatic](https://github.com/vladmandic/automatic) and [anapnoe/stable-diffusion-webui-ux](https://github.com/anapnoe/stable-diffusion-webui-ux), for enthusiastic users who want to try! | Fooocus' forks | | - | -| [fenneishi/Fooocus-Control](https://github.com/fenneishi/Fooocus-Control)
[runew0lf/RuinedFooocus](https://github.com/runew0lf/RuinedFooocus)
[MoonRide303/Fooocus-MRE](https://github.com/MoonRide303/Fooocus-MRE)
[metercai/SimpleSDXL](https://github.com/metercai/SimpleSDXL)
and so on ... | +| [fenneishi/Fooocus-Control](https://github.com/fenneishi/Fooocus-Control)
[runew0lf/RuinedFooocus](https://github.com/runew0lf/RuinedFooocus)
[MoonRide303/Fooocus-MRE](https://github.com/MoonRide303/Fooocus-MRE)
[metercai/SimpleSDXL](https://github.com/metercai/SimpleSDXL)
[mashb1t/Fooocus](https://github.com/mashb1t/Fooocus)
and so on ... | See also [About Forking and Promotion of Forks](https://github.com/lllyasviel/Fooocus/discussions/699). From 37360e95fe0006f4e0e6da27c5330e0e90aba989 Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:12:54 +0200 Subject: [PATCH 05/13] feat: add checkbox, config and handling for saving only the final enhanced image (mashb1t#61) (cherry picked from commit 829a6dc046fedfa570e7261d9b2afcc685acefd3) --- args_manager.py | 2 +- language/en.json | 3 +++ modules/async_worker.py | 52 ++++++++++++++++++++++++--------------- modules/config.py | 6 +++++ modules/private_logger.py | 4 +-- webui.py | 7 ++++++ 6 files changed, 51 insertions(+), 23 deletions(-) diff --git a/args_manager.py b/args_manager.py index f74782cdb..dea851dc4 100644 --- a/args_manager.py +++ b/args_manager.py @@ -17,7 +17,7 @@ args_parser.parser.add_argument("--theme", type=str, help="launches the UI with light or dark theme", default=None) args_parser.parser.add_argument("--disable-image-log", action='store_true', - help="Prevent writing images and logs to hard drive.") + help="Prevent writing images and logs to the outputs folder.") args_parser.parser.add_argument("--disable-analytics", action='store_true', help="Disables analytics for Gradio.") diff --git a/language/en.json b/language/en.json index c14b38758..a0935643a 100644 --- a/language/en.json +++ b/language/en.json @@ -68,6 +68,9 @@ "Read wildcards in order": "Read wildcards in order", "Black Out NSFW": "Black Out NSFW", "Use black image if NSFW is detected.": "Use black image if NSFW is detected.", + "Save only final enhanced image": "Save only final enhanced image", + "Save Metadata to Images": "Save Metadata to Images", + "Adds parameters to generated images allowing manual regeneration.": "Adds parameters to generated images allowing manual regeneration.", "\ud83d\udcda History Log": "\uD83D\uDCDA History Log", "Image Style": "Image Style", "Fooocus V2": "Fooocus V2", diff --git a/modules/async_worker.py b/modules/async_worker.py index 66b3d8956..1d4686b23 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -95,6 +95,7 @@ def __init__(self, args): self.inpaint_advanced_masking_checkbox = args.pop() self.invert_mask_checkbox = args.pop() self.inpaint_erode_or_dilate = args.pop() + self.save_final_enhanced_image_only = args.pop() if not args_manager.args.disable_image_log else False self.save_metadata_to_images = args.pop() if not args_manager.args.disable_metadata else False self.metadata_scheme = MetadataScheme( args.pop()) if not args_manager.args.disable_metadata else MetadataScheme.FOOOCUS @@ -277,7 +278,7 @@ def build_image_wall(async_task): def process_task(all_steps, async_task, callback, controlnet_canny_path, controlnet_cpds_path, current_task_id, denoising_strength, final_scheduler_name, goals, initial_latent, steps, switch, positive_cond, negative_cond, task, loras, tiled, use_expansion, width, height, base_progress, preparation_steps, - total_count, show_intermediate_results): + total_count, show_intermediate_results, persist_image=True): if async_task.last_stop is not False: ldm_patched.modules.model_management.interrupt_current_processing() if 'cn' in goals: @@ -314,9 +315,8 @@ def process_task(all_steps, async_task, callback, controlnet_canny_path, control if modules.config.default_black_out_nsfw or async_task.black_out_nsfw: progressbar(async_task, current_progress, 'Checking for NSFW content ...') imgs = default_censor(imgs) - progressbar(async_task, current_progress, - f'Saving image {current_task_id + 1}/{total_count} to system ...') - img_paths = save_and_log(async_task, height, imgs, task, use_expansion, width, loras) + progressbar(async_task, current_progress, f'Saving image {current_task_id + 1}/{total_count} to system ...') + img_paths = save_and_log(async_task, height, imgs, task, use_expansion, width, loras, persist_image) yield_result(async_task, img_paths, current_progress, async_task.black_out_nsfw, False, do_not_show_finished_images=not show_intermediate_results or async_task.disable_intermediate_results) @@ -332,7 +332,7 @@ def apply_patch_settings(async_task): async_task.adaptive_cfg ) - def save_and_log(async_task, height, imgs, task, use_expansion, width, loras) -> list: + def save_and_log(async_task, height, imgs, task, use_expansion, width, loras, persist_image=True) -> list: img_paths = [] for x in imgs: d = [('Prompt', 'prompt', task['log_positive_prompt']), @@ -387,7 +387,7 @@ def save_and_log(async_task, height, imgs, task, use_expansion, width, loras) -> d.append(('Metadata Scheme', 'metadata_scheme', async_task.metadata_scheme.value if async_task.save_metadata_to_images else async_task.save_metadata_to_images)) d.append(('Version', 'version', 'Fooocus v' + fooocus_version.version)) - img_paths.append(log(x, d, metadata_parser, async_task.output_format, task)) + img_paths.append(log(x, d, metadata_parser, async_task.output_format, task, persist_image)) return img_paths @@ -958,7 +958,7 @@ def process_enhance(all_steps, async_task, callback, controlnet_canny_path, cont inpaint_engine, inpaint_respective_field, inpaint_strength, prompt, negative_prompt, final_scheduler_name, goals, height, img, mask, preparation_steps, steps, switch, tiled, total_count, use_expansion, use_style, - use_synthetic_refiner, width, show_intermediate_results=True): + use_synthetic_refiner, width, show_intermediate_results=True, persist_image=True): base_model_additional_loras = [] inpaint_head_model_path = None inpaint_parameterized = inpaint_engine != 'None' # inpaint_engine = None, improve detail @@ -979,7 +979,7 @@ def process_enhance(all_steps, async_task, callback, controlnet_canny_path, cont progressbar(async_task, current_progress, 'Checking for NSFW content ...') img = default_censor(img) progressbar(async_task, current_progress, f'Saving image {current_task_id + 1}/{total_count} to system ...') - uov_image_path = log(img, d, output_format=async_task.output_format) + uov_image_path = log(img, d, output_format=async_task.output_format, persist_image=persist_image) yield_result(async_task, uov_image_path, current_progress, async_task.black_out_nsfw, False, do_not_show_finished_images=not show_intermediate_results or async_task.disable_intermediate_results) return current_progress, img, prompt, negative_prompt @@ -1013,7 +1013,8 @@ def process_enhance(all_steps, async_task, callback, controlnet_canny_path, cont final_scheduler_name, goals, initial_latent, steps, switch, task_enhance['c'], task_enhance['uc'], task_enhance, loras, tiled, use_expansion, width, height, current_progress, - preparation_steps, total_count, show_intermediate_results) + preparation_steps, total_count, show_intermediate_results, + persist_image) del task_enhance['c'], task_enhance['uc'] # Save memory return current_progress, imgs[0], prompt, negative_prompt @@ -1021,7 +1022,7 @@ def process_enhance(all_steps, async_task, callback, controlnet_canny_path, cont def enhance_upscale(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, prompt, negative_prompt, final_scheduler_name, height, img, preparation_steps, switch, tiled, - total_count, use_expansion, use_style, use_synthetic_refiner, width): + total_count, use_expansion, use_style, use_synthetic_refiner, width, persist_image=True): # reset inpaint worker to prevent tensor size issues and not mix upscale and inpainting inpaint_worker.current_task = None @@ -1039,7 +1040,7 @@ def enhance_upscale(all_steps, async_task, base_progress, callback, controlnet_c controlnet_cpds_path, current_progress, current_task_id, denoising_strength, False, 'None', 0.0, 0.0, prompt, negative_prompt, final_scheduler_name, goals_enhance, height, img, None, preparation_steps, steps, switch, tiled, total_count, - use_expansion, use_style, use_synthetic_refiner, width) + use_expansion, use_style, use_synthetic_refiner, width, persist_image=persist_image) except ldm_patched.modules.model_management.InterruptProcessingException: if async_task.last_stop == 'skip': @@ -1156,6 +1157,8 @@ def handler(async_task: AsyncTask): current_progress += 1 progressbar(async_task, current_progress, 'Image processing ...') + should_enhance = async_task.enhance_checkbox and (async_task.enhance_uov_method != flags.disabled.casefold() or len(async_task.enhance_ctrls) > 0) + if 'vary' in goals: async_task.uov_input_image, denoising_strength, initial_latent, width, height, current_progress = apply_vary( async_task, async_task.uov_method, denoising_strength, async_task.uov_input_image, switch, @@ -1261,8 +1264,8 @@ def callback(step, x0, x, total_steps, y): int(current_progress + async_task.callback_steps), f'Sampling step {step + 1}/{total_steps}, image {current_task_id + 1}/{total_count} ...', y)]) - should_enhance = async_task.enhance_checkbox and (async_task.enhance_uov_method != flags.disabled.casefold() or len(async_task.enhance_ctrls) > 0) show_intermediate_results = len(tasks) > 1 or should_enhance + persist_image = not should_enhance or not async_task.save_final_enhanced_image_only for current_task_id, task in enumerate(tasks): progressbar(async_task, current_progress, f'Preparing task {current_task_id + 1}/{async_task.image_number} ...') @@ -1275,7 +1278,8 @@ def callback(step, x0, x, total_steps, y): initial_latent, async_task.steps, switch, task['c'], task['uc'], task, loras, tiled, use_expansion, width, height, current_progress, preparation_steps, - async_task.image_number, show_intermediate_results) + async_task.image_number, show_intermediate_results, + persist_image) current_progress = int(preparation_steps + (100 - preparation_steps) / float(all_steps) * async_task.steps * (current_task_id + 1)) images_to_enhance += imgs @@ -1302,8 +1306,12 @@ def callback(step, x0, x, total_steps, y): active_enhance_tabs = len(async_task.enhance_ctrls) should_process_enhance_uov = async_task.enhance_uov_method != flags.disabled.casefold() + enhance_uov_before = False + enhance_uov_after = False if should_process_enhance_uov: active_enhance_tabs += 1 + enhance_uov_before = async_task.enhance_uov_processing_order == flags.enhancement_uov_before + enhance_uov_after = async_task.enhance_uov_processing_order == flags.enhancement_uov_after total_count = len(images_to_enhance) * active_enhance_tabs base_progress = current_progress @@ -1318,13 +1326,14 @@ def callback(step, x0, x, total_steps, y): last_enhance_prompt = async_task.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 enhance_uov_before: current_task_id += 1 + persist_image = not async_task.save_final_enhanced_image_only or active_enhance_tabs == 0 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, current_task_id, denoising_strength, done_steps_inpainting, done_steps_upscaling, enhance_steps, async_task.prompt, async_task.negative_prompt, final_scheduler_name, height, img, preparation_steps, - switch, tiled, total_count, use_expansion, use_style, use_synthetic_refiner, width) + switch, tiled, total_count, use_expansion, use_style, use_synthetic_refiner, width, persist_image) if exception_result == 'continue': continue elif exception_result == 'break': @@ -1336,6 +1345,8 @@ def callback(step, x0, x, total_steps, y): current_progress = int(base_progress + (100 - preparation_steps) / float(all_steps) * (done_steps_upscaling + done_steps_inpainting)) progressbar(async_task, current_progress, f'Preparing enhancement {current_task_id + 1}/{total_count} ...') enhancement_task_start_time = time.perf_counter() + is_last_enhance_for_image = (current_task_id + 1) % active_enhance_tabs == 0 and not enhance_uov_after + persist_image = not async_task.save_final_enhanced_image_only or is_last_enhance_for_image extras = {} if enhance_mask_model == 'sam': @@ -1371,8 +1382,7 @@ def callback(step, x0, x, total_steps, y): print(f'[Enhance] {sam_detection_count} segments detected in boxes') print(f'[Enhance] {sam_detection_on_mask_count} segments applied to mask') - if enhance_mask_model == 'sam' and ( - dino_detection_count == 0 or not async_task.debugging_dino and sam_detection_on_mask_count == 0): + if enhance_mask_model == 'sam' and (dino_detection_count == 0 or not async_task.debugging_dino and sam_detection_on_mask_count == 0): print(f'[Enhance] No "{enhance_mask_dino_prompt_text}" detected, skipping') continue @@ -1385,7 +1395,7 @@ def callback(step, x0, x, total_steps, y): enhance_inpaint_engine, enhance_inpaint_respective_field, enhance_inpaint_strength, enhance_prompt, enhance_negative_prompt, final_scheduler_name, goals_enhance, height, img, mask, preparation_steps, enhance_steps, switch, tiled, total_count, use_expansion, use_style, - use_synthetic_refiner, width) + use_synthetic_refiner, width, persist_image=persist_image) if (should_process_enhance_uov and async_task.enhance_uov_processing_order == flags.enhancement_uov_after and async_task.enhance_uov_prompt_type == flags.enhancement_uov_prompt_type_last_filled): @@ -1412,14 +1422,16 @@ def callback(step, x0, x, total_steps, y): if exception_result == 'break': break - if should_process_enhance_uov and async_task.enhance_uov_processing_order == flags.enhancement_uov_after: + if enhance_uov_after: current_task_id += 1 + # last step in enhance, always save + persist_image = True 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, current_task_id, denoising_strength, done_steps_inpainting, done_steps_upscaling, enhance_steps, last_enhance_prompt, last_enhance_negative_prompt, final_scheduler_name, height, img, preparation_steps, switch, tiled, total_count, use_expansion, use_style, use_synthetic_refiner, - width) + width, persist_image) if exception_result == 'continue': continue elif exception_result == 'break': diff --git a/modules/config.py b/modules/config.py index ee867e5fc..5af9c58ad 100644 --- a/modules/config.py +++ b/modules/config.py @@ -562,6 +562,12 @@ def init_temp_path(path: str | None, default_path: str) -> str: validator=lambda x: isinstance(x, bool), expected_type=bool ) +default_save_only_final_enhanced_image = get_config_item_or_set_default( + key='default_save_only_final_enhanced_image', + default_value=False, + validator=lambda x: isinstance(x, bool), + expected_type=bool +) default_save_metadata_to_images = get_config_item_or_set_default( key='default_save_metadata_to_images', default_value=False, diff --git a/modules/private_logger.py b/modules/private_logger.py index 6fdb680c8..f758272e8 100644 --- a/modules/private_logger.py +++ b/modules/private_logger.py @@ -21,8 +21,8 @@ def get_current_html_path(output_format=None): return html_name -def log(img, metadata, metadata_parser: MetadataParser | None = None, output_format=None, task=None) -> str: - path_outputs = modules.config.temp_path if args_manager.args.disable_image_log else modules.config.path_outputs +def log(img, metadata, metadata_parser: MetadataParser | None = None, output_format=None, task=None, persist_image=True) -> str: + path_outputs = modules.config.temp_path if args_manager.args.disable_image_log or not persist_image else modules.config.path_outputs output_format = output_format if output_format else modules.config.default_output_format date_string, local_temp_filename, only_name = generate_temp_filename(folder=path_outputs, extension=output_format) os.makedirs(os.path.dirname(local_temp_filename), exist_ok=True) diff --git a/webui.py b/webui.py index 0eb95bd49..6621aa62a 100644 --- a/webui.py +++ b/webui.py @@ -748,6 +748,10 @@ def update_history_link(): inputs=black_out_nsfw, outputs=disable_preview, queue=False, show_progress=False) + if not args_manager.args.disable_image_log: + save_final_enhanced_image_only = gr.Checkbox(label='Save only final enhanced image', + value=modules.config.default_save_only_final_enhanced_image) + if not args_manager.args.disable_metadata: save_metadata_to_images = gr.Checkbox(label='Save Metadata to Images', value=modules.config.default_save_metadata_to_images, info='Adds parameters to generated images allowing manual regeneration.') @@ -969,6 +973,9 @@ def inpaint_engine_state_change(inpaint_engine_version, *args): ctrls += freeu_ctrls ctrls += inpaint_ctrls + if not args_manager.args.disable_image_log: + ctrls += [save_final_enhanced_image_only] + if not args_manager.args.disable_metadata: ctrls += [save_metadata_to_images, metadata_scheme] From a9248c8e461995afab054f407b910cc6bdd57a15 Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:16:23 +0200 Subject: [PATCH 06/13] feat: sort enhance images (mashb1t#62) * feat: add checkbox, config and handling for saving only the final enhanced image * feat: sort output of enhance feature (cherry picked from commit 9d45c0e6caabf5c34129789d7e31cdd7c473ff0c) --- args_manager.py | 3 +++ modules/async_worker.py | 22 ++++++++++++++++------ readme.md | 1 + webui.py | 22 ++++++++++++++++++++++ 4 files changed, 42 insertions(+), 6 deletions(-) diff --git a/args_manager.py b/args_manager.py index dea851dc4..bb622c23a 100644 --- a/args_manager.py +++ b/args_manager.py @@ -28,6 +28,9 @@ args_parser.parser.add_argument("--disable-preset-download", action='store_true', help="Disables downloading models for presets", default=False) +args_parser.parser.add_argument("--disable-enhance-output-sorting", action='store_true', + help="Disables enhance output sorting for final image gallery.") + args_parser.parser.add_argument("--enable-auto-describe-image", action='store_true', help="Enables automatic description of uov and enhance image when prompt is empty", default=False) diff --git a/modules/async_worker.py b/modules/async_worker.py index 1d4686b23..489834b21 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -9,7 +9,7 @@ class AsyncTask: def __init__(self, args): - from modules.flags import Performance, MetadataScheme, ip_list, controlnet_image_count + from modules.flags import Performance, MetadataScheme, ip_list, controlnet_image_count, disabled from modules.util import get_enabled_loras from modules.config import default_max_lora_number import args_manager @@ -154,7 +154,9 @@ def __init__(self, args): enhance_inpaint_erode_or_dilate, enhance_mask_invert ]) - + self.should_enhance = self.enhance_checkbox and (self.enhance_uov_method != disabled.casefold() or len(self.enhance_ctrls) > 0) + self.images_to_enhance_count = 0 + self.enhance_stats = {} async_tasks = [] @@ -1264,8 +1266,8 @@ def callback(step, x0, x, total_steps, y): int(current_progress + async_task.callback_steps), f'Sampling step {step + 1}/{total_steps}, image {current_task_id + 1}/{total_count} ...', y)]) - show_intermediate_results = len(tasks) > 1 or should_enhance - persist_image = not should_enhance or not async_task.save_final_enhanced_image_only + show_intermediate_results = len(tasks) > 1 or async_task.should_enhance + persist_image = not async_task.should_enhance or not async_task.save_final_enhanced_image_only for current_task_id, task in enumerate(tasks): progressbar(async_task, current_progress, f'Preparing task {current_task_id + 1}/{async_task.image_number} ...') @@ -1297,7 +1299,7 @@ def callback(step, x0, x, total_steps, y): execution_time = time.perf_counter() - execution_start_time print(f'Generating and saving time: {execution_time:.2f} seconds') - if not should_enhance: + if not async_task.should_enhance: print(f'[Enhance] Skipping, preconditions aren\'t met') stop_processing(async_task, processing_start_time) return @@ -1313,6 +1315,7 @@ def callback(step, x0, x, total_steps, y): enhance_uov_before = async_task.enhance_uov_processing_order == flags.enhancement_uov_before enhance_uov_after = async_task.enhance_uov_processing_order == flags.enhancement_uov_after total_count = len(images_to_enhance) * active_enhance_tabs + async_task.images_to_enhance_count = len(images_to_enhance) base_progress = current_progress current_task_id = -1 @@ -1320,7 +1323,8 @@ def callback(step, x0, x, total_steps, y): done_steps_inpainting = 0 enhance_steps, _, _, _ = apply_overrides(async_task, async_task.original_steps, height, width) exception_result = None - for img in images_to_enhance: + for index, img in enumerate(images_to_enhance): + async_task.enhance_stats[index] = 0 enhancement_image_start_time = time.perf_counter() last_enhance_prompt = async_task.prompt @@ -1334,6 +1338,8 @@ def callback(step, x0, x, total_steps, y): current_task_id, denoising_strength, done_steps_inpainting, done_steps_upscaling, enhance_steps, async_task.prompt, async_task.negative_prompt, final_scheduler_name, height, img, preparation_steps, switch, tiled, total_count, use_expansion, use_style, use_synthetic_refiner, width, persist_image) + async_task.enhance_stats[index] += 1 + if exception_result == 'continue': continue elif exception_result == 'break': @@ -1377,6 +1383,7 @@ def callback(step, x0, x, total_steps, y): async_task.yields.append(['preview', (current_progress, 'Loading ...', mask)]) yield_result(async_task, mask, current_progress, async_task.black_out_nsfw, False, async_task.disable_intermediate_results) + async_task.enhance_stats[index] += 1 print(f'[Enhance] {dino_detection_count} boxes detected') print(f'[Enhance] {sam_detection_count} segments detected in boxes') @@ -1396,6 +1403,7 @@ def callback(step, x0, x, total_steps, y): enhance_prompt, enhance_negative_prompt, final_scheduler_name, goals_enhance, height, img, mask, preparation_steps, enhance_steps, switch, tiled, total_count, use_expansion, use_style, use_synthetic_refiner, width, persist_image=persist_image) + async_task.enhance_stats[index] += 1 if (should_process_enhance_uov and async_task.enhance_uov_processing_order == flags.enhancement_uov_after and async_task.enhance_uov_prompt_type == flags.enhancement_uov_prompt_type_last_filled): @@ -1432,6 +1440,8 @@ def callback(step, x0, x, total_steps, y): last_enhance_prompt, last_enhance_negative_prompt, final_scheduler_name, height, img, preparation_steps, switch, tiled, total_count, use_expansion, use_style, use_synthetic_refiner, width, persist_image) + async_task.enhance_stats[index] += 1 + if exception_result == 'continue': continue elif exception_result == 'break': diff --git a/readme.md b/readme.md index 47edf33ef..d400e1329 100644 --- a/readme.md +++ b/readme.md @@ -396,6 +396,7 @@ entry_with_update.py [-h] [--listen [IP]] [--port PORT] [--disable-offload-from-vram] [--theme THEME] [--disable-image-log] [--disable-analytics] [--disable-metadata] [--disable-preset-download] + [--disable-enhance-output-sorting] [--enable-auto-describe-image] [--always-download-new-model] [--rebuild-hash-cache [CPU_NUM_THREADS]] diff --git a/webui.py b/webui.py index 6621aa62a..3413a5dd3 100644 --- a/webui.py +++ b/webui.py @@ -73,6 +73,9 @@ def generate_clicked(task: worker.AsyncTask): gr.update(visible=True, value=product), \ gr.update(visible=False) if flag == 'finish': + if not args_manager.args.disable_enhance_output_sorting: + product = sort_enhance_images(product, task) + yield gr.update(visible=False), \ gr.update(visible=False), \ gr.update(visible=False), \ @@ -90,6 +93,25 @@ def generate_clicked(task: worker.AsyncTask): return +def sort_enhance_images(images, task): + if not task.should_enhance or len(images) <= task.images_to_enhance_count: + return images + + sorted_images = [] + walk_index = task.images_to_enhance_count + + for index, enhanced_img in enumerate(images[:task.images_to_enhance_count]): + sorted_images.append(enhanced_img) + if index not in task.enhance_stats: + continue + target_index = walk_index + task.enhance_stats[index] + if walk_index < len(images) and target_index <= len(images): + sorted_images += images[walk_index:target_index] + walk_index += task.enhance_stats[index] + + return sorted_images + + def inpaint_mode_change(mode, inpaint_engine_version): assert mode in modules.flags.inpaint_options From 03655fa5ea9391cfb1c0c4a0802c0b712211416e Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Thu, 25 Jul 2024 15:17:59 +0200 Subject: [PATCH 07/13] release: bump version to 2.5.1, update changelog --- fooocus_version.py | 2 +- update_log.md | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/fooocus_version.py b/fooocus_version.py index 3d98bc1d1..daa43b665 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.5.0' +version = '2.5.1' diff --git a/update_log.md b/update_log.md index 9a0f3788f..517d77978 100644 --- a/update_log.md +++ b/update_log.md @@ -1,3 +1,13 @@ +# [2.5.1](https://github.com/lllyasviel/Fooocus/releases/tag/v2.5.1) + +* Update download URL in readme +* Increase speed of metadata loading +* Fix reading of metadata from jpeg, jpg and webp (exif) +* Fix debug preprocessor +* Update attributes and add inline prompt features section to readme +* Add checkbox, config and handling for saving only the final enhanced image. Use config `default_save_only_final_enhanced_image`, default False. +* Add sorting of final images when enhanced is enabled. Use argument `--disable-enhance-output-sorting` to disable. + # [2.5.0](https://github.com/lllyasviel/Fooocus/releases/tag/v2.5.0) This version includes various package updates. If the auto-update doesn't work you can do one of the following: From 1be3c504ed0b15662131a9e16573e5e2995620bd Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Sat, 27 Jul 2024 12:35:55 +0200 Subject: [PATCH 08/13] fix: add positive prompt if styles don't have a prompt placeholder (#3372) fixes https://github.com/lllyasviel/Fooocus/issues/3367 --- modules/async_worker.py | 9 ++++++++- modules/sdxl_styles.py | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/async_worker.py b/modules/async_worker.py index 489834b21..b2939d2be 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -689,13 +689,20 @@ def process_prompt(async_task, prompt, negative_prompt, base_model_additional_lo task_styles = async_task.style_selections.copy() if use_style: + placeholder_replaced = False + for j, s in enumerate(task_styles): if s == random_style_name: s = get_random_style(task_rng) task_styles[j] = s - p, n = apply_style(s, positive=task_prompt) + p, n, style_has_placeholder = apply_style(s, positive=task_prompt) + if style_has_placeholder: + placeholder_replaced = True positive_basic_workloads = positive_basic_workloads + p negative_basic_workloads = negative_basic_workloads + n + + if not placeholder_replaced: + positive_basic_workloads = [task_prompt] + positive_basic_workloads else: positive_basic_workloads.append(task_prompt) diff --git a/modules/sdxl_styles.py b/modules/sdxl_styles.py index 12ab6c5ca..3feb886af 100644 --- a/modules/sdxl_styles.py +++ b/modules/sdxl_styles.py @@ -59,7 +59,7 @@ def get_random_style(rng: Random) -> str: def apply_style(style, positive): p, n = styles[style] - return p.replace('{prompt}', positive).splitlines(), n.splitlines() + return p.replace('{prompt}', positive).splitlines(), n.splitlines(), '{prompt}' in p def get_words(arrays, total_mult, index): From e36fa0b5f7b60f6b0bf084df22f84fa344bd22fb Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Sat, 27 Jul 2024 13:14:44 +0200 Subject: [PATCH 09/13] docs: update numbering of basic debug procedure in issue template (#3376) --- .github/ISSUE_TEMPLATE/bug_report.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 5b9cded68..d46966e5b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -16,9 +16,9 @@ body: description: | Please perform basic debugging to see if your configuration is the cause of the issue. Basic debug procedure - 　2. Update Fooocus - sometimes things just need to be updated - 　3. Backup and remove your config.txt - check if the issue is caused by bad configuration - 　5. Try a fresh installation of Fooocus in a different directory - see if a clean installation solves the issue + 　1. Update Fooocus - sometimes things just need to be updated + 　2. Backup and remove your config.txt - check if the issue is caused by bad configuration + 　3. Try a fresh installation of Fooocus in a different directory - see if a clean installation solves the issue Before making a issue report please, check that the issue hasn't been reported recently. options: - label: The issue has not been resolved by following the [troubleshooting guide](https://github.com/lllyasviel/Fooocus/blob/main/troubleshoot.md) From 3f25b885a7a979a8efcdc6ca9355c62c2576f064 Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Sat, 27 Jul 2024 23:03:21 +0200 Subject: [PATCH 10/13] feat: extend config settings for image input (#3382) * docs: update numbering of basic debug procedure in issue template * feat: add config default_image_prompt_checkbox * feat: add config for default_image_prompt_advanced_checkbox * feat: add config for default_inpaint_advanced_masking_checkbox * feat: add config for default_invert_mask_checkbox * feat: add config for default_developer_debug_mode_checkbox * refactor: regroup checkbox configs * feat: add config for default_uov_method * feat: add configs for controlnet default_controlnet_image_count, ip_images, ip_stop_ats, ip_weights and ip_types * feat: add config for selected tab, rename desc to describe --- modules/async_worker.py | 4 +- modules/config.py | 95 ++++++++++++++++++++++++++++++++++++++--- modules/flags.py | 9 ++-- webui.py | 80 +++++++++++++++++----------------- 4 files changed, 135 insertions(+), 53 deletions(-) diff --git a/modules/async_worker.py b/modules/async_worker.py index b2939d2be..f9e277dbf 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -9,7 +9,7 @@ class AsyncTask: def __init__(self, args): - from modules.flags import Performance, MetadataScheme, ip_list, controlnet_image_count, disabled + from modules.flags import Performance, MetadataScheme, ip_list, disabled from modules.util import get_enabled_loras from modules.config import default_max_lora_number import args_manager @@ -101,7 +101,7 @@ def __init__(self, args): args.pop()) if not args_manager.args.disable_metadata else MetadataScheme.FOOOCUS self.cn_tasks = {x: [] for x in ip_list} - for _ in range(controlnet_image_count): + for _ in range(modules.config.default_controlnet_image_count): cn_img = args.pop() cn_stop = args.pop() cn_weight = args.pop() diff --git a/modules/config.py b/modules/config.py index 5af9c58ad..7062c0056 100644 --- a/modules/config.py +++ b/modules/config.py @@ -403,12 +403,36 @@ def init_temp_path(path: str | None, default_path: str) -> str: validator=lambda x: x in Performance.values(), expected_type=str ) +default_image_prompt_checkbox = get_config_item_or_set_default( + key='default_image_prompt_checkbox', + default_value=False, + validator=lambda x: isinstance(x, bool), + expected_type=bool +) +default_enhance_checkbox = get_config_item_or_set_default( + key='default_enhance_checkbox', + default_value=False, + validator=lambda x: isinstance(x, bool), + expected_type=bool +) default_advanced_checkbox = get_config_item_or_set_default( key='default_advanced_checkbox', default_value=False, validator=lambda x: isinstance(x, bool), expected_type=bool ) +default_developer_debug_mode_checkbox = get_config_item_or_set_default( + key='default_developer_debug_mode_checkbox', + default_value=False, + validator=lambda x: isinstance(x, bool), + expected_type=bool +) +default_image_prompt_advanced_checkbox = get_config_item_or_set_default( + key='default_image_prompt_advanced_checkbox', + default_value=False, + validator=lambda x: isinstance(x, bool), + expected_type=bool +) default_max_image_number = get_config_item_or_set_default( key='default_max_image_number', default_value=32, @@ -469,6 +493,64 @@ def init_temp_path(path: str | None, default_path: str) -> str: validator=lambda x: x in modules.flags.inpaint_engine_versions, expected_type=str ) +default_selected_image_input_tab_id = get_config_item_or_set_default( + key='default_selected_image_input_tab_id', + default_value=modules.flags.default_input_image_tab, + validator=lambda x: x in modules.flags.input_image_tab_ids, + expected_type=str +) +default_uov_method = get_config_item_or_set_default( + key='default_uov_method', + default_value=modules.flags.disabled, + validator=lambda x: x in modules.flags.uov_list, + expected_type=str +) +default_controlnet_image_count = get_config_item_or_set_default( + key='default_controlnet_image_count', + default_value=4, + validator=lambda x: isinstance(x, int) and x > 0, + expected_type=int +) +default_ip_images = {} +default_ip_stop_ats = {} +default_ip_weights = {} +default_ip_types = {} + +for image_count in range(default_controlnet_image_count): + default_ip_images[image_count] = get_config_item_or_set_default( + key=f'default_ip_image_{image_count}', + default_value=None, + validator=lambda x: x is None or isinstance(x, str) and os.path.exists(x), + expected_type=str + ) + default_ip_types[image_count] = get_config_item_or_set_default( + key=f'default_ip_type_{image_count}', + default_value=modules.flags.default_ip, + validator=lambda x: x in modules.flags.ip_list, + expected_type=str + ) + + default_end, default_weight = modules.flags.default_parameters[default_ip_types[image_count]] + + default_ip_stop_ats[image_count] = get_config_item_or_set_default( + key=f'default_ip_stop_at_{image_count}', + default_value=default_end, + validator=lambda x: isinstance(x, float) and 0 <= x <= 1, + expected_type=float + ) + default_ip_weights[image_count] = get_config_item_or_set_default( + key=f'default_ip_weight_{image_count}', + default_value=default_weight, + validator=lambda x: isinstance(x, float) and 0 <= x <= 2, + expected_type=float + ) + +default_inpaint_advanced_masking_checkbox = get_config_item_or_set_default( + key='default_inpaint_advanced_masking_checkbox', + default_value=False, + validator=lambda x: isinstance(x, bool), + expected_type=bool +) default_inpaint_method = get_config_item_or_set_default( key='default_inpaint_method', default_value=modules.flags.inpaint_option_default, @@ -526,12 +608,6 @@ def init_temp_path(path: str | None, default_path: str) -> str: validator=lambda x: isinstance(x, int) and 1 <= x <= 5, expected_type=int ) -default_enhance_checkbox = get_config_item_or_set_default( - key='default_enhance_checkbox', - default_value=False, - validator=lambda x: isinstance(x, bool), - expected_type=bool -) default_enhance_uov_method = get_config_item_or_set_default( key='default_enhance_uov_method', default_value=modules.flags.disabled, @@ -590,6 +666,13 @@ def init_temp_path(path: str | None, default_path: str) -> str: example_inpaint_prompts = [[x] for x in example_inpaint_prompts] example_enhance_detection_prompts = [[x] for x in example_enhance_detection_prompts] +default_invert_mask_checkbox = get_config_item_or_set_default( + key='default_invert_mask_checkbox', + default_value=False, + validator=lambda x: isinstance(x, bool), + expected_type=bool +) + default_inpaint_mask_model = get_config_item_or_set_default( key='default_inpaint_mask_model', default_value='isnet-general-use', diff --git a/modules/flags.py b/modules/flags.py index 4b6cd7b59..4357cdf11 100644 --- a/modules/flags.py +++ b/modules/flags.py @@ -67,6 +67,9 @@ refiner_swap_method = 'joint' +default_input_image_tab = 'uov_tab' +input_image_tab_ids = ['uov_tab', 'ip_tab', 'inpaint_tab', 'describe_tab', 'enhance_tab', 'metadata_tab'] + cn_ip = "ImagePrompt" cn_ip_face = "FaceSwap" cn_canny = "PyraCanny" @@ -91,8 +94,8 @@ inpaint_option_modify = 'Modify Content (add objects, change background, etc.)' inpaint_options = [inpaint_option_default, inpaint_option_detail, inpaint_option_modify] -desc_type_photo = 'Photograph' -desc_type_anime = 'Art/Anime' +describe_type_photo = 'Photograph' +describe_type_anime = 'Art/Anime' sdxl_aspect_ratios = [ '704*1408', '704*1344', '768*1344', '768*1280', '832*1216', '832*1152', @@ -113,8 +116,6 @@ class MetadataScheme(Enum): (f'{MetadataScheme.A1111.value} (plain text)', MetadataScheme.A1111.value), ] -controlnet_image_count = 4 - class OutputFormat(Enum): PNG = 'png' diff --git a/webui.py b/webui.py index 3413a5dd3..5a2100e5c 100644 --- a/webui.py +++ b/webui.py @@ -200,19 +200,19 @@ def skip_clicked(currentTask): stop_button.click(stop_clicked, inputs=currentTask, outputs=currentTask, queue=False, show_progress=False, _js='cancelGenerateForever') skip_button.click(skip_clicked, inputs=currentTask, outputs=currentTask, queue=False, show_progress=False) with gr.Row(elem_classes='advanced_check_row'): - input_image_checkbox = gr.Checkbox(label='Input Image', value=False, container=False, elem_classes='min_check') + input_image_checkbox = gr.Checkbox(label='Input Image', value=modules.config.default_image_prompt_checkbox, container=False, elem_classes='min_check') enhance_checkbox = gr.Checkbox(label='Enhance', value=modules.config.default_enhance_checkbox, container=False, elem_classes='min_check') advanced_checkbox = gr.Checkbox(label='Advanced', value=modules.config.default_advanced_checkbox, container=False, elem_classes='min_check') - with gr.Row(visible=False) as image_input_panel: - with gr.Tabs(): - with gr.TabItem(label='Upscale or Variation') as uov_tab: + with gr.Row(visible=modules.config.default_image_prompt_checkbox) as image_input_panel: + with gr.Tabs(selected=modules.config.default_selected_image_input_tab_id): + with gr.Tab(label='Upscale or Variation', id='uov_tab') as uov_tab: with gr.Row(): with gr.Column(): uov_input_image = grh.Image(label='Image', source='upload', type='numpy', show_label=False) with gr.Column(): - uov_method = gr.Radio(label='Upscale or Variation:', choices=flags.uov_list, value=flags.disabled) + uov_method = gr.Radio(label='Upscale or Variation:', choices=flags.uov_list, value=modules.config.default_uov_method) gr.HTML('\U0001F4D4 Documentation') - with gr.TabItem(label='Image Prompt') as ip_tab: + with gr.Tab(label='Image Prompt', id='ip_tab') as ip_tab: with gr.Row(): ip_images = [] ip_types = [] @@ -220,30 +220,28 @@ def skip_clicked(currentTask): ip_weights = [] ip_ctrls = [] ip_ad_cols = [] - for _ in range(flags.controlnet_image_count): + for image_count in range(modules.config.default_controlnet_image_count): with gr.Column(): - ip_image = grh.Image(label='Image', source='upload', type='numpy', show_label=False, height=300) + ip_image = grh.Image(label='Image', source='upload', type='numpy', show_label=False, height=300, value=modules.config.default_ip_images[image_count]) ip_images.append(ip_image) ip_ctrls.append(ip_image) - with gr.Column(visible=False) as ad_col: + with gr.Column(visible=modules.config.default_image_prompt_advanced_checkbox) as ad_col: with gr.Row(): - default_end, default_weight = flags.default_parameters[flags.default_ip] - - ip_stop = gr.Slider(label='Stop At', minimum=0.0, maximum=1.0, step=0.001, value=default_end) + ip_stop = gr.Slider(label='Stop At', minimum=0.0, maximum=1.0, step=0.001, value=modules.config.default_ip_stop_ats[image_count]) ip_stops.append(ip_stop) ip_ctrls.append(ip_stop) - ip_weight = gr.Slider(label='Weight', minimum=0.0, maximum=2.0, step=0.001, value=default_weight) + ip_weight = gr.Slider(label='Weight', minimum=0.0, maximum=2.0, step=0.001, value=modules.config.default_ip_weights[image_count]) ip_weights.append(ip_weight) ip_ctrls.append(ip_weight) - ip_type = gr.Radio(label='Type', choices=flags.ip_list, value=flags.default_ip, container=False) + ip_type = gr.Radio(label='Type', choices=flags.ip_list, value=modules.config.default_ip_types[image_count], container=False) ip_types.append(ip_type) ip_ctrls.append(ip_type) ip_type.change(lambda x: flags.default_parameters[x], inputs=[ip_type], outputs=[ip_stop, ip_weight], queue=False, show_progress=False) ip_ad_cols.append(ad_col) - ip_advanced = gr.Checkbox(label='Advanced', value=False, container=False) + ip_advanced = gr.Checkbox(label='Advanced', value=modules.config.default_image_prompt_advanced_checkbox, container=False) gr.HTML('* \"Image Prompt\" is powered by Fooocus Image Mixture Engine (v1.0.1). \U0001F4D4 Documentation') def ip_advance_checked(x): @@ -256,11 +254,11 @@ def ip_advance_checked(x): outputs=ip_ad_cols + ip_types + ip_stops + ip_weights, queue=False, show_progress=False) - with gr.TabItem(label='Inpaint or Outpaint') as inpaint_tab: + with gr.Tab(label='Inpaint or Outpaint', id='inpaint_tab') as inpaint_tab: with gr.Row(): with gr.Column(): inpaint_input_image = grh.Image(label='Image', source='upload', type='numpy', tool='sketch', height=500, brush_color="#FFFFFF", elem_id='inpaint_canvas', show_label=False) - inpaint_advanced_masking_checkbox = gr.Checkbox(label='Enable Advanced Masking Features', value=False) + inpaint_advanced_masking_checkbox = gr.Checkbox(label='Enable Advanced Masking Features', value=modules.config.default_inpaint_advanced_masking_checkbox) inpaint_mode = gr.Dropdown(choices=modules.flags.inpaint_options, value=modules.config.default_inpaint_method, label='Method') inpaint_additional_prompt = gr.Textbox(placeholder="Describe what you want to inpaint.", elem_id='inpaint_additional_prompt', label='Inpaint Additional Prompt', visible=False) outpaint_selections = gr.CheckboxGroup(choices=['Left', 'Right', 'Top', 'Bottom'], value=[], label='Outpaint Direction') @@ -271,9 +269,9 @@ def ip_advance_checked(x): gr.HTML('* Powered by Fooocus Inpaint Engine \U0001F4D4 Documentation') example_inpaint_prompts.click(lambda x: x[0], inputs=example_inpaint_prompts, outputs=inpaint_additional_prompt, show_progress=False, queue=False) - with gr.Column(visible=False) as inpaint_mask_generation_col: + with gr.Column(visible=modules.config.default_inpaint_advanced_masking_checkbox) as inpaint_mask_generation_col: inpaint_mask_image = grh.Image(label='Mask Upload', source='upload', type='numpy', tool='sketch', height=500, brush_color="#FFFFFF", mask_opacity=1, elem_id='inpaint_mask_canvas') - invert_mask_checkbox = gr.Checkbox(label='Invert Mask When Generating', value=False) + invert_mask_checkbox = gr.Checkbox(label='Invert Mask When Generating', value=modules.config.default_invert_mask_checkbox) inpaint_mask_model = gr.Dropdown(label='Mask generation model', choices=flags.inpaint_mask_models, value=modules.config.default_inpaint_mask_model) @@ -333,33 +331,33 @@ def generate_mask(image, mask_model, cloth_category, dino_prompt_text, sam_model example_inpaint_mask_dino_prompt_text], queue=False, show_progress=False) - with gr.TabItem(label='Describe') as desc_tab: + with gr.Tab(label='Describe', id='describe_tab') as describe_tab: with gr.Row(): with gr.Column(): - desc_input_image = grh.Image(label='Image', source='upload', type='numpy', show_label=False) + describe_input_image = grh.Image(label='Image', source='upload', type='numpy', show_label=False) with gr.Column(): - desc_method = gr.Radio( + describe_method = gr.Radio( label='Content Type', - choices=[flags.desc_type_photo, flags.desc_type_anime], - value=flags.desc_type_photo) - desc_btn = gr.Button(value='Describe this Image into Prompt') - desc_image_size = gr.Textbox(label='Image Size and Recommended Size', elem_id='desc_image_size', visible=False) + choices=[flags.describe_type_photo, flags.describe_type_anime], + value=flags.describe_type_photo) + describe_btn = gr.Button(value='Describe this Image into Prompt') + describe_image_size = gr.Textbox(label='Image Size and Recommended Size', elem_id='describe_image_size', visible=False) gr.HTML('\U0001F4D4 Documentation') def trigger_show_image_properties(image): value = modules.util.get_image_size_info(image, modules.flags.sdxl_aspect_ratios) return gr.update(value=value, visible=True) - desc_input_image.upload(trigger_show_image_properties, inputs=desc_input_image, - outputs=desc_image_size, show_progress=False, queue=False) + describe_input_image.upload(trigger_show_image_properties, inputs=describe_input_image, + outputs=describe_image_size, show_progress=False, queue=False) - with gr.TabItem(label='Enhance') as enhance_tab: + with gr.Tab(label='Enhance', id='enhance_tab') as enhance_tab: with gr.Row(): with gr.Column(): enhance_input_image = grh.Image(label='Use with Enhance, skips image generation', source='upload', type='numpy') gr.HTML('\U0001F4D4 Documentation') - with gr.TabItem(label='Metadata') as metadata_tab: + with gr.Tab(label='Metadata', id='metadata_tab') as metadata_tab: with gr.Column(): metadata_input_image = grh.Image(label='For images created by Fooocus', source='upload', type='pil') metadata_json = gr.JSON(label='Metadata') @@ -382,7 +380,7 @@ def trigger_metadata_preview(file): with gr.Row(visible=modules.config.default_enhance_checkbox) as enhance_input_panel: with gr.Tabs(): - with gr.TabItem(label='Upscale or Variation'): + with gr.Tab(label='Upscale or Variation'): with gr.Row(): with gr.Column(): enhance_uov_method = gr.Radio(label='Upscale or Variation:', choices=flags.uov_list, @@ -407,7 +405,7 @@ def trigger_metadata_preview(file): enhance_inpaint_engine_ctrls = [] enhance_inpaint_update_ctrls = [] for index in range(modules.config.default_enhance_tabs): - with gr.TabItem(label=f'#{index + 1}') as enhance_tab_item: + with gr.Tab(label=f'#{index + 1}') as enhance_tab_item: enhance_enabled = gr.Checkbox(label='Enable', value=False, elem_classes='min_check', container=False) @@ -549,7 +547,7 @@ def trigger_metadata_preview(file): uov_tab.select(lambda: 'uov', outputs=current_tab, queue=False, _js=down_js, show_progress=False) inpaint_tab.select(lambda: 'inpaint', outputs=current_tab, queue=False, _js=down_js, show_progress=False) ip_tab.select(lambda: 'ip', outputs=current_tab, queue=False, _js=down_js, show_progress=False) - desc_tab.select(lambda: 'desc', outputs=current_tab, queue=False, _js=down_js, show_progress=False) + describe_tab.select(lambda: 'desc', outputs=current_tab, queue=False, _js=down_js, show_progress=False) enhance_tab.select(lambda: 'enhance', outputs=current_tab, queue=False, _js=down_js, show_progress=False) metadata_tab.select(lambda: 'metadata', outputs=current_tab, queue=False, _js=down_js, show_progress=False) enhance_checkbox.change(lambda x: gr.update(visible=x), inputs=enhance_checkbox, @@ -693,9 +691,9 @@ def update_history_link(): value=modules.config.default_sample_sharpness, info='Higher value means image and texture are sharper.') gr.HTML('\U0001F4D4 Documentation') - dev_mode = gr.Checkbox(label='Developer Debug Mode', value=False, container=False) + dev_mode = gr.Checkbox(label='Developer Debug Mode', value=modules.config.default_developer_debug_mode_checkbox, container=False) - with gr.Column(visible=False) as dev_tools: + with gr.Column(visible=modules.config.default_developer_debug_mode_checkbox) as dev_tools: with gr.Tab(label='Debug Tools'): adm_scaler_positive = gr.Slider(label='Positive ADM Guidance Scaler', minimum=0.1, maximum=3.0, step=0.001, value=1.5, info='The scaler multiplied to positive ADM (use 1.0 to disable). ') @@ -1062,16 +1060,16 @@ def trigger_metadata_import(file, state_is_generating): break def trigger_describe(mode, img): - if mode == flags.desc_type_photo: + if mode == flags.describe_type_photo: from extras.interrogate import default_interrogator as default_interrogator_photo return default_interrogator_photo(img), ["Fooocus V2", "Fooocus Enhance", "Fooocus Sharp"] - if mode == flags.desc_type_anime: + if mode == flags.describe_type_anime: from extras.wd14tagger import default_interrogator as default_interrogator_anime return default_interrogator_anime(img), ["Fooocus V2", "Fooocus Masterpiece"] return mode, ["Fooocus V2"] - desc_btn.click(trigger_describe, inputs=[desc_method, desc_input_image], - outputs=[prompt, style_selections], show_progress=True, queue=True) + describe_btn.click(trigger_describe, inputs=[describe_method, describe_input_image], + outputs=[prompt, style_selections], show_progress=True, queue=True) if args_manager.args.enable_auto_describe_image: def trigger_auto_describe(mode, img, prompt): @@ -1080,11 +1078,11 @@ def trigger_auto_describe(mode, img, prompt): return trigger_describe(mode, img) return gr.update(), gr.update() - uov_input_image.upload(trigger_auto_describe, inputs=[desc_method, uov_input_image, prompt], + uov_input_image.upload(trigger_auto_describe, inputs=[describe_method, uov_input_image, prompt], outputs=[prompt, style_selections], show_progress=True, queue=True) enhance_input_image.upload(lambda: gr.update(value=True), outputs=enhance_checkbox, queue=False, show_progress=False) \ - .then(trigger_auto_describe, inputs=[desc_method, enhance_input_image, prompt], outputs=[prompt, style_selections], show_progress=True, queue=True) + .then(trigger_auto_describe, inputs=[describe_method, enhance_input_image, prompt], outputs=[prompt, style_selections], show_progress=True, queue=True) def dump_default_english_config(): from modules.localization import dump_english_config From a5040f62189efe704df217af98d5596c344636f4 Mon Sep 17 00:00:00 2001 From: Manuel Schmid <9307310+mashb1t@users.noreply.github.com> Date: Sat, 27 Jul 2024 23:07:44 +0200 Subject: [PATCH 11/13] feat: count image count index from 1 (#3383) * docs: update numbering of basic debug procedure in issue template --- modules/config.py | 1 + webui.py | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/config.py b/modules/config.py index 7062c0056..0f2038b61 100644 --- a/modules/config.py +++ b/modules/config.py @@ -517,6 +517,7 @@ def init_temp_path(path: str | None, default_path: str) -> str: default_ip_types = {} for image_count in range(default_controlnet_image_count): + image_count += 1 default_ip_images[image_count] = get_config_item_or_set_default( key=f'default_ip_image_{image_count}', default_value=None, diff --git a/webui.py b/webui.py index 5a2100e5c..1a4fb6cf7 100644 --- a/webui.py +++ b/webui.py @@ -221,6 +221,7 @@ def skip_clicked(currentTask): ip_ctrls = [] ip_ad_cols = [] for image_count in range(modules.config.default_controlnet_image_count): + image_count += 1 with gr.Column(): ip_image = grh.Image(label='Image', source='upload', type='numpy', show_label=False, height=300, value=modules.config.default_ip_images[image_count]) ip_images.append(ip_image) From 1a53e0676a8f7cb4597dfb69e909b0280d53f64e Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Sat, 27 Jul 2024 23:26:42 +0200 Subject: [PATCH 12/13] release: bump version to 2.5.2, update changelog --- fooocus_version.py | 2 +- update_log.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fooocus_version.py b/fooocus_version.py index daa43b665..ca4825b5b 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.5.1' +version = '2.5.2' diff --git a/update_log.md b/update_log.md index 517d77978..e3a5e273d 100644 --- a/update_log.md +++ b/update_log.md @@ -1,3 +1,8 @@ +# [2.5.2](https://github.com/lllyasviel/Fooocus/releases/tag/v2.5.2) + +* Fix not adding positive prompt when styles didn't have a {prompt} placeholder in the positive prompt +* Extend config settings for input image, see list in [PR](https://github.com/lllyasviel/Fooocus/pull/3382) + # [2.5.1](https://github.com/lllyasviel/Fooocus/releases/tag/v2.5.1) * Update download URL in readme From ab225d573de85961f77b48cd80f87ec1467de02d Mon Sep 17 00:00:00 2001 From: mrhan1993 <50648276+mrhan1993@users.noreply.github.com> Date: Thu, 1 Aug 2024 13:20:00 +0800 Subject: [PATCH 13/13] merge v2.5.2 --- apis/models/requests.py | 1 + apis/routes/query.py | 7 +++++++ apis/utils/api_utils.py | 1 + apis/utils/post_worker.py | 9 ++++++++- apis/utils/pre_process.py | 12 ++++++++---- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/apis/models/requests.py b/apis/models/requests.py index d67b9afe2..9514e7d73 100644 --- a/apis/models/requests.py +++ b/apis/models/requests.py @@ -126,6 +126,7 @@ class CommonRequest(BaseModel): inpaint_advanced_masking_checkbox: bool = Field(default=False, description="Inpaint Advanced Masking Checkbox") invert_mask_checkbox: bool = Field(default=False, description="Inpaint Invert Mask Checkbox") inpaint_erode_or_dilate: int = Field(default=0, ge=-64, le=64, description="Inpaint Erode or Dilate") + save_final_enhanced_image_only: bool = Field(default=False, description="Save final enhanced image only") save_metadata_to_images: bool = Field(default=True, description="Save meta data") metadata_scheme: MetadataScheme = Field(default=MetadataScheme.FOOOCUS, description="Meta data scheme, one of [fooocus, a111]") controlnet_image: List[ImagePrompt] = Field(default=[ImagePrompt()], description="ControlNet Image Prompt") diff --git a/apis/routes/query.py b/apis/routes/query.py index f16a6f7a7..9e9b271fd 100644 --- a/apis/routes/query.py +++ b/apis/routes/query.py @@ -1,6 +1,7 @@ """ Query routes. """ +import os import re import json @@ -154,6 +155,9 @@ async def get_output(dir_name: str, file_name: str, accept: str = Header(None)): """ Get a specific output by its ID. """ + if not os.path.exists(f"{path_outputs}/{dir_name}/{file_name}"): + return Response(status_code=404) + accept_formats = ('png', 'jpg', 'jpeg', 'webp') try: _, ext = accept.lower().split("/") @@ -179,6 +183,9 @@ async def get_input(file_name: str, accept: str = Header(None)): """ Get a specific input by its ID. """ + if not os.path.exists(f"inputs/{file_name}"): + return Response(status_code=404) + accept_formats = ('png', 'jpg', 'jpeg', 'webp') try: _, ext = accept.lower().split("/") diff --git a/apis/utils/api_utils.py b/apis/utils/api_utils.py index 3d1f0e37f..90b0187cd 100644 --- a/apis/utils/api_utils.py +++ b/apis/utils/api_utils.py @@ -97,6 +97,7 @@ def params_to_params(req: object) -> list: req.inpaint_advanced_masking_checkbox, req.invert_mask_checkbox, req.inpaint_erode_or_dilate, + req.save_final_enhanced_image_only, req.save_metadata_to_images, req.metadata_scheme.value, diff --git a/apis/utils/post_worker.py b/apis/utils/post_worker.py index 3af4aa59c..840599c14 100644 --- a/apis/utils/post_worker.py +++ b/apis/utils/post_worker.py @@ -13,7 +13,7 @@ from apis.utils.sql_client import GenerateRecord from apis.utils.web_hook import send_result_to_web_hook from modules.async_worker import AsyncTask -from modules.config import path_outputs +from modules.config import path_outputs, temp_path ROOT_DIR = file_utils.SCRIPT_PATH @@ -37,7 +37,14 @@ async def post_worker(task: AsyncTask, started_at: int, target_name: str, ext: s :param ext: :return: The task. """ + final_enhanced = [] task_status = "finished" + if task.save_final_enhanced_image_only: + for item in task.results: + if temp_path not in item: + final_enhanced.append(item) + task.results = final_enhanced + if task.last_stop in ['stop', 'skip']: task_status = task.last_stop try: diff --git a/apis/utils/pre_process.py b/apis/utils/pre_process.py index 26f192f3b..48165ab75 100644 --- a/apis/utils/pre_process.py +++ b/apis/utils/pre_process.py @@ -7,8 +7,12 @@ import numpy as np -from modules.config import default_max_lora_number, try_get_preset_content -from modules.flags import Performance, controlnet_image_count +from modules.config import ( + default_max_lora_number, + try_get_preset_content, + default_controlnet_image_count +) +from modules.flags import Performance from modules import constants, config from modules.model_loader import load_file_from_url @@ -78,10 +82,10 @@ async def control_net_parser(control_net: list) -> list: "cn_weight": 0.6, "cn_type": "ImagePrompt" } - while len(control_net) < controlnet_image_count: + while len(control_net) < default_controlnet_image_count: control_net.append(ImagePrompt(**default_cn_image)) - control_net = control_net[:controlnet_image_count] + control_net = control_net[:default_controlnet_image_count] cn_list = [] for cn in control_net: cn_list.extend([