Upload 4 files

app.py

@@ -274,6 +274,7 @@ model_list = load_diffusers_format_model + model_list
 ## BEGIN MOD
 lora_model_list = list_uniq(get_private_lora_model_lists() + get_model_list(directory_loras))
 lora_model_list.insert(0, "None")
+lora_model_list.insert(0, "")
 vae_model_list = get_model_list(directory_vaes)
 vae_model_list.insert(0, "None")
 
@@ -304,6 +305,7 @@ def get_my_lora(link_url):
             update_lora_dict(str(new_path))
     new_lora_model_list = list_uniq(get_private_lora_model_lists() + get_model_list(directory_loras))
     new_lora_model_list.insert(0, "None")
+    new_lora_model_list.insert(0, "")
     
     return gr.update(
         choices=get_lora_tupled_list(new_lora_model_list), value=new_lora_model_list[-1]
@@ -1081,39 +1083,39 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", elem_id="main", css=CSS) as app:
                     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) as menu_lora:
-                    lora1_gui = gr.Dropdown(label="Lora1", choices=get_lora_tupled_list(lora_model_list), value="None", allow_custom_value=True)
+                    lora1_gui = gr.Dropdown(label="Lora1", choices=get_lora_tupled_list(lora_model_list), value="", allow_custom_value=True)
                     lora_scale_1_gui = gr.Slider(minimum=-2, maximum=2, step=0.01, value=1.00, label="Lora Scale 1")
                     with gr.Row():
                         with gr.Group():
-                            lora1_trigger_gui = gr.Textbox(label="Lora1 prompts", info="Example of prompt:", value="", show_copy_button=True, interactive=False, visible=False)
+                            lora1_trigger_gui = gr.Textbox(label="Lora1 prompts", info="Example of prompt:", value="None", show_copy_button=True, interactive=False, visible=False)
                             lora1_copy_button = gr.Button(value="Copy example to prompt", visible=False)
                         lora1_desc_gui = gr.Markdown(value="", visible=False)
-                    lora2_gui = gr.Dropdown(label="Lora2", choices=get_lora_tupled_list(lora_model_list), value="None", allow_custom_value=True)
+                    lora2_gui = gr.Dropdown(label="Lora2", choices=get_lora_tupled_list(lora_model_list), value="", allow_custom_value=True)
                     lora_scale_2_gui = gr.Slider(minimum=-2, maximum=2, step=0.01, value=1.00, label="Lora Scale 2")
                     with gr.Row():
                         with gr.Group():
-                            lora2_trigger_gui = gr.Textbox(label="Lora2 prompts", info="Example of prompt:", value="", show_copy_button=True, interactive=False, visible=False)
+                            lora2_trigger_gui = gr.Textbox(label="Lora2 prompts", info="Example of prompt:", value="None", show_copy_button=True, interactive=False, visible=False)
                             lora2_copy_button = gr.Button(value="Copy example to prompt", visible=False)
                         lora2_desc_gui = gr.Markdown(value="", visible=False)
-                    lora3_gui = gr.Dropdown(label="Lora3", choices=get_lora_tupled_list(lora_model_list), value="None", allow_custom_value=True)
+                    lora3_gui = gr.Dropdown(label="Lora3", choices=get_lora_tupled_list(lora_model_list), value="", allow_custom_value=True)
                     lora_scale_3_gui = gr.Slider(minimum=-2, maximum=2, step=0.01, value=1.00, label="Lora Scale 3")
                     with gr.Row():
                         with gr.Group():
-                            lora3_trigger_gui = gr.Textbox(label="Lora3 prompts", info="Example of prompt:", value="", show_copy_button=True, interactive=False, visible=False)
+                            lora3_trigger_gui = gr.Textbox(label="Lora3 prompts", info="Example of prompt:", value="None", show_copy_button=True, interactive=False, visible=False)
                             lora3_copy_button = gr.Button(value="Copy example to prompt", visible=False)
                         lora3_desc_gui = gr.Markdown(value="", visible=False)
-                    lora4_gui = gr.Dropdown(label="Lora4", choices=get_lora_tupled_list(lora_model_list), value="None", allow_custom_value=True)
+                    lora4_gui = gr.Dropdown(label="Lora4", choices=get_lora_tupled_list(lora_model_list), value="", allow_custom_value=True)
                     lora_scale_4_gui = gr.Slider(minimum=-2, maximum=2, step=0.01, value=1.00, label="Lora Scale 4")
                     with gr.Row():
                         with gr.Group():
-                            lora4_trigger_gui = gr.Textbox(label="Lora4 prompts", info="Example of prompt:", value="", show_copy_button=True, interactive=False, visible=False)
+                            lora4_trigger_gui = gr.Textbox(label="Lora4 prompts", info="Example of prompt:", value="None", show_copy_button=True, interactive=False, visible=False)
                             lora4_copy_button = gr.Button(value="Copy example to prompt", visible=False)
                         lora4_desc_gui = gr.Markdown(value="", visible=False)
-                    lora5_gui = gr.Dropdown(label="Lora5", choices=get_lora_tupled_list(lora_model_list), value="None", allow_custom_value=True)
+                    lora5_gui = gr.Dropdown(label="Lora5", choices=get_lora_tupled_list(lora_model_list), value="", allow_custom_value=True)
                     lora_scale_5_gui = gr.Slider(minimum=-2, maximum=2, step=0.01, value=1.00, label="Lora Scale 5")
                     with gr.Row():
                         with gr.Group():
-                            lora5_trigger_gui = gr.Textbox(label="Lora5 prompts", info="Example of prompt", value="", show_copy_button=True, interactive=False, visible=False)
+                            lora5_trigger_gui = gr.Textbox(label="Lora5 prompts", info="Example of prompt", value="None", show_copy_button=True, interactive=False, visible=False)
                             lora5_copy_button = gr.Button(value="Copy example to prompt", visible=False)
                         lora5_desc_gui = gr.Markdown(value="", visible=False)
                     with gr.Accordion("From URL", open=True, visible=True):

modutils.py

@@ -301,12 +301,11 @@ def set_lora_prompt(prompt_gui, prompt_syntax_gui, lora1_gui, lora_scale_1_gui,
     return gr.update(value=prompt)
 
 
-temp_dict = {}
-lora_trigger_dict = {}
+lora_trigger_dict = {"None": ["", "", "", "", ""], "": ["", "", "", "", ""]}
 with open('lora_dict.json', encoding='utf-8') as f:
     temp_dict = json.load(f)
-for k, v in temp_dict.items():
-    lora_trigger_dict[escape_lora_basename(k)] = v
+    for k, v in temp_dict.items():
+        lora_trigger_dict[escape_lora_basename(k)] = v
 
 
 civitai_not_exists_list = []
@@ -364,8 +363,8 @@ def get_lora_tupled_list(lora_model_list):
     tupled_list = []
     local_models = set(get_local_model_list(directory_loras))
     for model in lora_model_list:
-        if not model: continue
-        basename = Path(model).stem
+        #if not model: continue
+        basename = Path(model).stem if model else ""
         key = escape_lora_basename(basename)
         items = None
         if key in lora_trigger_dict.keys():
@@ -387,12 +386,12 @@ def get_lora_tupled_list(lora_model_list):
 
 def set_lora_trigger(lora_gui: str):
     if not lora_gui or lora_gui == "None": return gr.update(value="", visible=False), gr.update(visible=False),\
-          gr.update(value="", visible=False), gr.update(value="None", visible=True)
+          gr.update(value="", visible=False), gr.update(value="")
     path = Path(lora_gui)
     new_path = Path(f'{path.parent.name}/{escape_lora_basename(path.stem)}{path.suffix}')
     if not new_path.stem in lora_trigger_dict.keys() and not str(path) in set(get_private_lora_model_lists() + get_local_model_list(directory_loras)):
         return gr.update(value="", visible=False), gr.update(visible=False),\
-              gr.update(value="", visible=False), gr.update(value="", visible=True)
+              gr.update(value="", visible=False), gr.update(value="")
     if not new_path.exists():
         download_private_file_from_somewhere(str(path), True)
     basename = new_path.stem
@@ -459,6 +458,7 @@ def move_file_lora(filepaths):
 
     new_lora_model_list = list_uniq(get_private_lora_model_lists() + get_local_model_list(directory_loras))
     new_lora_model_list.insert(0, "None")
+    new_lora_model_list.insert(0, "")
     
     return gr.update(
         choices=get_lora_tupled_list(new_lora_model_list), value=new_lora_model_list[-1]
@@ -546,7 +546,7 @@ quality_prompt_list = [
     },
     {
         "name": "Animagine Common",
-        "prompt": "anime artwork, anime style, key visual, vibrant, studio anime, highly detailed, masterpiece, best quality, very aesthetic, absurdres",
+        "prompt": "anime artwork, anime style, vibrant, studio anime, highly detailed, masterpiece, best quality, very aesthetic, absurdres",
         "negative_prompt": "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]",
     },
     {
@@ -600,7 +600,7 @@ style_list = [
     },
     {
         "name": "Anime",
-        "prompt": "anime artwork, anime style, key visual, vibrant, studio anime, highly detailed",
+        "prompt": "anime artwork, anime style, vibrant, studio anime, highly detailed",
         "negative_prompt": "photo, deformed, black and white, realism, disfigured, low contrast",
     },
     {
@@ -678,7 +678,7 @@ def process_style_prompt(prompt: str, neg_prompt: str, styles_key: str = "None",
     def list_uniq(l):
         return sorted(set(l), key=l.index)
 
-    animagine_ps = to_list("anime artwork, anime style, key visual, vibrant, studio anime, highly detailed, masterpiece, best quality, very aesthetic, absurdres")
+    animagine_ps = to_list("anime artwork, anime style, vibrant, studio anime, highly detailed, masterpiece, best quality, very aesthetic, absurdres")
     animagine_nps = to_list("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]")
     pony_ps = to_list("source_anime, score_9, score_8_up, score_7_up, masterpiece, best quality, very aesthetic, absurdres")
     pony_nps = to_list("source_pony, source_furry, source_cartoon, score_6, score_5, score_4, busty, ugly face, mutated hands, low res, blurry face, black and white, the simpsons, overwatch, apex legends")

tagger.py

@@ -242,11 +242,11 @@ def convert_tags_to_ja(input_prompt: str = ""):
 enable_auto_recom_prompt = True
 
 
-animagine_ps = to_list("anime artwork, anime style, key visual, vibrant, studio anime, highly detailed, masterpiece, best quality, very aesthetic, absurdres")
+animagine_ps = to_list("anime artwork, anime style, vibrant, studio anime, highly detailed, masterpiece, best quality, very aesthetic, absurdres")
 animagine_nps = to_list("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]")
 pony_ps = to_list("source_anime, score_9, score_8_up, score_7_up, masterpiece, best quality, very aesthetic, absurdres")
 pony_nps = to_list("source_pony, source_furry, source_cartoon, score_6, score_5, score_4, busty, ugly face, mutated hands, low res, blurry face, black and white, the simpsons, overwatch, apex legends")
-other_ps = to_list("anime artwork, anime style, key visual, vibrant, studio anime, highly detailed, cinematic photo, 35mm photograph, film, bokeh, professional, 4k, highly detailed")
+other_ps = to_list("anime artwork, anime style, vibrant, studio anime, highly detailed, cinematic photo, 35mm photograph, film, bokeh, professional, 4k, highly detailed")
 other_nps = to_list("photo, deformed, black and white, realism, disfigured, low contrast, drawing, painting, crayon, sketch, graphite, impressionist, noisy, blurry, soft, deformed, ugly")
 default_ps = to_list("score_9, score_8_up, score_7_up, highly detailed, masterpiece, best quality, very aesthetic, absurdres")
 default_nps = to_list("score_6, score_5, score_4, 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]")