Update app.py

app.py

@@ -47,13 +47,12 @@ def intpaint_func (image, controlnet_type, model):
     return controlnet_process(image, controlnet_type, model)
 
 
-
-with gr.Blocks(css= "style.css") as app:
+with gr.Blocks(css="style.css") as app:
     # Dropdown untuk memilih model di luar tab dengan lebar kecil
     with gr.Row():
-        checkpoint_dropdown = gr.Dropdown(choices=all_models, label="Model", value="Model B")
-        vae_dropdown = gr.Dropdown(choices=all_vaes, label="VAE", value="VAE C")
-    
+        checkpoint_dropdown = gr.Dropdown(choices=all_models, label="Model", value=all_models[0])
+        vae_dropdown = gr.Dropdown(choices=all_vaes, label="VAE", value=all_vaes[0])
+
     # Tab untuk Text-to-Image
     with gr.Tab("Text-to-Image"):
         with gr.Row():
@@ -61,25 +60,25 @@ with gr.Blocks(css= "style.css") as app:
                 prompt_input = gr.Textbox(label="Prompt", placeholder="Enter Prompt", lines=2, elem_id="prompt-input")
                 neg_prompt_input = gr.Textbox(label="Negative prompt", placeholder="Enter Negative Prompt (optional)", lines=2, elem_id="neg-prompt-input")
             generate_button = gr.Button("Generate", elem_id="generate-button", scale=0.13)
-        
+
         with gr.Row():
             with gr.Column():
                 with gr.Row():
                     scheduler_input = gr.Dropdown(choices=schedulers, label="Sampling method", value=schedulers[0])
                     seed_input = gr.Number(label="Seed", value=-1)
-                
+
                 with gr.Row():
                     width_input = gr.Slider(minimum=128, maximum=2048, step=128, label="Width", value=1024)
                     batch_size = gr.Slider(minimum=1, maximum=24, step=1, label="Batch size", value=1)
-                
+
                 with gr.Row():
                     height_input = gr.Slider(minimum=128, maximum=2048, step=128, label="Height", value=1024)
                     batch_count = gr.Slider(minimum=1, maximum=24, step=1, label="Batch Count", value=1)
-                
+
                 with gr.Row():
                     num_steps_input = gr.Slider(minimum=1, maximum=100, step=1, label="Sampling steps", value=20)
                     cfg_scale_input = gr.Slider(minimum=1, maximum=20, step=1, label="CFG Scale", value=7)
-                
+
                 with gr.Accordion("Hires. fix", open=False):
                     use_hires = gr.Checkbox(label="Use Hires?", value=False, scale=0)
                     with gr.Row():
@@ -88,20 +87,23 @@ with gr.Blocks(css= "style.css") as app:
                     with gr.Row():
                         hires_steps = gr.Slider(minimum=1, maximum=50, step=1, label="Hires Steps", value=20)
                         denois_strength = gr.Slider(minimum=0, maximum=1, step=0.02, label="Denoising Strength", value=2)
-            
-            
+
             with gr.Column():
                 # Gallery untuk output gambar
                 output_gallery = gr.Gallery(label="Image Results")
                 # Output teks JSON di bawah gallery
                 output_text = gr.Textbox(label="Metadata", placeholder="Results are in Json format", lines=2)
 
-        def update_images(prompt, neg_prompt, width, height, scheduler, num_steps, num_images, cfg_scale, seed, model):
+        def update_images(prompt, neg_prompt, width, height, scheduler, num_steps, batch_size, batch_count, cfg_scale, seed, model, vae):
             # Update fungsi sesuai kebutuhan
-            return generate_image(prompt, neg_prompt, width, height, scheduler, num_steps, num_images, cfg_scale, seed, model)
-        
-        generate_button.click(fn=update_images, inputs=[prompt_input, neg_prompt_input, width_input, height_input, scheduler_input, num_steps_input, batch_size, batch_count, cfg_scale_input, seed_input, checkpoint_dropdown, vae_dropdown], outputs=[output_gallery, output_text])
+            return generate_image_wrapper(prompt, neg_prompt, width, height, scheduler, num_steps, batch_size, batch_count, cfg_scale, seed, model, vae)
 
+        generate_button.click(
+            fn=update_images, 
+            inputs=[prompt_input, neg_prompt_input, width_input, height_input, scheduler_input, num_steps_input, batch_size, batch_count, cfg_scale_input, seed_input, checkpoint_dropdown, vae_dropdown], 
+            outputs=[output_gallery, output_text]
+        )
+        
     # Tab untuk Image-to-Image
     with gr.Tab("Image-to-Image"):
         with gr.Row():