refactor

app.py

@@ -138,7 +138,7 @@ vae_model_list = get_model_list(directory_vaes)
 vae_model_list.insert(0, "None")
 
 
-def get_my_lora(link_url):
+def get_my_lora(link_url) -> tuple:
     for __url in [_url.strip() for _url in link_url.split(',')]:
         if not os.path.exists(f"./loras/{__url.split('/')[-1]}"):
             download_things(
@@ -148,7 +148,7 @@ def get_my_lora(link_url):
                 CIVITAI_API_KEY
             )
 
-    new_lora_model_list = get_model_list(directory_loras)
+    new_lora_model_list: list = get_model_list(directory_loras)
     new_lora_model_list.insert(0, "None")
 
     return gr.update(
@@ -204,18 +204,6 @@ warnings.filterwarnings(
 logger.setLevel(logging.DEBUG)
 
 
-def info_html(json_data, title, subtitle):
-    return f"""
-        <div style='padding: 0; border-radius: 10px;'>
-            <p style='margin: 0; font-weight: bold;'>{title}</p>
-            <details>
-                <summary>Details</summary>
-                <p style='margin: 0; font-weight: bold;'>{subtitle}</p>
-            </details>
-        </div>
-        """
-
-
 class GuiSD:
     def __init__(self, stream=True):
         self.model = None
@@ -229,8 +217,18 @@ class GuiSD:
             retain_task_model_in_cache=False,
         )
 
-    def load_new_model(self, model_name, vae_model, task, progress=gr.Progress(track_tqdm=True)):
-
+    def load_new_model(
+            self,
+            model_name,
+            vae_model,
+            task,
+            progress=gr.Progress(track_tqdm=True)):
+        """
+        :param model_name:
+        :param vae_model:
+        :param task:
+        :param progress:
+        """
         yield f"Loading model: {model_name}"
 
         vae_model = vae_model if vae_model != "None" else None
@@ -406,7 +404,11 @@ class GuiSD:
             (image_ip2, mask_ip2, model_ip2, mode_ip2, scale_ip2),
         ]
 
-        for imgip, mskip, modelip, modeip, scaleip in all_adapters:
+        for (imgip,
+             mskip,
+             modelip,
+             modeip,
+             scaleip) in all_adapters:
             if imgip:
                 params_ip_img.append(imgip)
                 if mskip:
@@ -748,7 +750,7 @@ with gr.Blocks(css=CSS) as app:
                 with gr.Row(equal_height=False):
 
                     def run_set_params_gui(base_prompt):
-                        valid_receptors = {  # default values
+                        valid_receptors: dict = {  # default values
                             "prompt": gr.update(value=base_prompt),
                             "neg_prompt": gr.update(value=""),
                             "Steps": gr.update(value=30),
@@ -848,7 +850,10 @@ with gr.Blocks(css=CSS) as app:
                     value=vae_model_list[1]
                 )
 
-                with gr.Accordion("Hires fix", open=False, visible=True):
+                with gr.Accordion(
+                        "Hires fix",
+                        open=False,
+                        visible=True):
 
                     upscaler_keys = list(upscaler_dict_gui.keys())
 
@@ -965,7 +970,10 @@ with gr.Blocks(css=CSS) as app:
                         label="Lora Scale 5"
                     )
 
-                    with gr.Accordion("From URL", open=False, visible=True):
+                    with gr.Accordion(
+                            "From URL",
+                            open=False,
+                            visible=True):
                         text_lora = gr.Textbox(
                             label="URL",
                             placeholder="http://...my_lora_url.safetensors",
@@ -1096,7 +1104,6 @@ with gr.Blocks(css=CSS) as app:
                             value=choices_task[0]
                         )
 
-
                     task_gui.change(
                         change_preprocessor_choices,
                         [task_gui],
@@ -1158,7 +1165,10 @@ with gr.Blocks(css=CSS) as app:
                         label="ControlNet Stop Threshold (%)"
                     )
 
-                with gr.Accordion("T2I adapter", open=False, visible=True):
+                with gr.Accordion(
+                        "T2I adapter",
+                        open=False,
+                        visible=True):
                     t2i_adapter_preprocessor_gui = gr.Checkbox(
                         value=True,
                         label="T2i Adapter Preprocessor"
@@ -1221,13 +1231,19 @@ with gr.Blocks(css=CSS) as app:
                         [style_prompt_gui]
                     )
 
-                with gr.Accordion("Textual inversion", open=False, visible=False):
+                with gr.Accordion(
+                        "Textual inversion",
+                        open=False,
+                        visible=False):
                     active_textual_inversion_gui = gr.Checkbox(
                         value=False,
                         label="Active Textual Inversion in prompt"
                     )
 
-                with gr.Accordion("Detailfix", open=False, visible=True):
+                with gr.Accordion(
+                        "Detailfix",
+                        open=False,
+                        visible=True):
 
                     # Adetailer Inpaint Only
                     adetailer_inpaint_only_gui = gr.Checkbox(label="Inpaint only", value=True)
@@ -1243,7 +1259,10 @@ with gr.Blocks(css=CSS) as app:
                         value="Use same sampler"
                     )
 
-                    with gr.Accordion("Detailfix A", open=False, visible=True):
+                    with gr.Accordion(
+                            "Detailfix A",
+                            open=False,
+                            visible=True):
                         # Adetailer A
                         adetailer_active_a_gui = gr.Checkbox(
                             label="Enable Adetailer A",
@@ -1293,7 +1312,10 @@ with gr.Blocks(css=CSS) as app:
                             minimum=1
                         )
 
-                    with gr.Accordion("Detailfix B", open=False, visible=True):
+                    with gr.Accordion(
+                            "Detailfix B",
+                            open=False,
+                            visible=True):
                         # Adetailer B
                         adetailer_active_b_gui = gr.Checkbox(label="Enable Adetailer B", value=False)
                         prompt_ad_b_gui = gr.Textbox(
@@ -1362,7 +1384,10 @@ with gr.Blocks(css=CSS) as app:
                         label="Generator in CPU"
                     )
 
-                with gr.Accordion("More settings", open=False, visible=False):
+                with gr.Accordion(
+                        "More settings",
+                        open=False,
+                        visible=False):
                     loop_generation_gui = gr.Slider(
                         minimum=1,
                         value=1,
@@ -1544,6 +1569,7 @@ with gr.Blocks(css=CSS) as app:
                     label="Invert mask"
                 )
                 btn = gr.Button("Create mask")
+
             with gr.Column(scale=1):
                 img_source = gr.Image(interactive=False)
                 img_result = gr.Image(

utils/html_utils.py

@@ -0,0 +1,16 @@
+def info_html(json_data, title, subtitle):
+    """
+    :param json_data:
+    :param title:
+    :param subtitle:
+    :return:
+    """
+    return f"""
+        <div style='padding: 0; border-radius: 10px;'>
+            <p style='margin: 0; font-weight: bold;'>{title}</p>
+            <details>
+                <summary>Details</summary>
+                <p style='margin: 0; font-weight: bold;'>{subtitle}</p>
+            </details>
+        </div>
+        """