refactor

app.py

@@ -1,9 +1,11 @@
-import spaces  # must imported when using spaces
+import spaces
 import os
 from stablepy import Model_Diffusers
+from stablepy.diffusers_vanilla.model import scheduler_names
 from stablepy.diffusers_vanilla.style_prompt_config import STYLE_NAMES
 import torch
 import re
+import shutil
 import random
 from stablepy import (
     CONTROLNET_MODEL_IDS,
@@ -20,6 +22,7 @@ from stablepy import (
     SD15_TASKS,
     SDXL_TASKS,
 )
+import urllib.parse
 from config import (
     MINIMUM_IMAGE_NUMBER,
     MAXIMUM_IMAGE_NUMBER,
@@ -65,7 +68,6 @@ task_stablepy: dict = {
 CIVITAI_API_KEY: str = os.environ.get("CIVITAI_API_KEY")
 hf_token: str = os.environ.get("HF_TOKEN")
 
-
 task_model_list = list(task_stablepy.keys())
 
 directory_models: str = 'models'
@@ -251,7 +253,7 @@ class GuiSD:
         )
         yield f"Model loaded: {model_name}"
 
-    @spaces.GPU(duration=60)
+    @spaces.GPU
     def generate_pipeline(
             self,
             prompt,
@@ -354,12 +356,10 @@ class GuiSD:
             mask_ip2,
             model_ip2,
             mode_ip2,
-            scale_ip2,
-    ):
-
+            scale_ip2):
         vae_model = vae_model if vae_model != "None" else None
-        loras_list = [lora1, lora2, lora3, lora4, lora5]
-        vae_msg = f"VAE: {vae_model}" if vae_model else ""
+        loras_list: list = [lora1, lora2, lora3, lora4, lora5]
+        vae_msg: str = f"VAE: {vae_model}" if vae_model else ""
         msg_lora: list = []
 
         if model_name in model_list:
@@ -637,7 +637,6 @@ with gr.Blocks(css=CSS) as app:
     gr.Markdown("# 🧩 (Ivan) DiffuseCraft")
     with gr.Tab("Generation"):
         with gr.Row():
-
             with gr.Column(scale=2):
 
                 task_gui = gr.Dropdown(
@@ -667,6 +666,7 @@ with gr.Blocks(css=CSS) as app:
                     set_params_gui = gr.Button(value="↙️")
                     clear_prompt_gui = gr.Button(value="🗑️")
                     set_random_seed = gr.Button(value="🎲")
+
                 generate_button = gr.Button(
                     value="GENERATE",
                     variant="primary"
@@ -857,7 +857,6 @@ with gr.Blocks(css=CSS) as app:
                         choices=upscaler_keys,
                         value=upscaler_keys[0]
                     )
-
                     upscaler_increases_size_gui = gr.Slider(
                         minimum=1.1,
                         maximum=6.,
@@ -986,7 +985,13 @@ with gr.Blocks(css=CSS) as app:
                         )
 
                 with gr.Accordion("IP-Adapter", open=False, visible=True):  # IP-Adapter
-                    IP_MODELS = sorted(list(set(IP_ADAPTERS_SD + IP_ADAPTERS_SDXL)))
+                    IP_MODELS = sorted(
+                        list(
+                            set(
+                                IP_ADAPTERS_SD + IP_ADAPTERS_SDXL
+                            )
+                        )
+                    )
                     MODE_IP_OPTIONS = [
                         "original",
                         "style",
@@ -1048,7 +1053,10 @@ with gr.Blocks(css=CSS) as app:
                             label="Scale"
                         )
 
-                with gr.Accordion("ControlNet / Img2img / Inpaint", open=False, visible=True):
+                with gr.Accordion(
+                        "ControlNet / Img2img / Inpaint",
+                        open=False,
+                        visible=True):
                     image_control = gr.Image(
                         label="Image ControlNet/Inpaint/Img2img",
                         type="filepath"
@@ -1170,7 +1178,10 @@ with gr.Blocks(css=CSS) as app:
                         label="Adapter Conditioning Factor (%)"
                     )
 
-                with gr.Accordion("Styles", open=False, visible=True):
+                with gr.Accordion(
+                        "Styles",
+                        open=False,
+                        visible=True):
 
                     try:
                         style_names_found = sd_gen.model.STYLE_NAMES
@@ -1191,11 +1202,17 @@ with gr.Blocks(css=CSS) as app:
                     def load_json_style_file(json):
                         if not sd_gen.model:
                             gr.Info("First load the model")
-                            return gr.update(value=None, choices=STYLE_NAMES)
+                            return gr.update(
+                                value=None,
+                                choices=STYLE_NAMES
+                            )
 
                         sd_gen.model.load_style_file(json)
                         gr.Info(f"{len(sd_gen.model.STYLE_NAMES)} styles loaded")
-                        return gr.update(value=None, choices=sd_gen.model.STYLE_NAMES)
+                        return gr.update(
+                            value=None,
+                            choices=sd_gen.model.STYLE_NAMES
+                        )
 
 
                     style_button.click(
@@ -1296,12 +1313,33 @@ with gr.Blocks(css=CSS) as app:
                             minimum=0.01,
                             maximum=1.0
                         )
-                        face_detector_ad_b_gui = gr.Checkbox(label="Face detector", value=True)
-                        person_detector_ad_b_gui = gr.Checkbox(label="Person detector", value=True)
-                        hand_detector_ad_b_gui = gr.Checkbox(label="Hand detector", value=False)
-                        mask_dilation_b_gui = gr.Number(label="Mask dilation:", value=4, minimum=1)
-                        mask_blur_b_gui = gr.Number(label="Mask blur:", value=4, minimum=1)
-                        mask_padding_b_gui = gr.Number(label="Mask padding:", value=32, minimum=1)
+                        face_detector_ad_b_gui = gr.Checkbox(
+                            label="Face detector",
+                            value=True
+                        )
+                        person_detector_ad_b_gui = gr.Checkbox(
+                            label="Person detector",
+                            value=True
+                        )
+                        hand_detector_ad_b_gui = gr.Checkbox(
+                            label="Hand detector",
+                            value=False
+                        )
+                        mask_dilation_b_gui = gr.Number(
+                            label="Mask dilation:",
+                            value=4,
+                            minimum=1
+                        )
+                        mask_blur_b_gui = gr.Number(
+                            label="Mask blur:",
+                            value=4,
+                            minimum=1
+                        )
+                        mask_padding_b_gui = gr.Number(
+                            label="Mask padding:",
+                            value=32,
+                            minimum=1
+                        )
 
                 with gr.Accordion(
                         "Other settings",
@@ -1501,7 +1539,10 @@ with gr.Blocks(css=CSS) as app:
                     ),
                     eraser=gr.Eraser(default_size="16")
                 )
-                invert_mask = gr.Checkbox(value=False, label="Invert mask")
+                invert_mask = gr.Checkbox(
+                    value=False,
+                    label="Invert mask"
+                )
                 btn = gr.Button("Create mask")
             with gr.Column(scale=1):
                 img_source = gr.Image(interactive=False)