Upload 8 files

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)