Upload 5 files

app.py

@@ -410,6 +410,7 @@ from tagger import (
     convert_danbooru_to_e621_prompt,
     remove_specific_prompt,
     insert_recom_prompt,
+    insert_model_recom_prompt,
     compose_prompt_to_copy,
     translate_prompt,
     select_random_character,
@@ -437,7 +438,6 @@ from modutils import (
     preset_quality,
     preset_sampler_setting,
     set_quick_presets,
-    insert_model_recom_prompt,
 )
 def description_ui():
     gr.Markdown(
@@ -911,14 +911,14 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", elem_id="main", css=CSS) as app:
                     with gr.Accordion("Negative prompt, etc.", open=False) as menu_negative:
                         neg_prompt_gui = gr.Textbox(lines=3, placeholder="lowres, (bad), ...", label="Negative prompt", show_copy_button=True)
                         translate_prompt_button = gr.Button(value="Translate prompt to English", size="sm", variant="secondary")
-                        insert_prompt_gui = gr.Radio(label="Insert reccomended positive / negative prompt", choices=["None", "Animagine", "Pony"], value="None", interactive=True, scale=2)
+                        insert_prompt_gui = gr.Radio(label="Insert reccomended positive / negative prompt", choices=["None", "Auto", "Animagine", "Pony"], value="Auto", interactive=True)
                         with gr.Accordion(label="Advanced options", open=False):                            
                             prompt_type_gui = gr.Radio(label="Convert tags to", choices=["danbooru", "e621"], value="e621", visible=False)
                             prompt_type_button = gr.Button(value="Convert prompt to Pony e621 style", size="sm", variant="secondary")
                         with gr.Row():
                             character_dbt = gr.Textbox(lines=1, placeholder="kafuu chino, ...", label="Character names")
                             series_dbt = gr.Textbox(lines=1, placeholder="Is the order a rabbit?, ...", label="Series names")
-                            random_character_gui = gr.Button(value="Pick a random character 🎲", size="sm")
+                            random_character_gui = gr.Button(value="Pick a random character 🎲", size="sm", variant="secondary")
                             model_name_dbt = gr.Dropdown(label="Model", choices=list(V2_ALL_MODELS.keys()), value=list(V2_ALL_MODELS.keys())[0], visible=False)
                             aspect_ratio_dbt = gr.Radio(label="Aspect ratio", choices=list(V2_ASPECT_RATIO_OPTIONS), value="square", visible=False)
                             length_dbt = gr.Radio(label="Length", choices=list(V2_LENGTH_OPTIONS), value="very_long", visible=False)
@@ -926,12 +926,12 @@ with gr.Blocks(theme="NoCrypt/miku@>=1.2.2", elem_id="main", css=CSS) as app:
                             ban_tags_dbt = gr.Textbox(label="Ban tags", placeholder="alternate costumen, ...", value="futanari, censored, furry, furrification", visible=False)
                             elapsed_time_dbt = gr.Markdown(label="Elapsed time", value="", visible=False)
                             copy_button_dbt = gr.Button(value="Copy to clipboard", visible=False)
-                        generate_db_random_button = gr.Button(value="Generate random prompt 🎲", size="sm", variant="secondary")
+                        generate_db_random_button = gr.Button(value="Generate random prompt 🎲", variant="secondary")
                         rating_dbt = gr.Radio(label="Rating", choices=list(V2_RATING_OPTIONS), value="sfw")
                         with gr.Row():
-                            set_params_gui = gr.Button(value="↙️")
-                            clear_prompt_gui = gr.Button(value="🗑️")
-                            set_random_seed = gr.Button(value="🎲")
+                            set_params_gui = gr.Button(value="↙️", size="sm")
+                            clear_prompt_gui = gr.Button(value="🗑️", size="sm")
+                            set_random_seed = gr.Button(value="🎲", size="sm")
                     
                 generate_button = gr.Button(value="GENERATE IMAGE", size="lg", variant="primary")
 

modutils.py

@@ -872,46 +872,3 @@ def get_model_pipeline(repo_id: str):
         else:
             return default
 
-
-def load_model_prompt_dict():
-    import json
-    dict = {}
-    with open('model_dict.json', encoding='utf-8') as f:
-        dict = json.load(f)
-    return dict
-
-
-model_prompt_dict = load_model_prompt_dict()
-
-
-def insert_model_recom_prompt(prompt: str = "", neg_prompt: str = "", model_name: str = "None"):
-    def to_list(s):
-        return [x.strip() for x in s.split(",") if not s == ""]
-    
-    def list_sub(a, b):
-        return [e for e in a if e not in b]
-    
-    def list_uniq(l):
-        return sorted(set(l), key=l.index)
-
-    if not model_name or not model_name in model_prompt_dict.keys(): return prompt, neg_prompt
-    animagine_ps = to_list("anime artwork, anime style, key visual, 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_nps = to_list("photo, deformed, black and white, realism, disfigured, low contrast, drawing, painting, crayon, sketch, graphite, impressionist, noisy, blurry, soft, deformed, ugly")
-    prompts = to_list(prompt)
-    neg_prompts = to_list(neg_prompt)
-    prompts = list_sub(prompts, animagine_ps + pony_ps + other_ps)
-    neg_prompts = list_sub(neg_prompts, animagine_nps + pony_nps + other_nps)
-    last_empty_p = [""] if not prompts and type != "None" else []
-    last_empty_np = [""] if not neg_prompts and type != "None" else []
-    ps = to_list(model_prompt_dict[model_name]["prompt"])
-    nps = to_list(model_prompt_dict[model_name]["negative_prompt"])
-    prompts = prompts + ps
-    neg_prompts = neg_prompts + nps
-    prompt = ", ".join(list_uniq(prompts) + last_empty_p)
-    neg_prompt = ", ".join(list_uniq(neg_prompts) + last_empty_np)
-    return prompt, neg_prompt
-

tagger.py

@@ -227,6 +227,9 @@ def convert_tags_to_ja(input_prompt: str = ""):
     return ", ".join(out_tags)
 
 
+enable_auto_recom_prompt = True
+
+
 def insert_recom_prompt(prompt: str = "", neg_prompt: str = "", type: str = "None"):
     def to_list(s):
         return [x.strip() for x in s.split(",") if not s == ""]
@@ -236,7 +239,8 @@ def insert_recom_prompt(prompt: str = "", neg_prompt: str = "", type: str = "Non
     
     def list_uniq(l):
         return sorted(set(l), key=l.index)
-
+    
+    global enable_auto_recom_prompt
     animagine_ps = to_list("anime artwork, anime style, key visual, 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")
@@ -250,12 +254,16 @@ def insert_recom_prompt(prompt: str = "", neg_prompt: str = "", type: str = "Non
     last_empty_p = [""] if not prompts and type != "None" else []
     last_empty_np = [""] if not neg_prompts and type != "None" else []
 
-    if type == "Animagine":
-        prompts = prompts + animagine_ps
-        neg_prompts = neg_prompts + animagine_nps
-    elif type == "Pony":
-        prompts = prompts + pony_ps
-        neg_prompts = neg_prompts + pony_nps
+    if type == "Auto":
+        enable_auto_recom_prompt = True
+    else:
+        enable_auto_recom_prompt = False
+        if type == "Animagine":
+            prompts = prompts + animagine_ps
+            neg_prompts = neg_prompts + animagine_nps
+        elif type == "Pony":
+            prompts = prompts + pony_ps
+            neg_prompts = neg_prompts + pony_nps
 
     prompt = ", ".join(list_uniq(prompts) + last_empty_p)
     neg_prompt = ", ".join(list_uniq(neg_prompts) + last_empty_np)
@@ -263,6 +271,55 @@ def insert_recom_prompt(prompt: str = "", neg_prompt: str = "", type: str = "Non
     return prompt, neg_prompt
 
 
+def load_model_prompt_dict():
+    import json
+    dict = {}
+    with open('model_dict.json', encoding='utf-8') as f:
+        dict = json.load(f)
+    return dict
+
+
+model_prompt_dict = load_model_prompt_dict()
+
+
+def insert_model_recom_prompt(prompt: str = "", neg_prompt: str = "", model_name: str = "None"):
+    def to_list(s):
+        return [x.strip() for x in s.split(",") if not s == ""]
+    
+    def list_sub(a, b):
+        return [e for e in a if e not in b]
+    
+    def list_uniq(l):
+        return sorted(set(l), key=l.index)
+
+    if not model_name or not enable_auto_recom_prompt: return prompt, neg_prompt
+    animagine_ps = to_list("anime artwork, anime style, key visual, 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_nps = to_list("photo, deformed, black and white, realism, disfigured, low contrast, drawing, painting, crayon, sketch, graphite, impressionist, noisy, blurry, soft, deformed, ugly")
+    prompts = to_list(prompt)
+    neg_prompts = to_list(neg_prompt)
+    prompts = list_sub(prompts, animagine_ps + pony_ps + other_ps)
+    neg_prompts = list_sub(neg_prompts, animagine_nps + pony_nps + other_nps)
+    last_empty_p = [""] if not prompts and type != "None" else []
+    last_empty_np = [""] if not neg_prompts and type != "None" else []
+    ps = []
+    nps = []
+    if model_name in model_prompt_dict.keys(): 
+        ps = to_list(model_prompt_dict[model_name]["prompt"])
+        nps = to_list(model_prompt_dict[model_name]["negative_prompt"])
+    else:
+        ps = to_list("score_9, score_8_up, score_7_up, highly detailed, masterpiece, best quality, very aesthetic, absurdres")
+        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]")
+    prompts = prompts + ps
+    neg_prompts = neg_prompts + nps
+    prompt = ", ".join(list_uniq(prompts) + last_empty_p)
+    neg_prompt = ", ".join(list_uniq(neg_prompts) + last_empty_np)
+    return prompt, neg_prompt
+
+
 tag_group_dict = load_dict_from_csv('tag_group.csv')