Update webui.py

webui.py

@@ -1,7 +1,7 @@
 import gradio as gr
 import random
 import os
-# import json
+import json
 import time
 import shared
 import modules.config
@@ -20,7 +20,7 @@ from modules.sdxl_styles import legal_style_names
 from modules.private_logger import get_current_html_path
 from modules.ui_gradio_extensions import reload_javascript
 from modules.auth import auth_enabled, check_auth
-# from modules.util import is_json
+from modules.util import is_json
 
 def get_task(*args):
     args = list(args)
@@ -86,7 +86,7 @@ def generate_clicked(task):
 
 reload_javascript()
 
-title = 'AI Describe Image'
+title = 'AI Image'
 
 if isinstance(args_manager.args.preset, str):
     title += ' ' + args_manager.args.preset
@@ -99,157 +99,157 @@ with shared.gradio_root:
     currentTask = gr.State(worker.AsyncTask(args=[]))
     with gr.Row():
         with gr.Column(scale=2):
-            # with gr.Row():
-            #     progress_window = grh.Image(label='Preview', show_label=True, visible=False, height=768,
-            #                                 elem_classes=['main_view'])
-            #     progress_gallery = gr.Gallery(label='Finished Images', show_label=True, object_fit='contain',
-            #                                   height=768, visible=False, elem_classes=['main_view', 'image_gallery'])
-            # progress_html = gr.HTML(value=modules.html.make_progress_html(32, 'Progress 32%'), visible=False,
-            #                         elem_id='progress-bar', elem_classes='progress-bar')
-            # gallery = gr.Gallery(label='Gallery', show_label=False, object_fit='contain', visible=True, height=768,
-            #                      elem_classes=['resizable_area', 'main_view', 'final_gallery', 'image_gallery'],
-            #                      elem_id='final_gallery')
-            with gr.Row(visible=True) as image_input_panel:
+            with gr.Row():
+                progress_window = grh.Image(label='Preview', show_label=True, visible=False, height=768,
+                                            elem_classes=['main_view'])
+                progress_gallery = gr.Gallery(label='Finished Images', show_label=True, object_fit='contain',
+                                              height=768, visible=False, elem_classes=['main_view', 'image_gallery'])
+            progress_html = gr.HTML(value=modules.html.make_progress_html(32, 'Progress 32%'), visible=False,
+                                    elem_id='progress-bar', elem_classes='progress-bar')
+            gallery = gr.Gallery(label='Gallery', show_label=False, object_fit='contain', visible=True, height=768,
+                                 elem_classes=['resizable_area', 'main_view', 'final_gallery', 'image_gallery'],
+                                 elem_id='final_gallery')
+            with gr.Row(elem_classes='type_row'):
+                with gr.Column(scale=17):
+                    prompt = gr.Textbox(show_label=False, placeholder="Type prompt here or paste parameters.", elem_id='positive_prompt',
+                                        container=False, autofocus=True, elem_classes='type_row', lines=1024, , show_copy_button=True)
+
+                    default_prompt = modules.config.default_prompt
+                    if isinstance(default_prompt, str) and default_prompt != '':
+                        shared.gradio_root.load(lambda: default_prompt, outputs=prompt)
+
+                with gr.Column(scale=3, min_width=0):
+                    generate_button = gr.Button(label="Generate", value="Generate", elem_classes='type_row', elem_id='generate_button', visible=True)
+                    load_parameter_button = gr.Button(label="Load Parameters", value="Load Parameters", elem_classes='type_row', elem_id='load_parameter_button', visible=False)
+                    skip_button = gr.Button(label="Skip", value="Skip", elem_classes='type_row_half', visible=False)
+                    stop_button = gr.Button(label="Stop", value="Stop", elem_classes='type_row_half', elem_id='stop_button', visible=False)
+
+                    def stop_clicked(currentTask):
+                        import ldm_patched.modules.model_management as model_management
+                        currentTask.last_stop = 'stop'
+                        if (currentTask.processing):
+                            model_management.interrupt_current_processing()
+                        return currentTask
+
+                    def skip_clicked(currentTask):
+                        import ldm_patched.modules.model_management as model_management
+                        currentTask.last_stop = 'skip'
+                        if (currentTask.processing):
+                            model_management.interrupt_current_processing()
+                        return 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')
+                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():
-                    #         with gr.Column():
-                    #             uov_input_image = grh.Image(label='Drag above image to here', source='upload', type='numpy')
-                    #         with gr.Column():
-                    #             uov_method = gr.Radio(label='Upscale or Variation:', choices=flags.uov_list, value=flags.disabled)
-                    #             gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/390" target="_blank">\U0001F4D4 Document</a>')
-                    # with gr.TabItem(label='Image Prompt') as ip_tab:
-                    #     with gr.Row():
-                    #         ip_images = []
-                    #         ip_types = []
-                    #         ip_stops = []
-                    #         ip_weights = []
-                    #         ip_ctrls = []
-                    #         ip_ad_cols = []
-                    #         for _ in range(flags.controlnet_image_count):
-                    #             with gr.Column():
-                    #                 ip_image = grh.Image(label='Image', source='upload', type='numpy', show_label=False, height=300)
-                    #                 ip_images.append(ip_image)
-                    #                 ip_ctrls.append(ip_image)
-                    #                 with gr.Column(visible=False) 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_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_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_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)
-                    #     gr.HTML('* \"Image Prompt\" is powered by Fooocus Image Mixture Engine (v1.0.1). <a href="https://github.com/lllyasviel/Fooocus/discussions/557" target="_blank">\U0001F4D4 Document</a>')
-
-                    #     def ip_advance_checked(x):
-                    #         return [gr.update(visible=x)] * len(ip_ad_cols) + \
-                    #             [flags.default_ip] * len(ip_types) + \
-                    #             [flags.default_parameters[flags.default_ip][0]] * len(ip_stops) + \
-                    #             [flags.default_parameters[flags.default_ip][1]] * len(ip_weights)
-
-                    #     ip_advanced.change(ip_advance_checked, inputs=ip_advanced,
-                    #                        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.Row():
-                    #         inpaint_input_image = grh.Image(label='Drag inpaint or outpaint image to here', source='upload', type='numpy', tool='sketch', height=500, brush_color="#FFFFFF", elem_id='inpaint_canvas')
-                    #         inpaint_mask_image = grh.Image(label='Mask Upload', source='upload', type='numpy', height=500, visible=False)
-
-                    #     with gr.Row():
-                    #         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')
-                    #         inpaint_mode = gr.Dropdown(choices=modules.flags.inpaint_options, value=modules.flags.inpaint_option_default, label='Method')
-                    #     example_inpaint_prompts = gr.Dataset(samples=modules.config.example_inpaint_prompts, label='Additional Prompt Quick List', components=[inpaint_additional_prompt], visible=False)
-                    #     gr.HTML('* Powered by Fooocus Inpaint Engine <a href="https://github.com/lllyasviel/Fooocus/discussions/414" target="_blank">\U0001F4D4 Document</a>')
-                    #     example_inpaint_prompts.click(lambda x: x[0], inputs=example_inpaint_prompts, outputs=inpaint_additional_prompt, show_progress=False, queue=False)
+                    with gr.TabItem(label='Upscale or Variation') as uov_tab:
+                        with gr.Row():
+                            with gr.Column():
+                                uov_input_image = grh.Image(label='Drag above image to here', source='upload', type='numpy')
+                            with gr.Column():
+                                uov_method = gr.Radio(label='Upscale or Variation:', choices=flags.uov_list, value=flags.disabled)
+                                # gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/390" target="_blank">\U0001F4D4 Document</a>')
+                    with gr.TabItem(label='Image Prompt') as ip_tab:
+                        with gr.Row():
+                            ip_images = []
+                            ip_types = []
+                            ip_stops = []
+                            ip_weights = []
+                            ip_ctrls = []
+                            ip_ad_cols = []
+                            for _ in range(flags.controlnet_image_count):
+                                with gr.Column():
+                                    ip_image = grh.Image(label='Image', source='upload', type='numpy', show_label=False, height=300)
+                                    ip_images.append(ip_image)
+                                    ip_ctrls.append(ip_image)
+                                    with gr.Column(visible=False) 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_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_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_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)
+                        # gr.HTML('* \"Image Prompt\" is powered by Fooocus Image Mixture Engine (v1.0.1). <a href="https://github.com/lllyasviel/Fooocus/discussions/557" target="_blank">\U0001F4D4 Document</a>')
+
+                        def ip_advance_checked(x):
+                            return [gr.update(visible=x)] * len(ip_ad_cols) + \
+                                [flags.default_ip] * len(ip_types) + \
+                                [flags.default_parameters[flags.default_ip][0]] * len(ip_stops) + \
+                                [flags.default_parameters[flags.default_ip][1]] * len(ip_weights)
+
+                        ip_advanced.change(ip_advance_checked, inputs=ip_advanced,
+                                           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.Row():
+                            inpaint_input_image = grh.Image(label='Drag inpaint or outpaint image to here', source='upload', type='numpy', tool='sketch', height=500, brush_color="#FFFFFF", elem_id='inpaint_canvas')
+                            inpaint_mask_image = grh.Image(label='Mask Upload', source='upload', type='numpy', height=500, visible=False)
+
+                        with gr.Row():
+                            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')
+                            inpaint_mode = gr.Dropdown(choices=modules.flags.inpaint_options, value=modules.flags.inpaint_option_default, label='Method')
+                        example_inpaint_prompts = gr.Dataset(samples=modules.config.example_inpaint_prompts, label='Additional Prompt Quick List', components=[inpaint_additional_prompt], visible=False)
+                        # gr.HTML('* Powered by Fooocus Inpaint Engine <a href="https://github.com/lllyasviel/Fooocus/discussions/414" target="_blank">\U0001F4D4 Document</a>')
+                        example_inpaint_prompts.click(lambda x: x[0], inputs=example_inpaint_prompts, outputs=inpaint_additional_prompt, show_progress=False, queue=False)
                     with gr.TabItem(label='Describe') as desc_tab:
                         with gr.Row():
                             with gr.Column():
                                 desc_input_image = grh.Image(label='Drag any image to here', source='upload', type='numpy')
                             with gr.Column():
-                                # with gr.Row(elem_classes='type_row'):
-                                with gr.Column(scale=17):
-                                    prompt = gr.Textbox(label="Output", show_label=True, placeholder="", elem_id='positive_prompt',
-                                                        container=True, autofocus=True, elem_classes='type_row', lines=1024, show_copy_button=True)
-
-                                    default_prompt = modules.config.default_prompt
-                                    if isinstance(default_prompt, str) and default_prompt != '':
-                                        shared.gradio_root.load(lambda: default_prompt, outputs=prompt)
-
-                                # with gr.Column(scale=3, min_width=0):
-                                #     generate_button = gr.Button(label="Generate", value="Generate", elem_classes='type_row', elem_id='generate_button', visible=True)
-                                #     load_parameter_button = gr.Button(label="Load Parameters", value="Load Parameters", elem_classes='type_row', elem_id='load_parameter_button', visible=False)
-                                #     skip_button = gr.Button(label="Skip", value="Skip", elem_classes='type_row_half', visible=False)
-                                #     stop_button = gr.Button(label="Stop", value="Stop", elem_classes='type_row_half', elem_id='stop_button', visible=False)
-
-                                #     def stop_clicked(currentTask):
-                                #         import ldm_patched.modules.model_management as model_management
-                                #         currentTask.last_stop = 'stop'
-                                #         if (currentTask.processing):
-                                #             model_management.interrupt_current_processing()
-                                #         return currentTask
-
-                                #     def skip_clicked(currentTask):
-                                #         import ldm_patched.modules.model_management as model_management
-                                #         currentTask.last_stop = 'skip'
-                                #         if (currentTask.processing):
-                                #             model_management.interrupt_current_processing()
-                                #         return 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')
-                                    advanced_checkbox = gr.Checkbox(label='Advanced', value=modules.config.default_advanced_checkbox, container=False, elem_classes='min_check')
                                 desc_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')
                                 # gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/1363" target="_blank">\U0001F4D4 Document</a>')
-                    # with gr.TabItem(label='Metadata') as load_tab:
-                    #     with gr.Column():
-                    #         metadata_input_image = grh.Image(label='Drag any image generated by Fooocus here', source='upload', type='filepath')
-                    #         metadata_json = gr.JSON(label='Metadata')
-                    #         metadata_import_button = gr.Button(value='Apply Metadata')
+                    with gr.TabItem(label='Metadata') as load_tab:
+                        with gr.Column():
+                            metadata_input_image = grh.Image(label='Drag any image generated by Fooocus here', source='upload', type='filepath')
+                            metadata_json = gr.JSON(label='Metadata')
+                            metadata_import_button = gr.Button(value='Apply Metadata')
 
-                    #     def trigger_metadata_preview(filepath):
-                    #         parameters, metadata_scheme = modules.meta_parser.read_info_from_image(filepath)
+                        def trigger_metadata_preview(filepath):
+                            parameters, metadata_scheme = modules.meta_parser.read_info_from_image(filepath)
 
-                    #         results = {}
-                    #         if parameters is not None:
-                    #             results['parameters'] = parameters
+                            results = {}
+                            if parameters is not None:
+                                results['parameters'] = parameters
 
-                    #         if isinstance(metadata_scheme, flags.MetadataScheme):
-                    #             results['metadata_scheme'] = metadata_scheme.value
+                            if isinstance(metadata_scheme, flags.MetadataScheme):
+                                results['metadata_scheme'] = metadata_scheme.value
 
-                    #         return results
+                            return results
 
-                    #     metadata_input_image.upload(trigger_metadata_preview, inputs=metadata_input_image,
-                    #                                 outputs=metadata_json, queue=False, show_progress=True)
+                        metadata_input_image.upload(trigger_metadata_preview, inputs=metadata_input_image,
+                                                    outputs=metadata_json, queue=False, show_progress=True)
 
             switch_js = "(x) => {if(x){viewer_to_bottom(100);viewer_to_bottom(500);}else{viewer_to_top();} return x;}"
             down_js = "() => {viewer_to_bottom();}"
 
-            # input_image_checkbox.change(lambda x: gr.update(visible=x), inputs=input_image_checkbox,
-            #                             outputs=image_input_panel, queue=False, show_progress=False, _js=switch_js)
-            # ip_advanced.change(lambda: None, queue=False, show_progress=False, _js=down_js)
+            input_image_checkbox.change(lambda x: gr.update(visible=x), inputs=input_image_checkbox,
+                                        outputs=image_input_panel, queue=False, show_progress=False, _js=switch_js)
+            ip_advanced.change(lambda: None, queue=False, show_progress=False, _js=down_js)
 
-            current_tab = gr.Textbox(value='desc', visible=False)
-            # 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)
+            current_tab = gr.Textbox(value='uov', visible=False)
+            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)
 
         with gr.Column(scale=1, visible=modules.config.default_advanced_checkbox) as advanced_column:
@@ -374,7 +374,7 @@ with shared.gradio_root:
                 sharpness = gr.Slider(label='Image Sharpness', minimum=0.0, maximum=30.0, step=0.001,
                                       value=modules.config.default_sample_sharpness,
                                       info='Higher value means image and texture are sharper.')
-                gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/117" target="_blank">\U0001F4D4 Document</a>')
+                # gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/117" target="_blank">\U0001F4D4 Document</a>')
                 dev_mode = gr.Checkbox(label='Developer Debug Mode', value=False, container=False)
 
                 with gr.Column(visible=False) as dev_tools:
@@ -435,71 +435,71 @@ with shared.gradio_root:
                                                              info='Disable automatic seed increment when image number is > 1.',
                                                              value=False)
 
-                        # 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.')
-                        #     metadata_scheme = gr.Radio(label='Metadata Scheme', choices=flags.metadata_scheme, value=modules.config.default_metadata_scheme,
-                        #                                info='Image Prompt parameters are not included. Use png and a1111 for compatibility with Civitai.',
-                        #                                visible=modules.config.default_save_metadata_to_images)
-
-                        #     save_metadata_to_images.change(lambda x: gr.update(visible=x), inputs=[save_metadata_to_images], outputs=[metadata_scheme], 
-                        #                                    queue=False, show_progress=False)
-
-                    # with gr.Tab(label='Control'):
-                    #     debugging_cn_preprocessor = gr.Checkbox(label='Debug Preprocessors', value=False,
-                    #                                             info='See the results from preprocessors.')
-                    #     skipping_cn_preprocessor = gr.Checkbox(label='Skip Preprocessors', value=False,
-                    #                                            info='Do not preprocess images. (Inputs are already canny/depth/cropped-face/etc.)')
-
-                    #     mixing_image_prompt_and_vary_upscale = gr.Checkbox(label='Mixing Image Prompt and Vary/Upscale',
-                    #                                                        value=False)
-                    #     mixing_image_prompt_and_inpaint = gr.Checkbox(label='Mixing Image Prompt and Inpaint',
-                    #                                                   value=False)
-
-                    #     controlnet_softness = gr.Slider(label='Softness of ControlNet', minimum=0.0, maximum=1.0,
-                    #                                     step=0.001, value=0.25,
-                    #                                     info='Similar to the Control Mode in A1111 (use 0.0 to disable). ')
-
-                    #     with gr.Tab(label='Canny'):
-                    #         canny_low_threshold = gr.Slider(label='Canny Low Threshold', minimum=1, maximum=255,
-                    #                                         step=1, value=64)
-                    #         canny_high_threshold = gr.Slider(label='Canny High Threshold', minimum=1, maximum=255,
-                    #                                          step=1, value=128)
-
-                    # with gr.Tab(label='Inpaint'):
-                    #     debugging_inpaint_preprocessor = gr.Checkbox(label='Debug Inpaint Preprocessing', value=False)
-                    #     inpaint_disable_initial_latent = gr.Checkbox(label='Disable initial latent in inpaint', value=False)
-                    #     inpaint_engine = gr.Dropdown(label='Inpaint Engine',
-                    #                                  value=modules.config.default_inpaint_engine_version,
-                    #                                  choices=flags.inpaint_engine_versions,
-                    #                                  info='Version of Fooocus inpaint model')
-                    #     inpaint_strength = gr.Slider(label='Inpaint Denoising Strength',
-                    #                                  minimum=0.0, maximum=1.0, step=0.001, value=1.0,
-                    #                                  info='Same as the denoising strength in A1111 inpaint. '
-                    #                                       'Only used in inpaint, not used in outpaint. '
-                    #                                       '(Outpaint always use 1.0)')
-                    #     inpaint_respective_field = gr.Slider(label='Inpaint Respective Field',
-                    #                                          minimum=0.0, maximum=1.0, step=0.001, value=0.618,
-                    #                                          info='The area to inpaint. '
-                    #                                               'Value 0 is same as "Only Masked" in A1111. '
-                    #                                               'Value 1 is same as "Whole Image" in A1111. '
-                    #                                               'Only used in inpaint, not used in outpaint. '
-                    #                                               '(Outpaint always use 1.0)')
-                    #     inpaint_erode_or_dilate = gr.Slider(label='Mask Erode or Dilate',
-                    #                                         minimum=-64, maximum=64, step=1, value=0,
-                    #                                         info='Positive value will make white area in the mask larger, '
-                    #                                              'negative value will make white area smaller.'
-                    #                                              '(default is 0, always process before any mask invert)')
-                    #     inpaint_mask_upload_checkbox = gr.Checkbox(label='Enable Mask Upload', value=False)
-                    #     invert_mask_checkbox = gr.Checkbox(label='Invert Mask', value=False)
-
-                    #     inpaint_ctrls = [debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine,
-                    #                      inpaint_strength, inpaint_respective_field,
-                    #                      inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate]
-
-                    #     inpaint_mask_upload_checkbox.change(lambda x: gr.update(visible=x),
-                    #                                        inputs=inpaint_mask_upload_checkbox,
-                    #                                        outputs=inpaint_mask_image, queue=False, show_progress=False)
+                        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.')
+                            metadata_scheme = gr.Radio(label='Metadata Scheme', choices=flags.metadata_scheme, value=modules.config.default_metadata_scheme,
+                                                       info='Image Prompt parameters are not included. Use png and a1111 for compatibility with Civitai.',
+                                                       visible=modules.config.default_save_metadata_to_images)
+
+                            save_metadata_to_images.change(lambda x: gr.update(visible=x), inputs=[save_metadata_to_images], outputs=[metadata_scheme], 
+                                                           queue=False, show_progress=False)
+
+                    with gr.Tab(label='Control'):
+                        debugging_cn_preprocessor = gr.Checkbox(label='Debug Preprocessors', value=False,
+                                                                info='See the results from preprocessors.')
+                        skipping_cn_preprocessor = gr.Checkbox(label='Skip Preprocessors', value=False,
+                                                               info='Do not preprocess images. (Inputs are already canny/depth/cropped-face/etc.)')
+
+                        mixing_image_prompt_and_vary_upscale = gr.Checkbox(label='Mixing Image Prompt and Vary/Upscale',
+                                                                           value=False)
+                        mixing_image_prompt_and_inpaint = gr.Checkbox(label='Mixing Image Prompt and Inpaint',
+                                                                      value=False)
+
+                        controlnet_softness = gr.Slider(label='Softness of ControlNet', minimum=0.0, maximum=1.0,
+                                                        step=0.001, value=0.25,
+                                                        info='Similar to the Control Mode in A1111 (use 0.0 to disable). ')
+
+                        with gr.Tab(label='Canny'):
+                            canny_low_threshold = gr.Slider(label='Canny Low Threshold', minimum=1, maximum=255,
+                                                            step=1, value=64)
+                            canny_high_threshold = gr.Slider(label='Canny High Threshold', minimum=1, maximum=255,
+                                                             step=1, value=128)
+
+                    with gr.Tab(label='Inpaint'):
+                        debugging_inpaint_preprocessor = gr.Checkbox(label='Debug Inpaint Preprocessing', value=False)
+                        inpaint_disable_initial_latent = gr.Checkbox(label='Disable initial latent in inpaint', value=False)
+                        inpaint_engine = gr.Dropdown(label='Inpaint Engine',
+                                                     value=modules.config.default_inpaint_engine_version,
+                                                     choices=flags.inpaint_engine_versions,
+                                                     info='Version of Fooocus inpaint model')
+                        inpaint_strength = gr.Slider(label='Inpaint Denoising Strength',
+                                                     minimum=0.0, maximum=1.0, step=0.001, value=1.0,
+                                                     info='Same as the denoising strength in A1111 inpaint. '
+                                                          'Only used in inpaint, not used in outpaint. '
+                                                          '(Outpaint always use 1.0)')
+                        inpaint_respective_field = gr.Slider(label='Inpaint Respective Field',
+                                                             minimum=0.0, maximum=1.0, step=0.001, value=0.618,
+                                                             info='The area to inpaint. '
+                                                                  'Value 0 is same as "Only Masked" in A1111. '
+                                                                  'Value 1 is same as "Whole Image" in A1111. '
+                                                                  'Only used in inpaint, not used in outpaint. '
+                                                                  '(Outpaint always use 1.0)')
+                        inpaint_erode_or_dilate = gr.Slider(label='Mask Erode or Dilate',
+                                                            minimum=-64, maximum=64, step=1, value=0,
+                                                            info='Positive value will make white area in the mask larger, '
+                                                                 'negative value will make white area smaller.'
+                                                                 '(default is 0, always process before any mask invert)')
+                        inpaint_mask_upload_checkbox = gr.Checkbox(label='Enable Mask Upload', value=False)
+                        invert_mask_checkbox = gr.Checkbox(label='Invert Mask', value=False)
+
+                        inpaint_ctrls = [debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine,
+                                         inpaint_strength, inpaint_respective_field,
+                                         inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate]
+
+                        inpaint_mask_upload_checkbox.change(lambda x: gr.update(visible=x),
+                                                           inputs=inpaint_mask_upload_checkbox,
+                                                           outputs=inpaint_mask_image, queue=False, show_progress=False)
 
                     with gr.Tab(label='FreeU'):
                         freeu_enabled = gr.Checkbox(label='Enabled', value=False)
@@ -543,38 +543,38 @@ with shared.gradio_root:
                                  queue=False, show_progress=False) \
             .then(fn=lambda: None, _js='refresh_grid_delayed', queue=False, show_progress=False)
 
-        # def inpaint_mode_change(mode):
-        #     assert mode in modules.flags.inpaint_options
-
-        #     # inpaint_additional_prompt, outpaint_selections, example_inpaint_prompts,
-        #     # inpaint_disable_initial_latent, inpaint_engine,
-        #     # inpaint_strength, inpaint_respective_field
-
-        #     if mode == modules.flags.inpaint_option_detail:
-        #         return [
-        #             gr.update(visible=True), gr.update(visible=False, value=[]),
-        #             gr.Dataset.update(visible=True, samples=modules.config.example_inpaint_prompts),
-        #             False, 'None', 0.5, 0.0
-        #         ]
-
-        #     if mode == modules.flags.inpaint_option_modify:
-        #         return [
-        #             gr.update(visible=True), gr.update(visible=False, value=[]),
-        #             gr.Dataset.update(visible=False, samples=modules.config.example_inpaint_prompts),
-        #             True, modules.config.default_inpaint_engine_version, 1.0, 0.0
-        #         ]
-
-        #     return [
-        #         gr.update(visible=False, value=''), gr.update(visible=True),
-        #         gr.Dataset.update(visible=False, samples=modules.config.example_inpaint_prompts),
-        #         False, modules.config.default_inpaint_engine_version, 1.0, 0.618
-        #     ]
-
-        # inpaint_mode.input(inpaint_mode_change, inputs=inpaint_mode, outputs=[
-        #     inpaint_additional_prompt, outpaint_selections, example_inpaint_prompts,
-        #     inpaint_disable_initial_latent, inpaint_engine,
-        #     inpaint_strength, inpaint_respective_field
-        # ], show_progress=False, queue=False)
+        def inpaint_mode_change(mode):
+            assert mode in modules.flags.inpaint_options
+
+            # inpaint_additional_prompt, outpaint_selections, example_inpaint_prompts,
+            # inpaint_disable_initial_latent, inpaint_engine,
+            # inpaint_strength, inpaint_respective_field
+
+            if mode == modules.flags.inpaint_option_detail:
+                return [
+                    gr.update(visible=True), gr.update(visible=False, value=[]),
+                    gr.Dataset.update(visible=True, samples=modules.config.example_inpaint_prompts),
+                    False, 'None', 0.5, 0.0
+                ]
+
+            if mode == modules.flags.inpaint_option_modify:
+                return [
+                    gr.update(visible=True), gr.update(visible=False, value=[]),
+                    gr.Dataset.update(visible=False, samples=modules.config.example_inpaint_prompts),
+                    True, modules.config.default_inpaint_engine_version, 1.0, 0.0
+                ]
+
+            return [
+                gr.update(visible=False, value=''), gr.update(visible=True),
+                gr.Dataset.update(visible=False, samples=modules.config.example_inpaint_prompts),
+                False, modules.config.default_inpaint_engine_version, 1.0, 0.618
+            ]
+
+        inpaint_mode.input(inpaint_mode_change, inputs=inpaint_mode, outputs=[
+            inpaint_additional_prompt, outpaint_selections, example_inpaint_prompts,
+            inpaint_disable_initial_latent, inpaint_engine,
+            inpaint_strength, inpaint_respective_field
+        ], show_progress=False, queue=False)
 
         ctrls = [currentTask, generate_image_grid]
         ctrls += [
@@ -583,74 +583,74 @@ with shared.gradio_root:
         ]
 
         ctrls += [base_model, refiner_model, refiner_switch] + lora_ctrls
-        # ctrls += [input_image_checkbox, current_tab]
-        # ctrls += [uov_method, uov_input_image]
-        # ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image]
+        ctrls += [input_image_checkbox, current_tab]
+        ctrls += [uov_method, uov_input_image]
+        ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image]
         ctrls += [disable_preview, disable_intermediate_results, disable_seed_increment]
         ctrls += [adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg]
         ctrls += [sampler_name, scheduler_name]
         ctrls += [overwrite_step, overwrite_switch, overwrite_width, overwrite_height, overwrite_vary_strength]
-        # ctrls += [overwrite_upscale_strength, mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint]
-        # ctrls += [debugging_cn_preprocessor, skipping_cn_preprocessor, canny_low_threshold, canny_high_threshold]
-        # ctrls += [refiner_swap_method, controlnet_softness]
+        ctrls += [overwrite_upscale_strength, mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint]
+        ctrls += [debugging_cn_preprocessor, skipping_cn_preprocessor, canny_low_threshold, canny_high_threshold]
+        ctrls += [refiner_swap_method, controlnet_softness]
         ctrls += freeu_ctrls
-        # ctrls += inpaint_ctrls
+        ctrls += inpaint_ctrls
 
-        # if not args_manager.args.disable_metadata:
-        #     ctrls += [save_metadata_to_images, metadata_scheme]
+        if not args_manager.args.disable_metadata:
+            ctrls += [save_metadata_to_images, metadata_scheme]
 
-        # ctrls += ip_ctrls
+        ctrls += ip_ctrls
 
-        # state_is_generating = gr.State(False)
+        state_is_generating = gr.State(False)
 
-        # def parse_meta(raw_prompt_txt, is_generating):
-        #     loaded_json = None
-        #     if is_json(raw_prompt_txt):
-        #         loaded_json = json.loads(raw_prompt_txt)
+        def parse_meta(raw_prompt_txt, is_generating):
+            loaded_json = None
+            if is_json(raw_prompt_txt):
+                loaded_json = json.loads(raw_prompt_txt)
 
-        #     if loaded_json is None:
-        #         if is_generating:
-        #             return gr.update(), gr.update(), gr.update()
-        #         else:
-        #             return gr.update(), gr.update(visible=True), gr.update(visible=False)
+            if loaded_json is None:
+                if is_generating:
+                    return gr.update(), gr.update(), gr.update()
+                else:
+                    return gr.update(), gr.update(visible=True), gr.update(visible=False)
 
-        #     return json.dumps(loaded_json), gr.update(visible=False), gr.update(visible=True)
+            return json.dumps(loaded_json), gr.update(visible=False), gr.update(visible=True)
 
-        # prompt.input(parse_meta, inputs=[prompt, state_is_generating], outputs=[prompt, generate_button, load_parameter_button], queue=False, show_progress=False)
+        prompt.input(parse_meta, inputs=[prompt, state_is_generating], outputs=[prompt, generate_button, load_parameter_button], queue=False, show_progress=False)
 
-        # load_data_outputs = [advanced_checkbox, image_number, prompt, negative_prompt, style_selections,
-        #                      performance_selection, overwrite_step, overwrite_switch, aspect_ratios_selection,
-        #                      overwrite_width, overwrite_height, guidance_scale, sharpness, adm_scaler_positive,
-        #                      adm_scaler_negative, adm_scaler_end, refiner_swap_method, adaptive_cfg, base_model,
-        #                      refiner_model, refiner_switch, sampler_name, scheduler_name, seed_random, image_seed,
-        #                      generate_button, load_parameter_button] + freeu_ctrls + lora_ctrls
+        load_data_outputs = [advanced_checkbox, image_number, prompt, negative_prompt, style_selections,
+                             performance_selection, overwrite_step, overwrite_switch, aspect_ratios_selection,
+                             overwrite_width, overwrite_height, guidance_scale, sharpness, adm_scaler_positive,
+                             adm_scaler_negative, adm_scaler_end, refiner_swap_method, adaptive_cfg, base_model,
+                             refiner_model, refiner_switch, sampler_name, scheduler_name, seed_random, image_seed,
+                             generate_button, load_parameter_button] + freeu_ctrls + lora_ctrls
 
-        # load_parameter_button.click(modules.meta_parser.load_parameter_button_click, inputs=[prompt, state_is_generating], outputs=load_data_outputs, queue=False, show_progress=False)
+        load_parameter_button.click(modules.meta_parser.load_parameter_button_click, inputs=[prompt, state_is_generating], outputs=load_data_outputs, queue=False, show_progress=False)
 
-        # # def trigger_metadata_import(filepath, state_is_generating):
-        # #     parameters, metadata_scheme = modules.meta_parser.read_info_from_image(filepath)
-        # #     if parameters is None:
-        # #         print('Could not find metadata in the image!')
-        # #         parsed_parameters = {}
-        # #     else:
-        # #         metadata_parser = modules.meta_parser.get_metadata_parser(metadata_scheme)
-        # #         parsed_parameters = metadata_parser.parse_json(parameters)
+        def trigger_metadata_import(filepath, state_is_generating):
+            parameters, metadata_scheme = modules.meta_parser.read_info_from_image(filepath)
+            if parameters is None:
+                print('Could not find metadata in the image!')
+                parsed_parameters = {}
+            else:
+                metadata_parser = modules.meta_parser.get_metadata_parser(metadata_scheme)
+                parsed_parameters = metadata_parser.parse_json(parameters)
 
-        # #     return modules.meta_parser.load_parameter_button_click(parsed_parameters, state_is_generating)
+            return modules.meta_parser.load_parameter_button_click(parsed_parameters, state_is_generating)
 
 
-        # # metadata_import_button.click(trigger_metadata_import, inputs=[metadata_input_image, state_is_generating], outputs=load_data_outputs, queue=False, show_progress=True) \
-        # #     .then(style_sorter.sort_styles, inputs=style_selections, outputs=style_selections, queue=False, show_progress=False)
+        metadata_import_button.click(trigger_metadata_import, inputs=[metadata_input_image, state_is_generating], outputs=load_data_outputs, queue=False, show_progress=True) \
+            .then(style_sorter.sort_styles, inputs=style_selections, outputs=style_selections, queue=False, show_progress=False)
 
-        # generate_button.click(lambda: (gr.update(visible=True, interactive=True), gr.update(visible=True, interactive=True), gr.update(visible=False, interactive=False), [], True),
-        #                       outputs=[stop_button, skip_button, generate_button, gallery, state_is_generating]) \
-        #     .then(fn=refresh_seed, inputs=[seed_random, image_seed], outputs=image_seed) \
-        #     .then(fn=get_task, inputs=ctrls, outputs=currentTask) \
-        #     .then(fn=generate_clicked, inputs=currentTask, outputs=[progress_html, progress_window, progress_gallery, gallery]) \
-        #     .then(lambda: (gr.update(visible=True, interactive=True), gr.update(visible=False, interactive=False), gr.update(visible=False, interactive=False), False),
-        #           outputs=[generate_button, stop_button, skip_button, state_is_generating]) \
-        #     .then(fn=update_history_link, outputs=history_link) \
-        #     .then(fn=lambda: None, _js='playNotification').then(fn=lambda: None, _js='refresh_grid_delayed')
+        generate_button.click(lambda: (gr.update(visible=True, interactive=True), gr.update(visible=True, interactive=True), gr.update(visible=False, interactive=False), [], True),
+                              outputs=[stop_button, skip_button, generate_button, gallery, state_is_generating]) \
+            .then(fn=refresh_seed, inputs=[seed_random, image_seed], outputs=image_seed) \
+            .then(fn=get_task, inputs=ctrls, outputs=currentTask) \
+            .then(fn=generate_clicked, inputs=currentTask, outputs=[progress_html, progress_window, progress_gallery, gallery]) \
+            .then(lambda: (gr.update(visible=True, interactive=True), gr.update(visible=False, interactive=False), gr.update(visible=False, interactive=False), False),
+                  outputs=[generate_button, stop_button, skip_button, state_is_generating]) \
+            .then(fn=update_history_link, outputs=history_link) \
+            .then(fn=lambda: None, _js='playNotification').then(fn=lambda: None, _js='refresh_grid_delayed')
 
         for notification_file in ['notification.ogg', 'notification.mp3']:
             if os.path.exists(notification_file):