add config.py

app.py

@@ -23,6 +23,10 @@ from stablepy import (
     SDXL_TASKS,
 )
 import urllib.parse
+from config import (
+    MINIMUM_IMAGE_NUMBER,
+    MAXIMUM_IMAGE_NUMBER
+)
 
 preprocessor_controlnet = {
     "openpose": [
@@ -139,8 +143,14 @@ def download_things(directory, url, hf_token="", civitai_api_key=""):
 
 
 def get_model_list(directory_path):
-    model_list = []
-    valid_extensions = {'.ckpt', '.pt', '.pth', '.safetensors', '.bin'}
+    model_list: list = []
+    valid_extensions = {
+        '.ckpt',
+        '.pt',
+        '.pth',
+        '.safetensors',
+        '.bin'
+    }
 
     for filename in os.listdir(directory_path):
         if os.path.splitext(filename)[1] in valid_extensions:
@@ -174,6 +184,7 @@ os.makedirs(directory_vaes, exist_ok=True)
 # - **Download SD 1.5 Models**
 download_model = (
     "https://civitai.com/api/download/models/597138, "
+    "https://civitai.com/api/download/models/469243, "
     "https://civitai.com/api/download/models/609052, "
     "https://civitai.com/api/download/models/5036?type=Model&format=SafeTensor&size=full&fp=fp16, "
     "https://civitai.com/api/download/models/574369, "
@@ -191,6 +202,7 @@ download_vae = (
 )
 # - **Download LoRAs**
 download_lora = (
+    "https://civitai.com/api/download/models/423719, "
     "https://civitai.com/api/download/models/50503, "
     "https://civitai.com/api/download/models/133160, "
     "https://civitai.com/api/download/models/29332, "
@@ -571,11 +583,11 @@ class GuiSD:
 
         task = task_stablepy[task]
 
-        params_ip_img = []
-        params_ip_msk = []
-        params_ip_model = []
-        params_ip_mode = []
-        params_ip_scale = []
+        params_ip_img: list = []
+        params_ip_msk: list = []
+        params_ip_model: list = []
+        params_ip_mode: list = []
+        params_ip_scale: list = []
 
         all_adapters = [
             (image_ip1, mask_ip1, model_ip1, mode_ip1, scale_ip1),
@@ -750,8 +762,11 @@ class GuiSD:
 
         random_number = random.randint(1, 100)
         if random_number < 25 and num_images < 3:
-            if not upscaler_model and steps < 45 and task in ["txt2img",
-                                                              "img2img"] and not adetailer_active_a and not adetailer_active_b:
+            if (not upscaler_model and
+                    steps < 45 and
+                    task in ["txt2img", "img2img"] and
+                    not adetailer_active_a and
+                    not adetailer_active_b):
                 num_images *= 2
                 pipe_params["num_images"] = num_images
                 gr.Info("Num images x 2 🎉")
@@ -801,7 +816,8 @@ with gr.Blocks(theme="NoCrypt/miku", css=CSS) as app:
     gr.Markdown("# 🧩 (Ivan) DiffuseCraft")
     gr.Markdown(
         f"""
-            ### This demo uses [diffusers](https://github.com/huggingface/diffusers) to perform different tasks in image generation.
+            ### This demo uses [diffusers](https://github.com/huggingface/diffusers) \
+            to perform different tasks in image generation.
             """
     )
     with gr.Tab("Generation"):
@@ -810,8 +826,12 @@ with gr.Blocks(theme="NoCrypt/miku", css=CSS) as app:
             with gr.Column(scale=2):
 
                 task_gui = gr.Dropdown(label="Task", choices=sdxl_task, value=task_model_list[0])
-                model_name_gui = gr.Dropdown(label="Model", choices=model_list, value=model_list[0],
-                                             allow_custom_value=True)
+                model_name_gui = gr.Dropdown(
+                    label="Model",
+                    choices=model_list,
+                    value=model_list[0],
+                    allow_custom_value=True
+                )
                 prompt_gui = gr.Textbox(lines=5, placeholder="Enter prompt", label="Prompt")
                 neg_prompt_gui = gr.Textbox(lines=3, placeholder="Enter Neg prompt", label="Negative prompt")
                 with gr.Row(equal_height=False):
@@ -844,9 +864,21 @@ with gr.Blocks(theme="NoCrypt/miku", css=CSS) as app:
                 actual_task_info = gr.HTML()
 
             with gr.Column(scale=1):
-                steps_gui = gr.Slider(minimum=1, maximum=100, step=1, value=30, label="Steps")
-                cfg_gui = gr.Slider(minimum=0, maximum=30, step=0.5, value=7.5, label="CFG")
-                sampler_gui = gr.Dropdown(label="Sampler", choices=scheduler_names, value="Euler a")
+                steps_gui = gr.Slider(
+                    minimum=1,
+                    maximum=100,
+                    step=1,
+                    value=43,
+                    label="Steps"
+                )
+                cfg_gui = gr.Slider(
+                    minimum=0,
+                    maximum=30,
+                    step=0.5,
+                    value=7.5,
+                    label="CFG"
+                )
+                sampler_gui = gr.Dropdown(label="Sampler", choices=scheduler_names, value="DPM++ 2M Karras")
                 img_width_gui = gr.Slider(minimum=64, maximum=4096, step=8, value=1024, label="Img Width")
                 img_height_gui = gr.Slider(minimum=64, maximum=4096, step=8, value=1024, label="Img Height")
                 seed_gui = gr.Number(minimum=-1, maximum=9999999999, value=-1, label="Seed")
@@ -930,39 +962,81 @@ with gr.Blocks(theme="NoCrypt/miku", css=CSS) as app:
                         run_set_random_seed, [], seed_gui
                     )
 
-                num_images_gui = gr.Slider(minimum=1, maximum=4, step=1, value=1, label="Images")
+                num_images_gui = gr.Slider(
+                    minimum=MINIMUM_IMAGE_NUMBER,
+                    maximum=MAXIMUM_IMAGE_NUMBER,
+                    step=1,
+                    value=1,
+                    label="Images"
+                )
                 prompt_s_options = [
-                    ("Compel format: (word)weight", "Compel"),
                     ("Classic format: (word:weight)", "Classic"),
+                    ("Compel format: (word)weight", "Compel"),
                     ("Classic-original format: (word:weight)", "Classic-original"),
                     ("Classic-no_norm format: (word:weight)", "Classic-no_norm"),
                     ("Classic-ignore", "Classic-ignore"),
                     ("None", "None"),
                 ]
-                prompt_syntax_gui = gr.Dropdown(label="Prompt Syntax", choices=prompt_s_options,
-                                                value=prompt_s_options[0][1])
-                vae_model_gui = gr.Dropdown(label="VAE Model", choices=vae_model_list)
+                prompt_syntax_gui = gr.Dropdown(
+                    label="Prompt Syntax",
+                    choices=prompt_s_options,
+                    value=prompt_s_options[0][1]
+                )
+
+                vae_model_gui = gr.Dropdown(
+                    label="VAE Model",
+                    choices=vae_model_list
+                )
 
                 with gr.Accordion("Hires fix", open=False, visible=True):
 
                     upscaler_keys = list(upscaler_dict_gui.keys())
 
-                    upscaler_model_path_gui = gr.Dropdown(label="Upscaler", choices=upscaler_keys,
-                                                          value=upscaler_keys[0])
-                    upscaler_increases_size_gui = gr.Slider(minimum=1.1, maximum=6., step=0.1, value=1.4,
-                                                            label="Upscale by")
+                    upscaler_model_path_gui = gr.Dropdown(
+                        label="Upscaler",
+                        choices=upscaler_keys,
+                        value=upscaler_keys[0]
+                    )
+
+                    upscaler_increases_size_gui = gr.Slider(
+                        minimum=1.1,
+                        maximum=6.,
+                        step=0.1,
+                        value=1.4,
+                        label="Upscale by"
+                    )
                     esrgan_tile_gui = gr.Slider(minimum=0, value=100, maximum=500, step=1, label="ESRGAN Tile")
                     esrgan_tile_overlap_gui = gr.Slider(minimum=1, maximum=200, step=1, value=10,
                                                         label="ESRGAN Tile Overlap")
-                    hires_steps_gui = gr.Slider(minimum=0, value=30, maximum=100, step=1, label="Hires Steps")
-                    hires_denoising_strength_gui = gr.Slider(minimum=0.1, maximum=1.0, step=0.01, value=0.55,
-                                                             label="Hires Denoising Strength")
-                    hires_sampler_gui = gr.Dropdown(label="Hires Sampler",
-                                                    choices=["Use same sampler"] + scheduler_names[:-1],
-                                                    value="Use same sampler")
-                    hires_prompt_gui = gr.Textbox(label="Hires Prompt", placeholder="Main prompt will be use", lines=3)
-                    hires_negative_prompt_gui = gr.Textbox(label="Hires Negative Prompt",
-                                                           placeholder="Main negative prompt will be use", lines=3)
+                    hires_steps_gui = gr.Slider(
+                        minimum=0,
+                        value=30,
+                        maximum=100,
+                        step=1,
+                        label="Hires Steps"
+                    )
+                    hires_denoising_strength_gui = gr.Slider(
+                        minimum=0.1,
+                        maximum=1.0,
+                        step=0.01,
+                        value=0.55,
+                        label="Hires Denoising Strength"
+                    )
+                    hires_sampler_gui = gr.Dropdown(
+                        label="Hires Sampler",
+                        choices=["Use same sampler"] + scheduler_names[:-1],
+                        value="Use same sampler"
+                    )
+                    hires_prompt_gui = gr.Textbox(
+                        label="Hires Prompt",
+                        placeholder="Main prompt will be use",
+                        lines=3
+                    )
+                    hires_negative_prompt_gui = gr.Textbox(
+                        label="Hires Negative Prompt",
+                        placeholder="Main negative prompt will be use",
+                        lines=3
+                    )
 
                 with gr.Accordion("LoRA", open=False, visible=True):
                     lora1_gui = gr.Dropdown(label="Lora1", choices=lora_model_list)
@@ -1177,10 +1251,28 @@ with gr.Blocks(theme="NoCrypt/miku", css=CSS) as app:
             gr.Examples(
                 examples=[
                     [
-                        "1girl, souryuu asuka langley, neon genesis evangelion, plugsuit, pilot suit, red bodysuit, sitting, crossing legs, black eye patch, cat hat, throne, symmetrical, looking down, from bottom, looking at viewer, outdoors, masterpiece, best quality, very aesthetic, absurdres",
-                        "nsfw, lowres, (bad), text, error, fewer, extra, missing, worst quality, jpeg artifacts, low quality, watermark, unfinished, displeasing, oldest, early, chromatic aberration, signature, extra digits, artistic error, username, scan, [abstract]",
+                        """
+                        1girl, loli, serious, cocky, sporty, basketball jersey, lakers, basketball, half body, (basketball court), sweaty, dribble, high detailed, sunny, day light,
+                        score_9, score_8_up, score_7_up, very aesthetic,
+                        layered, white hair, featuring soft waves and a slight outward curl at the ends, parted in the middle, (short hair),
+                        red glowing eyes, beautiful hazel red eyes, highly detailed eyes, thin eyebrows, detailed black eyebrows,
+                        long eyelashes,
+                        detailed kornea,
+                        fisheye,
+                        blush,
+                        parted lips, gorgeous lips, pink thin lips,
+                        detailed ear, human ears, human ear, highly detailed ears, highly detailed ear, detailed ears,
+                        perfect anatomy,
+                        
+                        five fingers,
+                        two hands,
+                        short girl, narrow body, detailed face, petite,
+                        medium boobs,
+                        armpits, (naval), 
+                        """,
+                        "(EasyNegative:1.05), easynegative, bad_prompt_version2, (poorly rendered), ugly, disfigured, cross eyed, cloned face, bad symmetry, bad anatomy, low quality, blurry, text, watermark, logo, signature, jpeg, artifacts, monochrome, paintings, oil, (hands:1.15), European Woman, woman, noise, dark skin, (3d), By bad artist -neg,bhands-neg, canvas frame,",
                         1,
-                        30,
+                        43,
                         7.5,
                         True,
                         -1,
@@ -1194,7 +1286,7 @@ with gr.Blocks(theme="NoCrypt/miku", css=CSS) as app:
                         1.0,
                         None,
                         1.0,
-                        "Euler a",
+                        "DPM++ 2M Karras",
                         1152,
                         896,
                         "cagliostrolab/animagine-xl-3.1",
@@ -1323,7 +1415,7 @@ with gr.Blocks(theme="NoCrypt/miku", css=CSS) as app:
                         1.0,
                         None,
                         1.0,
-                        "Euler a",
+                        "DPM++ 2M Karras",
                         1024,
                         1024,
                         "misri/juggernautXL_juggernautX",

config.py

@@ -0,0 +1,2 @@
+MINIMUM_IMAGE_NUMBER = 1
+MAXIMUM_IMAGE_NUMBER = 6