Upload app.py

app.py

@@ -75,7 +75,7 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
 
             with gr.Accordion("Advanced Settings", open=True):
                 task = gr.Dropdown(label="Task", choices=SDXL_TASK, value=TASK_MODEL_LIST[0])
-                with gr.Tab("Model & Prompt"):
+                with gr.Tab("Generation Settings"):
                     with gr.Row():
                         negative_prompt = gr.Text(label="Negative prompt", lines=1, max_lines=6, placeholder="Enter a negative prompt", show_copy_button=True,
                                                 value="(low quality, worst quality:1.2), very displeasing, watermark, signature, ugly")
@@ -87,12 +87,12 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
                             model_info = gr.Markdown(elem_classes="info")
                         with gr.Column(scale=1):
                             model_detail = gr.Checkbox(label="Show detail of model in list", value=False)
-                    with gr.Row():
-                        quality_selector = gr.Radio(label="Quality Tag Presets", interactive=True, choices=list(preset_quality.keys()), value="None", scale=3)
-                        style_selector = gr.Radio(label="Style Presets", interactive=True, choices=list(preset_styles.keys()), value="None", scale=3)
+                    with gr.Accordion("Prompt Settings", open=False):
+                        with gr.Row():
+                            quality_selector = gr.Radio(label="Quality Tag Presets", interactive=True, choices=list(preset_quality.keys()), value="None", scale=3)
+                            style_selector = gr.Radio(label="Style Presets", interactive=True, choices=list(preset_styles.keys()), value="None", scale=3)
                         recom_prompt = gr.Checkbox(label="Recommended prompt", value=True, scale=1)
-
-                with gr.Tab("Generation Settings"):
+                        prompt_syntax = gr.Dropdown(label="Prompt Syntax", choices=PROMPT_W_OPTIONS, value=PROMPT_W_OPTIONS[1][1])
                     with gr.Row():
                         seed = gr.Slider(label="Seed", minimum=0, maximum=MAX_SEED, step=1, value=0)
                         randomize_seed = gr.Checkbox(label="Randomize seed", value=True)
@@ -112,7 +112,10 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
                         schedule_type = gr.Dropdown(label="Schedule type", choices=SCHEDULE_TYPE_OPTIONS, value=SCHEDULE_TYPE_OPTIONS[0])
                         schedule_prediction_type = gr.Dropdown(label="Discrete Sampling Type", choices=SCHEDULE_PREDICTION_TYPE_OPTIONS, value=SCHEDULE_PREDICTION_TYPE_OPTIONS[0])
                         vae_model = gr.Dropdown(label="VAE Model", choices=get_vaes(), value=get_vaes()[0])
-                        prompt_syntax = gr.Dropdown(label="Prompt Syntax", choices=PROMPT_W_OPTIONS, value=PROMPT_W_OPTIONS[1][1])
+                    with gr.Accordion("Other Settings", open=False):
+                        with gr.Accordion("Textual inversion", open=True):
+                            active_textual_inversion = gr.Checkbox(value=False, label="Active Textual Inversion in prompt")
+                            use_textual_inversion = gr.CheckboxGroup(choices=get_ti_choices(model_name.value) if active_textual_inversion.value else [], value=None, label="Use Textual Invertion in prompt")
 
                 with gr.Tab("LoRA"):
                     def lora_dropdown(label, visible=True):
@@ -276,65 +279,61 @@ with gr.Blocks(fill_width=True, elem_id="container", css=css, delete_cache=(60,
                         cm_btn_send_ip1.click(send_img, [img_source, img_result], [image_ip1, mask_ip1], queue=False, show_api=False)
                         cm_btn_send_ip2.click(send_img, [img_source, img_result], [image_ip2, mask_ip2], queue=False, show_api=False)
 
-                with gr.Tab("Hires fix"):
-                    with gr.Row():
-                        upscaler_model_path = gr.Dropdown(label="Upscaler", choices=UPSCALER_KEYS, value=UPSCALER_KEYS[0])
-                        upscaler_increases_size = gr.Slider(minimum=1.1, maximum=4., step=0.1, value=1.2, label="Upscale by")
-                        esrgan_tile = gr.Slider(minimum=0, value=0, maximum=500, step=1, label="ESRGAN Tile")
-                        esrgan_tile_overlap = gr.Slider(minimum=1, maximum=200, step=1, value=8, label="ESRGAN Tile Overlap")
-                    with gr.Row():
-                        hires_steps = gr.Slider(minimum=0, value=30, maximum=100, step=1, label="Hires Steps")
-                        hires_denoising_strength = gr.Slider(minimum=0.1, maximum=1.0, step=0.01, value=0.55, label="Hires Denoising Strength")
-                        hires_sampler = gr.Dropdown(label="Hires Sampler", choices=POST_PROCESSING_SAMPLER, value=POST_PROCESSING_SAMPLER[0])
-                        hires_schedule_list = ["Use same schedule type"] + SCHEDULE_TYPE_OPTIONS
-                        hires_schedule_type = gr.Dropdown(label="Hires Schedule type", choices=hires_schedule_list, value=hires_schedule_list[0])
-                        hires_guidance_scale = gr.Slider(minimum=-1., maximum=30., step=0.5, value=-1., label="Hires CFG", info="If the value is -1, the main CFG will be used")
-                    with gr.Row():
-                        hires_prompt = gr.Textbox(label="Hires Prompt", placeholder="Main prompt will be use", lines=3)
-                        hires_negative_prompt = gr.Textbox(label="Hires Negative Prompt", placeholder="Main negative prompt will be use", lines=3)
-
-                with gr.Tab("Detailfix"):
-                    with gr.Row():
-                        # Adetailer Inpaint Only
-                        adetailer_inpaint_only = gr.Checkbox(label="Inpaint only", value=True)
-                        # Adetailer Verbose
-                        adetailer_verbose = gr.Checkbox(label="Verbose", value=False)
-                        # Adetailer Sampler
-                        adetailer_sampler = gr.Dropdown(label="Adetailer sampler:", choices=POST_PROCESSING_SAMPLER, value=POST_PROCESSING_SAMPLER[0])
-                    with gr.Row():
-                        with gr.Accordion("Detailfix A", open=True, visible=True):
-                            # Adetailer A
-                            adetailer_active_a = gr.Checkbox(label="Enable Adetailer A", value=False)
-                            prompt_ad_a = gr.Textbox(label="Main prompt", placeholder="Main prompt will be use", lines=3)
-                            negative_prompt_ad_a = gr.Textbox(label="Negative prompt", placeholder="Main negative prompt will be use", lines=3)
-                            with gr.Row():
-                                strength_ad_a = gr.Number(label="Strength:", value=0.35, step=0.01, minimum=0.01, maximum=1.0)
-                                face_detector_ad_a = gr.Checkbox(label="Face detector", value=False)
-                                person_detector_ad_a = gr.Checkbox(label="Person detector", value=True)
-                                hand_detector_ad_a = gr.Checkbox(label="Hand detector", value=False)
-                            with gr.Row():
-                                mask_dilation_a = gr.Number(label="Mask dilation:", value=4, minimum=1)
-                                mask_blur_a = gr.Number(label="Mask blur:", value=4, minimum=1)
-                                mask_padding_a = gr.Number(label="Mask padding:", value=32, minimum=1)
-                        with gr.Accordion("Detailfix B", open=True, visible=True):
-                            # Adetailer B
-                            adetailer_active_b = gr.Checkbox(label="Enable Adetailer B", value=False)
-                            prompt_ad_b = gr.Textbox(label="Main prompt", placeholder="Main prompt will be use", lines=3)
-                            negative_prompt_ad_b = gr.Textbox(label="Negative prompt", placeholder="Main negative prompt will be use", lines=3)
-                            with gr.Row():
-                                strength_ad_b = gr.Number(label="Strength:", value=0.35, step=0.01, minimum=0.01, maximum=1.0)
-                                face_detector_ad_b = gr.Checkbox(label="Face detector", value=False)
-                                person_detector_ad_b = gr.Checkbox(label="Person detector", value=True)
-                                hand_detector_ad_b = gr.Checkbox(label="Hand detector", value=False)
-                            with gr.Row():
-                                mask_dilation_b = gr.Number(label="Mask dilation:", value=4, minimum=1)
-                                mask_blur_b = gr.Number(label="Mask blur:", value=4, minimum=1)
-                                mask_padding_b = gr.Number(label="Mask padding:", value=32, minimum=1)
+                with gr.Tab("Hires fix / Detailfix"):
+                    with gr.Accordion("Hires fix", open=True):
+                        with gr.Row():
+                            upscaler_model_path = gr.Dropdown(label="Upscaler", choices=UPSCALER_KEYS, value=UPSCALER_KEYS[0])
+                            upscaler_increases_size = gr.Slider(minimum=1.1, maximum=4., step=0.1, value=1.2, label="Upscale by")
+                            esrgan_tile = gr.Slider(minimum=0, value=0, maximum=500, step=1, label="ESRGAN Tile")
+                            esrgan_tile_overlap = gr.Slider(minimum=1, maximum=200, step=1, value=8, label="ESRGAN Tile Overlap")
+                        with gr.Row():
+                            hires_steps = gr.Slider(minimum=0, value=30, maximum=100, step=1, label="Hires Steps")
+                            hires_denoising_strength = gr.Slider(minimum=0.1, maximum=1.0, step=0.01, value=0.55, label="Hires Denoising Strength")
+                            hires_sampler = gr.Dropdown(label="Hires Sampler", choices=POST_PROCESSING_SAMPLER, value=POST_PROCESSING_SAMPLER[0])
+                            hires_schedule_list = ["Use same schedule type"] + SCHEDULE_TYPE_OPTIONS
+                            hires_schedule_type = gr.Dropdown(label="Hires Schedule type", choices=hires_schedule_list, value=hires_schedule_list[0])
+                            hires_guidance_scale = gr.Slider(minimum=-1., maximum=30., step=0.5, value=-1., label="Hires CFG", info="If the value is -1, the main CFG will be used")
+                        with gr.Row():
+                            hires_prompt = gr.Textbox(label="Hires Prompt", placeholder="Main prompt will be use", lines=3)
+                            hires_negative_prompt = gr.Textbox(label="Hires Negative Prompt", placeholder="Main negative prompt will be use", lines=3)
+                    with gr.Accordion("Detail fix", open=True):
+                        with gr.Row():
+                            # Adetailer Inpaint Only
+                            adetailer_inpaint_only = gr.Checkbox(label="Inpaint only", value=True)
+                            # Adetailer Verbose
+                            adetailer_verbose = gr.Checkbox(label="Verbose", value=False)
+                            # Adetailer Sampler
+                            adetailer_sampler = gr.Dropdown(label="Adetailer sampler:", choices=POST_PROCESSING_SAMPLER, value=POST_PROCESSING_SAMPLER[0])
+                        with gr.Row():
+                            with gr.Accordion("Detailfix A", open=True, visible=True):
+                                # Adetailer A
+                                adetailer_active_a = gr.Checkbox(label="Enable Adetailer A", value=False)
+                                prompt_ad_a = gr.Textbox(label="Main prompt", placeholder="Main prompt will be use", lines=3)
+                                negative_prompt_ad_a = gr.Textbox(label="Negative prompt", placeholder="Main negative prompt will be use", lines=3)
+                                with gr.Row():
+                                    strength_ad_a = gr.Number(label="Strength:", value=0.35, step=0.01, minimum=0.01, maximum=1.0)
+                                    face_detector_ad_a = gr.Checkbox(label="Face detector", value=False)
+                                    person_detector_ad_a = gr.Checkbox(label="Person detector", value=True)
+                                    hand_detector_ad_a = gr.Checkbox(label="Hand detector", value=False)
+                                with gr.Row():
+                                    mask_dilation_a = gr.Number(label="Mask dilation:", value=4, minimum=1)
+                                    mask_blur_a = gr.Number(label="Mask blur:", value=4, minimum=1)
+                                    mask_padding_a = gr.Number(label="Mask padding:", value=32, minimum=1)
+                            with gr.Accordion("Detailfix B", open=True, visible=True):
+                                # Adetailer B
+                                adetailer_active_b = gr.Checkbox(label="Enable Adetailer B", value=False)
+                                prompt_ad_b = gr.Textbox(label="Main prompt", placeholder="Main prompt will be use", lines=3)
+                                negative_prompt_ad_b = gr.Textbox(label="Negative prompt", placeholder="Main negative prompt will be use", lines=3)
+                                with gr.Row():
+                                    strength_ad_b = gr.Number(label="Strength:", value=0.35, step=0.01, minimum=0.01, maximum=1.0)
+                                    face_detector_ad_b = gr.Checkbox(label="Face detector", value=False)
+                                    person_detector_ad_b = gr.Checkbox(label="Person detector", value=True)
+                                    hand_detector_ad_b = gr.Checkbox(label="Hand detector", value=False)
+                                with gr.Row():
+                                    mask_dilation_b = gr.Number(label="Mask dilation:", value=4, minimum=1)
+                                    mask_blur_b = gr.Number(label="Mask blur:", value=4, minimum=1)
+                                    mask_padding_b = gr.Number(label="Mask padding:", value=32, minimum=1)
                                     
-                with gr.Tab("Textual inversion"):
-                    active_textual_inversion = gr.Checkbox(value=False, label="Active Textual Inversion in prompt")
-                    use_textual_inversion = gr.CheckboxGroup(choices=get_ti_choices(model_name.value) if active_textual_inversion.value else [], value=None, label="Use Textual Invertion in prompt")
-
                 with gr.Tab("Translation Settings"):
                     chatbot = gr.Chatbot(render_markdown=False, visible=False) # component for auto-translation
                     chat_model = gr.Dropdown(choices=get_dolphin_models(), value=get_dolphin_models()[0][1], allow_custom_value=True, label="Model")