From a213d3a21c9e37297fdcb2c2b48bd24290a479cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Aires=20Rast=C3=A9n?= Date: Thu, 22 Sep 2022 10:47:16 +0200 Subject: [PATCH] Add option to always log generation info --- modules/img2img.py | 6 +++++- modules/shared.py | 1 + modules/txt2img.py | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/modules/img2img.py b/modules/img2img.py index 91689232b..bce8b712d 100644 --- a/modules/img2img.py +++ b/modules/img2img.py @@ -118,4 +118,8 @@ def img2img(mode: int, prompt: str, negative_prompt: str, prompt_style: str, pro shared.total_tqdm.clear() - return processed.images, processed.js(), plaintext_to_html(processed.info) + generation_info_js = processed.js() + if opts.samples_log_stdout: + print(generation_info_js) + + return processed.images, generation_info_js, plaintext_to_html(processed.info) \ No newline at end of file diff --git a/modules/shared.py b/modules/shared.py index 841a9877e..5ffaefc55 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -125,6 +125,7 @@ class Options: "outdir_img2img_grids": OptionInfo("outputs/img2img-grids", 'Output directory for img2img grids', component_args=hide_dirs), "outdir_save": OptionInfo("log/images", "Directory for saving images using the Save button", component_args=hide_dirs), "samples_save": OptionInfo(True, "Always save all generated images"), + "samples_log_stdout": OptionInfo(False, "Always print all generation info to standard output"), "save_selected_only": OptionInfo(False, "When using 'Save' button, only save a single selected image"), "samples_format": OptionInfo('png', 'File format for individual samples'), "filter_nsfw": OptionInfo(False, "Filter NSFW content"), diff --git a/modules/txt2img.py b/modules/txt2img.py index 9123fca19..d2cf39efd 100644 --- a/modules/txt2img.py +++ b/modules/txt2img.py @@ -44,5 +44,9 @@ def txt2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2: shared.total_tqdm.clear() - return processed.images, processed.js(), plaintext_to_html(processed.info) + generation_info_js = processed.js() + if opts.samples_log_stdout: + print(generation_info_js) + + return processed.images, generation_info_js, plaintext_to_html(processed.info)