Upload 12 files

app.py

@@ -365,7 +365,6 @@ class GuiSD:
         lora1, lora_scale1, lora2, lora_scale2, lora3, lora_scale3, lora4, lora_scale4, lora5, lora_scale5 = \
                 set_prompt_loras(prompt, syntax_weights, model_name, lora1, lora_scale1, lora2, lora_scale2, lora3,
                                   lora_scale3, lora4, lora_scale4, lora5, lora_scale5)
-        prompt, neg_prompt = insert_model_recom_prompt(prompt, neg_prompt, model_name)
 ## END MOD
 
         print("Config model:", model_name, vae_model, loras_list)
@@ -1422,6 +1421,11 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
         translate_prompt_button.click(translate_prompt, [series_dbt], [series_dbt], queue=False)
 
         generate_button.click(
+            fn=insert_model_recom_prompt,
+            inputs=[prompt_gui, neg_prompt_gui, model_name_gui, recom_prompt_gui],
+            outputs=[prompt_gui, neg_prompt_gui],
+            queue=False,
+        ).success(
             fn=sd_gen.load_new_model,
             inputs=[
                 model_name_gui,

modutils.py

@@ -12,6 +12,7 @@ from requests.adapters import HTTPAdapter
 from urllib3.util import Retry
 import urllib.parse
 import pandas as pd
+from typing import Any
 from huggingface_hub import HfApi, HfFolder, hf_hub_download, snapshot_download
 from translatepy import Translator
 from unidecode import unidecode
@@ -52,6 +53,25 @@ def is_repo_name(s):
     return re.fullmatch(r'^[^/]+?/[^/]+?$', s)
 
 
+DEFAULT_STATE = {
+    "show_diffusers_model_list_detail": False,
+}
+
+
+def get_state(state: dict, key: str):
+    if key in state.keys(): return state[key]
+    elif key in DEFAULT_STATE.keys():
+        print(f"State '{key}' not found. Use dedault value.")
+        return DEFAULT_STATE[key]
+    else:
+        print(f"State '{key}' not found.")
+        return None
+
+
+def set_state(state: dict, key: str, value: Any):
+    state[key] = value
+
+
 translator = Translator()
 def translate_to_en(input: str):
     try:
@@ -753,10 +773,10 @@ def set_prompt_loras(prompt, prompt_syntax, model_name, lora1, lora1_wt, lora2,
             key = result[0][0]
             wt = result[0][1]
             path = to_lora_path(key)
-            if not key in loras_dict.keys() or not path:
+            if not key in loras_dict.keys() or not Path(path).exists():
                 path = get_valid_lora_name(path)
                 if not path or path == "None": continue
-            if path in lora_paths:
+            if path in lora_paths or key in lora_paths:
                 continue
             elif not on1:
                 lora1 = path
@@ -777,7 +797,7 @@ def set_prompt_loras(prompt, prompt_syntax, model_name, lora1, lora1_wt, lora2,
                 lora4 = path
                 lora_paths = [lora1, lora2, lora3, lora4, lora5]
                 lora4_wt = safe_float(wt)
-                on4, label4, tag4, md4 = get_lora_info(lora4)
+                on4 = True
             elif not on5:
                 lora5 = path
                 lora_paths = [lora1, lora2, lora3, lora4, lora5]

tagger/tagger.py

@@ -285,9 +285,6 @@ def convert_tags_to_ja(input_prompt: str = ""):
     return ", ".join(out_tags)
 
 
-enable_auto_recom_prompt = True
-
-
 animagine_ps = to_list("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("score_9, score_8_up, score_7_up, masterpiece, best quality, very aesthetic, absurdres")
@@ -297,7 +294,6 @@ other_nps = to_list("photo, deformed, black and white, realism, disfigured, low
 default_ps = to_list("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]")
 def insert_recom_prompt(prompt: str = "", neg_prompt: str = "", type: str = "None"):
-    global enable_auto_recom_prompt
     prompts = to_list(prompt)
     neg_prompts = to_list(neg_prompt)
 
@@ -307,16 +303,12 @@ 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 == "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
+    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)
@@ -329,7 +321,7 @@ def load_model_prompt_dict():
     dict = {}
     path = 'model_dict.json' if Path('model_dict.json').exists() else './tagger/model_dict.json'
     try:
-        with open('model_dict.json', encoding='utf-8') as f:
+        with open(path, encoding='utf-8') as f:
             dict = json.load(f)
     except Exception:
         pass
@@ -339,7 +331,8 @@ def load_model_prompt_dict():
 model_prompt_dict = load_model_prompt_dict()
 
 
-def insert_model_recom_prompt(prompt: str = "", neg_prompt: str = "", model_name: str = "None"):
+def insert_model_recom_prompt(prompt: str = "", neg_prompt: str = "", model_name: str = "None", type = "Auto"):
+    enable_auto_recom_prompt = True if type == "Auto" else False
     if not model_name or not enable_auto_recom_prompt: return prompt, neg_prompt
     prompts = to_list(prompt)
     neg_prompts = to_list(neg_prompt)