Merge branch 'master' into master

1 files changed, 12 insertions, 6 deletions

diff --git a/modules/shared.py b/modules/shared.py
index ac968b2d..2a599e9c 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -40,6 +40,7 @@ parser.add_argument("--gfpgan-models-path", type=str, help="Path to directory wi
 parser.add_argument("--esrgan-models-path", type=str, help="Path to directory with ESRGAN model file(s).", default=os.path.join(model_path, 'ESRGAN'))

 parser.add_argument("--bsrgan-models-path", type=str, help="Path to directory with BSRGAN model file(s).", default=os.path.join(model_path, 'BSRGAN'))

 parser.add_argument("--realesrgan-models-path", type=str, help="Path to directory with RealESRGAN model file(s).", default=os.path.join(model_path, 'RealESRGAN'))

+parser.add_argument("--scunet-models-path", type=str, help="Path to directory with ScuNET model file(s).", default=os.path.join(model_path, 'ScuNET'))

 parser.add_argument("--swinir-models-path", type=str, help="Path to directory with SwinIR model file(s).", default=os.path.join(model_path, 'SwinIR'))

 parser.add_argument("--ldsr-models-path", type=str, help="Path to directory with LDSR model file(s).", default=os.path.join(model_path, 'LDSR'))

 parser.add_argument("--opt-split-attention", action='store_true', help="force-enables cross-attention layer optimization. By default, it's on for torch.cuda and off for other torch devices.")

@@ -57,6 +58,9 @@ parser.add_argument("--opt-channelslast", action='store_true', help="change memo
 parser.add_argument("--styles-file", type=str, help="filename to use for styles", default=os.path.join(script_path, 'styles.csv'))

 parser.add_argument("--autolaunch", action='store_true', help="open the webui URL in the system's default browser upon launch", default=False)

 parser.add_argument("--use-textbox-seed", action='store_true', help="use textbox for seeds in UI (no up/down, but possible to input long seeds)", default=False)

+parser.add_argument("--disable-console-progressbars", action='store_true', help="do not output progressbars to console", default=False)

+parser.add_argument("--enable-console-prompts", action='store_true', help="print prompts to console when generating with txt2img and img2img", default=False)

+

 

 cmd_opts = parser.parse_args()

 device = get_optimal_device()

@@ -78,6 +82,7 @@ class State:
     current_latent = None

     current_image = None

     current_image_sampling_step = 0

+    textinfo = None

 

     def interrupt(self):

         self.interrupted = True

@@ -88,7 +93,7 @@ class State:
         self.current_image_sampling_step = 0

         

     def get_job_timestamp(self):

-        return datetime.datetime.now().strftime("%Y%m%d%H%M%S")

+        return datetime.datetime.now().strftime("%Y%m%d%H%M%S")  # shouldn't this return job_timestamp?

 

 

 state = State()

@@ -165,9 +170,10 @@ options_templates.update(options_section(('saving-paths', "Paths for saving"), {
 

 options_templates.update(options_section(('saving-to-dirs', "Saving to a directory"), {

     "save_to_dirs": OptionInfo(False, "Save images to a subdirectory"),

-    "grid_save_to_dirs": OptionInfo(False, "Save grids to subdirectory"),

+    "grid_save_to_dirs": OptionInfo(False, "Save grids to a subdirectory"),

+    "use_save_to_dirs_for_ui": OptionInfo(False, "When using \"Save\" button, save images to a subdirectory"),

     "directories_filename_pattern": OptionInfo("", "Directory name pattern"),

-    "directories_max_prompt_words": OptionInfo(8, "Max prompt words", gr.Slider, {"minimum": 1, "maximum": 20, "step": 1}),

+    "directories_max_prompt_words": OptionInfo(8, "Max prompt words for [prompt_words] pattern", gr.Slider, {"minimum": 1, "maximum": 20, "step": 1}),

 }))

 

 options_templates.update(options_section(('upscaling', "Upscaling"), {

@@ -177,7 +183,7 @@ options_templates.update(options_section(('upscaling', "Upscaling"), {
     "SWIN_tile": OptionInfo(192, "Tile size for all SwinIR.", gr.Slider, {"minimum": 16, "maximum": 512, "step": 16}),

     "SWIN_tile_overlap": OptionInfo(8, "Tile overlap, in pixels for SwinIR. Low values = visible seam.", gr.Slider, {"minimum": 0, "maximum": 48, "step": 1}),

     "ldsr_steps": OptionInfo(100, "LDSR processing steps. Lower = faster", gr.Slider, {"minimum": 1, "maximum": 200, "step": 1}),

-    "upscaler_for_img2img": OptionInfo(None, "Upscaler for img2img", gr.Radio, lambda: {"choices": [x.name for x in sd_upscalers]}),

+    "upscaler_for_img2img": OptionInfo(None, "Upscaler for img2img", gr.Dropdown, lambda: {"choices": [x.name for x in sd_upscalers]}),

 }))

 

 options_templates.update(options_section(('face-restoration', "Face restoration"), {

@@ -318,14 +324,14 @@ class TotalTQDM:
         )

 

     def update(self):

-        if not opts.multiple_tqdm:

+        if not opts.multiple_tqdm or cmd_opts.disable_console_progressbars:

             return

         if self._tqdm is None:

             self.reset()

         self._tqdm.update()

 

     def updateTotal(self, new_total):

-        if not opts.multiple_tqdm:

+        if not opts.multiple_tqdm or cmd_opts.disable_console_progressbars:

             return

         if self._tqdm is None:

             self.reset()