Update app.py

app.py

@@ -72,13 +72,13 @@ def infer(
     guidance_scale,
     num_inference_steps,
     lora_scale,
-    use_controlnet,
-    controlnet_image,
-    controlnet_strength,
-    controlnet_mode,
-    use_ip_adapter,
-    ip_adapter_image,
-    ip_adapter_scale,
+    use_controlnet=False,
+    controlnet_image=None,
+    controlnet_strength=None,
+    controlnet_mode=None,
+    use_ip_adapter=False,
+    ip_adapter_image=None,
+    ip_adapter_scale=None,
     progress=gr.Progress(track_tqdm=True),
 ):
     if randomize_seed:
@@ -191,59 +191,59 @@ with gr.Blocks(css=css) as demo:
         #     outputs=lora_section
         # )
 
-        with gr.Group():
-            title = gr.Markdown(" ### ControlNet section")
-            with gr.Column():
-                use_controlnet = gr.Checkbox(label="Use ControlNet", value=False)
-
-                # Секция ControlNet (изначально скрыта)
-                with gr.Column(visible=False) as controlnet_section:
-                        controlnet_strength = gr.Slider(
-                            minimum=0.1, maximum=1.0, value=0.8, step=0.1,
-                            label="ControlNet Strength",
-                            interactive=True
-                        )
-                        controlnet_mode = gr.Dropdown(
-                            list(control_net_modes.keys()),
-                            value=next(iter(control_net_modes.keys())),
-                            label="ControlNet mode",
-                            interactive=True
-                        )
-                        controlnet_image = gr.Image(
-                            label="ControlNet image",
-                            type="pil"
-                        )
-
-        # Показывать/скрывать секцию ControlNet в зависимости от чекбокса
-        use_controlnet.change(
-            fn=lambda x: gr.update(visible=x),
-            inputs=use_controlnet,
-            outputs=controlnet_section
-        )
+        # with gr.Group():
+        #     title = gr.Markdown(" ### ControlNet section")
+        #     with gr.Column():
+        #         use_controlnet = gr.Checkbox(label="Use ControlNet", value=False)
+
+        #         # Секция ControlNet (изначально скрыта)
+        #         with gr.Column(visible=False) as controlnet_section:
+        #                 controlnet_strength = gr.Slider(
+        #                     minimum=0.1, maximum=1.0, value=0.8, step=0.1,
+        #                     label="ControlNet Strength",
+        #                     interactive=True
+        #                 )
+        #                 controlnet_mode = gr.Dropdown(
+        #                     list(control_net_modes.keys()),
+        #                     value=next(iter(control_net_modes.keys())),
+        #                     label="ControlNet mode",
+        #                     interactive=True
+        #                 )
+        #                 controlnet_image = gr.Image(
+        #                     label="ControlNet image",
+        #                     type="pil"
+        #                 )
+
+        # # Показывать/скрывать секцию ControlNet в зависимости от чекбокса
+        # use_controlnet.change(
+        #     fn=lambda x: gr.update(visible=x),
+        #     inputs=use_controlnet,
+        #     outputs=controlnet_section
+        # )
 
-        with gr.Group():
-            title = gr.Markdown(" ### IP-adapter section")
-            with gr.Column():
-                use_ip_adapter = gr.Checkbox(label="Use IP-adapter", value=False)
-
-                # Секция IP-adapter (изначально скрыта)
-                with gr.Column(visible=False) as ip_adapter_section:
-                        ip_adapter_scale = gr.Slider(
-                            minimum=0.1, maximum=1.0, value=0.5, step=0.1,
-                            label="IP-adapter Scale",
-                            interactive=True
-                        )
-                        ip_adapter_image = gr.Image(
-                            label="IP-adapter image",
-                            type="pil"
-                        )
-
-        # Показывать/скрывать секцию IP-adapter в зависимости от чекбокса
-        use_ip_adapter.change(
-            fn=lambda x: gr.update(visible=x),
-            inputs=use_ip_adapter,
-            outputs=ip_adapter_section
-        )
+        # with gr.Group():
+        #     title = gr.Markdown(" ### IP-adapter section")
+        #     with gr.Column():
+        #         use_ip_adapter = gr.Checkbox(label="Use IP-adapter", value=False)
+
+        #         # Секция IP-adapter (изначально скрыта)
+        #         with gr.Column(visible=False) as ip_adapter_section:
+        #                 ip_adapter_scale = gr.Slider(
+        #                     minimum=0.1, maximum=1.0, value=0.5, step=0.1,
+        #                     label="IP-adapter Scale",
+        #                     interactive=True
+        #                 )
+        #                 ip_adapter_image = gr.Image(
+        #                     label="IP-adapter image",
+        #                     type="pil"
+        #                 )
+
+        # # Показывать/скрывать секцию IP-adapter в зависимости от чекбокса
+        # use_ip_adapter.change(
+        #     fn=lambda x: gr.update(visible=x),
+        #     inputs=use_ip_adapter,
+        #     outputs=ip_adapter_section
+        # )
 
         with gr.Accordion("Advanced Settings", open=False):
             negative_prompt = gr.Text(
@@ -300,6 +300,31 @@ with gr.Blocks(css=css) as demo:
 
         gr.Examples(examples=examples, inputs=[prompt])
 
+    # gr.on(
+    #     triggers=[run_button.click, prompt.submit],
+    #     fn=infer,
+    #     inputs=[
+    #         model_id,
+    #         prompt,
+    #         negative_prompt,
+    #         seed,
+    #         randomize_seed,
+    #         width,
+    #         height,
+    #         guidance_scale,
+    #         num_inference_steps,
+    #         lora_scale,
+    #         use_controlnet,
+    #         controlnet_image,
+    #         controlnet_strength,
+    #         controlnet_mode,
+    #         use_ip_adapter,
+    #         ip_adapter_image,
+    #         ip_adapter_scale,
+    #     ],
+    #     outputs=[result, seed],
+    # )
+
     gr.on(
         triggers=[run_button.click, prompt.submit],
         fn=infer,
@@ -314,17 +339,9 @@ with gr.Blocks(css=css) as demo:
             guidance_scale,
             num_inference_steps,
             lora_scale,
-            use_controlnet,
-            controlnet_image,
-            controlnet_strength,
-            controlnet_mode,
-            use_ip_adapter,
-            ip_adapter_image,
-            ip_adapter_scale,
         ],
         outputs=[result, seed],
     )
 
-
 if __name__ == "__main__":
     demo.launch()