Update app.py

app.py

@@ -3,20 +3,12 @@ import os
 import torch
 import modules.wdtagger
 
-from modules.model import get_model_and_vae_options
-from modules.text2img import generate_image_wrapper
-
-# Mendapatkan daftar model dan VAE untuk dropdown
-all_models, all_vaes = get_model_and_vae_options()
-
-
 # Daftar model dan ControlNet
 models = ["Model A", "Model B", "Model C"]
 vae = ["VAE A", "VAE B", "VAE C"]
 controlnet_types = ["Canny", "Depth", "Normal", "Pose"]
 schedulers = ["Euler", "LMS", "DDIM"]
 
-
 # Fungsi placeholder
 def load_model(selected_model):
     return f"Model {selected_model} telah dimuat."
@@ -50,58 +42,56 @@ def intpaint_func (image, controlnet_type, model):
 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=all_models[0])
-        vae_dropdown = gr.Dropdown(choices=all_vaes, label="VAE", value=all_vaes[0])
+        checkpoint = gr.Dropdown(choices=all_models, label="Model", value=all_models[0])
+        vae = gr.Dropdown(choices=all_vaes, label="VAE", value=all_vaes[0])
+        load = gr.Button("Load")
 
     # Tab untuk Text-to-Image
     with gr.Tab("Text-to-Image"):
         with gr.Row():
             with gr.Column(scale=1):
-                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)
+                prompt_t2i = gr.Textbox(label="Prompt", placeholder="Enter Prompt", lines=2, elem_id="prompt-input")
+                neg_prompt_t2i = gr.Textbox(label="Negative prompt", placeholder="Enter Negative Prompt (optional)", lines=2, elem_id="neg-prompt-input")
+            generate_t2i = 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)
+                    scheduler_t2i = gr.Dropdown(choices=schedulers, label="Sampling method", value=schedulers[0])
+                    seed_t2i = 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)
+                    width_t2i = gr.Slider(minimum=128, maximum=2048, step=128, label="Width", value=1024)
+                    batch_size_t2i = 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)
+                    height_t2i = gr.Slider(minimum=128, maximum=2048, step=128, label="Height", value=1024)
+                    batch_count_t2i = 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)
+                    num_steps_t2i = gr.Slider(minimum=1, maximum=100, step=1, label="Sampling steps", value=20)
+                    cfg_scale_t2i = 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)
+                    use_hires_t2i = gr.Checkbox(label="Use Hires?", value=False, scale=0)
                     with gr.Row():
-                        upscaler = gr.Dropdown(choices=schedulers, label="Upscaler", value=schedulers[0])
-                        upscale_by = gr.Slider(minimum=1, maximum=8, step=1, label="Upscale by", value=2)
+                        upscaler_t2i = gr.Dropdown(choices=schedulers, label="Upscaler", value=schedulers[0])
+                        upscale_by_t2i = gr.Slider(minimum=1, maximum=8, step=1, label="Upscale by", value=2)
                     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)
+                        hires_steps_t2i = gr.Slider(minimum=1, maximum=50, step=1, label="Hires Steps", value=20)
+                        denois_strength_t2i = 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_gallery_t2i = 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, batch_size, batch_count, cfg_scale, seed, model, vae):
-            # Update fungsi sesuai kebutuhan
-            return generate_image_wrapper(prompt, neg_prompt, width, height, scheduler, num_steps, batch_size, batch_count, cfg_scale, seed, model, vae)
+                output_text_t2i = gr.Textbox(label="Metadata", placeholder="Results are in Json format", lines=2)
 
+                    
         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]
+            inputs=[prompt_t2i, neg_prompt_t2i, width_t2i, height_t2i, scheduler_t2i, num_steps_t2i, batch_size_t2i, batch_count_t2i, cfg_scale_t2i, seed_t2i, use_hires_t2i, upscaler_t2i, upscale_by_t2i, hires_steps_t2i, denois_strength_t2i], 
+            outputs=[output_gallery_t2i, output_text_t2i]
         )
         
     # Tab untuk Image-to-Image