add more default option variable

app.py

@@ -18,6 +18,8 @@ from stablepy import (
     SDXL_TASKS,
 )
 from config import (
+    DEFAULT_STEPS,
+    DEFAULT_CFG,
     MINIMUM_IMAGE_NUMBER,
     MAXIMUM_IMAGE_NUMBER,
     DEFAULT_NEGATIVE_PROMPT,
@@ -34,6 +36,13 @@ from models.embeds import download_embeds
 from examples.examples import example_prompts
 from utils.download_utils import download_things
 from utils.model_utils import get_model_list
+import gradio as gr
+import logging
+from utils.string_utils import extract_parameters
+from stablepy import logger
+import diffusers
+import warnings
+from gui import GuiSD
 
 # LOAD ALL ENV TOKEN
 CIVITAI_API_KEY: str = os.environ.get("CIVITAI_API_KEY")
@@ -41,6 +50,7 @@ hf_token: str = os.environ.get("HF_TOKEN")
 
 task_model_list = list(task_stablepy.keys())
 
+# [Create directories]
 directory_models: str = 'models'
 os.makedirs(
     directory_models,
@@ -140,17 +150,9 @@ print('\033[33m🏁 Download and listing of valid models completed.\033[0m')
 #######################
 # GUI
 #######################
-import gradio as gr
-import logging
-from utils.string_utils import extract_parameters
-from stablepy import logger
-
 logging.getLogger("diffusers").setLevel(logging.ERROR)
-import diffusers
 
 diffusers.utils.logging.set_verbosity(40)
-import warnings
-from gui import GuiSD
 
 warnings.filterwarnings(
     action="ignore",
@@ -171,7 +173,7 @@ warnings.filterwarnings(
 logger.setLevel(logging.DEBUG)
 
 # init GuiSD
-sd_gen: object = GuiSD(
+SD_GEN: GuiSD = GuiSD(
     model_list=model_list,
     task_stablepy=task_stablepy,
     lora_model_list=lora_model_list,
@@ -219,7 +221,6 @@ with gr.Blocks(css=CSS) as app:
     with gr.Tab("Generation"):
         with gr.Row():
             with gr.Column(scale=2):
-
                 task_gui = gr.Dropdown(
                     label="Task",
                     choices=sdxl_task,
@@ -281,14 +282,14 @@ with gr.Blocks(css=CSS) as app:
                     minimum=1,
                     maximum=100,
                     step=1,
-                    value=43,
+                    value=DEFAULT_STEPS,
                     label="Steps"
                 )
                 cfg_gui = gr.Slider(
                     minimum=0,
                     maximum=30,
                     step=0.5,
-                    value=7.5,
+                    value=DEFAULT_CFG,
                     label="CFG"
                 )
                 sampler_gui = gr.Dropdown(
@@ -318,7 +319,7 @@ with gr.Blocks(css=CSS) as app:
                 )
                 with gr.Row():
                     clip_skip_gui = gr.Checkbox(
-                        value=True,
+                        value=False,
                         label="Layer 2 Clip Skip"
                     )
                     free_u_gui = gr.Checkbox(
@@ -344,7 +345,6 @@ with gr.Blocks(css=CSS) as app:
 
                         parameters: dict = extract_parameters(base_prompt)
                         for key, val in parameters.items():
-                            # print(val)
                             if key in valid_keys:
                                 if key == "Sampler":
                                     if val not in scheduler_names:
@@ -365,8 +365,6 @@ with gr.Blocks(css=CSS) as app:
                                 if key == "Seed":
                                     continue
                                 valid_receptors[key] = gr.update(value=val)
-                                # print(val, type(val))
-                                # print(valid_receptors)
                         return [value for value in valid_receptors.values()]
 
 
@@ -409,6 +407,7 @@ with gr.Blocks(css=CSS) as app:
                     value=1,
                     label="Images"
                 )
+
                 prompt_s_options = [
                     ("Classic format: (word:weight)", "Classic"),
                     ("Compel format: (word)weight", "Compel"),
@@ -417,6 +416,7 @@ with gr.Blocks(css=CSS) as app:
                     ("Classic-ignore", "Classic-ignore"),
                     ("None", "None"),
                 ]
+
                 prompt_syntax_gui = gr.Dropdown(
                     label="Prompt Syntax",
                     choices=prompt_s_options,
@@ -448,6 +448,7 @@ with gr.Blocks(css=CSS) as app:
                         value=1.4,
                         label="Upscale by"
                     )
+
                     esrgan_tile_gui = gr.Slider(
                         minimum=0,
                         value=100,
@@ -571,7 +572,10 @@ with gr.Blocks(css=CSS) as app:
                             ]
                         )
 
-                with gr.Accordion("IP-Adapter", open=False, visible=True):  # IP-Adapter
+                with gr.Accordion(
+                        "IP-Adapter",
+                        open=False,
+                        visible=True):  # IP-Adapter
                     IP_MODELS = sorted(
                         list(
                             set(
@@ -773,9 +777,10 @@ with gr.Blocks(css=CSS) as app:
                         open=False,
                         visible=True):
 
+                    # noinspection PyBroadException
                     try:
-                        style_names_found = sd_gen.model.STYLE_NAMES
-                    except:
+                        style_names_found = SD_GEN.model.STYLE_NAMES
+                    except Exception as e:
                         style_names_found = STYLE_NAMES
 
                     style_prompt_gui = gr.Dropdown(
@@ -790,18 +795,18 @@ with gr.Blocks(css=CSS) as app:
 
 
                     def load_json_style_file(json):
-                        if not sd_gen.model:
+                        if not SD_GEN.model:
                             gr.Info("First load the model")
                             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")
+                        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
+                            choices=SD_GEN.model.STYLE_NAMES
                         )
 
 
@@ -825,10 +830,16 @@ with gr.Blocks(css=CSS) as app:
                         open=False,
                         visible=True):
                     # Adetailer Inpaint Only
-                    adetailer_inpaint_only_gui = gr.Checkbox(label="Inpaint only", value=True)
+                    adetailer_inpaint_only_gui = gr.Checkbox(
+                        label="Inpaint only",
+                        value=True
+                    )
 
                     # Adetailer Verbose
-                    adetailer_verbose_gui = gr.Checkbox(label="Verbose", value=False)
+                    adetailer_verbose_gui = gr.Checkbox(
+                        label="Verbose",
+                        value=False
+                    )
 
                     # Adetailer Sampler
                     adetailer_sampler_options = ["Use same sampler"] + scheduler_names[:-1]
@@ -1003,9 +1014,9 @@ with gr.Blocks(css=CSS) as app:
                         value=False,
                         label="Retain Compel Previous Load"
                     )
-                    retain_detailfix_model_previous_load_gui = gr.Checkbox(
+                    retain_detail_fix_model_previous_load_gui = gr.Checkbox(
                         value=False,
-                        label="Retain Detailfix Model Previous Load"
+                        label="Retain Detail fix Model Previous Load"
                     )
                     retain_hires_model_previous_load_gui = gr.Checkbox(
                         value=False,
@@ -1017,7 +1028,10 @@ with gr.Blocks(css=CSS) as app:
                     )
 
         # example and Help Section
-        with gr.Accordion("Examples and help", open=False, visible=True):
+        with gr.Accordion(
+                "Examples and help",
+                open=False,
+                visible=True):
             gr.Markdown(
                 """### Help:
                 - The current space runs on a ZERO GPU which is assigned for approximately 60 seconds; Therefore, \
@@ -1046,7 +1060,7 @@ with gr.Blocks(css=CSS) as app:
 
             gr.Examples(
                 examples=example_prompts,
-                fn=sd_gen.generate_pipeline,
+                fn=SD_GEN.generate_pipeline,
                 inputs=[
                     prompt_gui,
                     neg_prompt_gui,
@@ -1095,7 +1109,6 @@ with gr.Blocks(css=CSS) as app:
             )
 
     with gr.Tab("Inpaint mask maker", render=True):
-
         def create_mask_now(img, invert):
             import numpy as np
             import time
@@ -1181,7 +1194,7 @@ with gr.Blocks(css=CSS) as app:
             )
 
     generate_button.click(
-        fn=sd_gen.load_new_model,
+        fn=SD_GEN.load_new_model,
         inputs=[
             model_name_gui,
             vae_model_gui,
@@ -1191,7 +1204,7 @@ with gr.Blocks(css=CSS) as app:
         queue=True,
         show_progress="minimal",
     ).success(
-        fn=sd_gen.generate_pipeline,
+        fn=SD_GEN.generate_pipeline,
         inputs=[
             prompt_gui,
             neg_prompt_gui,
@@ -1252,7 +1265,7 @@ with gr.Blocks(css=CSS) as app:
             save_generated_images_gui,
             image_storage_location_gui,
             retain_compel_previous_load_gui,
-            retain_detailfix_model_previous_load_gui,
+            retain_detail_fix_model_previous_load_gui,
             retain_hires_model_previous_load_gui,
             t2i_adapter_preprocessor_gui,
             adapter_conditioning_scale_gui,

config.py

@@ -1,3 +1,7 @@
+# Default value
+DEFAULT_STEPS = 23
+DEFAULT_CFG = 0
+
 MINIMUM_IMAGE_NUMBER = 1
 MAXIMUM_IMAGE_NUMBER = 10
 
@@ -14,14 +18,11 @@ 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), crop top), outdoor
+short girl, narrow body, detailed face, petite, ((naval)),
 """
 DEFAULT_NEGATIVE_PROMPT = """(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, 

gui.py

@@ -23,7 +23,6 @@ class GuiSD:
                  embed_list,
                  stream=True):
         self.model = None
-
         print("Loading model...")
         self.model = Model_Diffusers(
             base_model_id="models/animaPencilXL_v500.safetensors",

models/checkpoints.py

@@ -1,4 +1,5 @@
 CHECKPOINT_LIST = (
     "https://civitai.com/api/download/models/597138, "  # animaPencilXL
     "https://civitai.com/api/download/models/609052, "  # ponyPencilXL
+    "https://civitai.com/api/download/models/128713, "  # dreamShaper
 )

requirements.txt

@@ -1,4 +1,5 @@
 git+https://github.com/R3gm/stablepy.git@test_stream
 torch==2.2.0
 gdown
-opencv-python
+opencv-python
+numpy

utils/string_utils.py

@@ -34,17 +34,26 @@ def extract_parameters(input_string: str) -> dict:
         print("Steps not detected")
         parameters["neg_prompt"] = parm[1]
         return parameters
+
     parm = parm[1].split("Steps:")
     parameters["neg_prompt"] = parm[0]
     input_string = "Steps:" + parm[1]
 
     # Extracting Steps
-    steps_match = re.search(r'Steps: (\d+)', input_string)
+    steps_match = re.search(
+        r'Steps: (\d+)',
+        input_string
+    )
+
     if steps_match:
         parameters['Steps'] = int(steps_match.group(1))
 
     # Extracting Size
-    size_match = re.search(r'Size: (\d+x\d+)', input_string)
+    size_match = re.search(
+        r'Size: (\d+x\d+)',
+        input_string
+    )
+
     if size_match:
         parameters['Size'] = size_match.group(1)
         width, height = map(int, parameters['Size'].split('x'))
@@ -52,7 +61,11 @@ def extract_parameters(input_string: str) -> dict:
         parameters['height'] = height
 
     # Extracting other parameters
-    other_parameters = re.findall(r'(\w+): (.*?)(?=, \w+|$)', input_string)
+    other_parameters = re.findall(
+        r'(\w+): (.*?)(?=, \w+|$)',
+        input_string
+    )
+
     for param in other_parameters:
         parameters[param[0]] = param[1].strip('"')