Merge branch 'dev' into sync-req

1 files changed, 6 insertions, 8 deletions

diff --git a/modules/ui.py b/modules/ui.py
index 001b9792..fb6b2498 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -2,7 +2,6 @@ import json
 import mimetypes

 import os

 import sys

-import traceback

 from functools import reduce

 import warnings

 

@@ -14,6 +13,7 @@ from PIL import Image, PngImagePlugin  # noqa: F401
 from modules.call_queue import wrap_gradio_gpu_call, wrap_queued_call, wrap_gradio_call

 

 from modules import sd_hijack, sd_models, localization, script_callbacks, ui_extensions, deepbooru, sd_vae, extra_networks, ui_common, ui_postprocessing, progress, ui_loadsave

+from modules.errors import print_error

 from modules.ui_components import FormRow, FormGroup, ToolButton, FormHTML

 from modules.paths import script_path, data_path

 

@@ -231,9 +231,8 @@ def connect_reuse_seed(seed: gr.Number, reuse_seed: gr.Button, generation_info:
                 res = all_seeds[index if 0 <= index < len(all_seeds) else 0]

 

         except json.decoder.JSONDecodeError:

-            if gen_info_string != '':

-                print("Error parsing JSON generation info:", file=sys.stderr)

-                print(gen_info_string, file=sys.stderr)

+            if gen_info_string:

+                print_error(f"Error parsing JSON generation info: {gen_info_string}")

 

         return [res, gr_show(False)]

 

@@ -505,10 +504,10 @@ def create_ui():
                             with FormRow(elem_id="txt2img_hires_fix_row4", variant="compact", visible=opts.hires_fix_show_prompts) as hr_prompts_container:

                                 with gr.Column(scale=80):

                                     with gr.Row():

-                                        hr_prompt = gr.Textbox(label="Prompt", elem_id="hires_prompt", show_label=False, lines=3, placeholder="Prompt for hires fix pass.\nLeave empty to use the same prompt as in first pass.", elem_classes=["prompt"])

+                                        hr_prompt = gr.Textbox(label="Hires prompt", elem_id="hires_prompt", show_label=False, lines=3, placeholder="Prompt for hires fix pass.\nLeave empty to use the same prompt as in first pass.", elem_classes=["prompt"])

                                 with gr.Column(scale=80):

                                     with gr.Row():

-                                        hr_negative_prompt = gr.Textbox(label="Negative prompt", elem_id="hires_neg_prompt", show_label=False, lines=3, placeholder="Negative prompt for hires fix pass.\nLeave empty to use the same negative prompt as in first pass.", elem_classes=["prompt"])

+                                        hr_negative_prompt = gr.Textbox(label="Hires negative prompt", elem_id="hires_neg_prompt", show_label=False, lines=3, placeholder="Negative prompt for hires fix pass.\nLeave empty to use the same negative prompt as in first pass.", elem_classes=["prompt"])

 

                     elif category == "batch":

                         if not opts.dimensions_and_batch_together:

@@ -1753,8 +1752,7 @@ def create_ui():
             try:

                 results = modules.extras.run_modelmerger(*args)

             except Exception as e:

-                print("Error loading/saving model file:", file=sys.stderr)

-                print(traceback.format_exc(), file=sys.stderr)

+                print_error("Error loading/saving model file", exc_info=True)

                 modules.sd_models.list_models()  # to remove the potentially missing models from the list

                 return [*[gr.Dropdown.update(choices=modules.sd_models.checkpoint_tiles()) for _ in range(4)], f"Error merging checkpoints: {e}"]

             return results