From 4eb549629f76d962fb387c1bb31c092bec3ab7d9 Mon Sep 17 00:00:00 2001
From: sn0w12 <lucasskold49@gmail.com>
Date: Thu, 22 Feb 2024 23:30:22 +0100
Subject: [PATCH] animagine formatting can now be turned off in settings

---
 src/load_lora_concept.py |  4 ++--
 src/prompt_combine.py    | 24 +++++++++++++++---------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/load_lora_concept.py b/src/load_lora_concept.py
index 2efd84d..dc3899e 100644
--- a/src/load_lora_concept.py
+++ b/src/load_lora_concept.py
@@ -59,7 +59,7 @@ class LoadLoraConceptNode:
                                 if prompt_part not in lora_candidates:
                                     lora_candidates[prompt_part] = []
                                 lora_candidates[prompt_part].append({'full_path': full_path, 'distance': distance})
-                                self.logger.print_sn0w("Distance: " + str(distance) + " Lora: " + lora_filename + " Tag: " + prompt_part)
+                                self.logger.print_sn0w("Distance: " + str(distance) + " Lora: " + lora_filename + " Tag: " + prompt_part, "ALL")
                                 break
 
         # Apply the Lora with the lowest distance for each prompt_part, ensuring no duplicates
@@ -67,7 +67,7 @@ class LoadLoraConceptNode:
             if candidates:
                 selected_candidate = min(candidates, key=lambda x: x['distance'])
                 if selected_candidate['full_path'] not in loaded_loras:  # Check if this Lora has already been loaded
-                    self.logger.print_sn0w(f"Loading Concept Lora: {os.path.split(selected_candidate['full_path'])[-1]}")
+                    self.logger.print_sn0w(f"Loading Concept Lora: {os.path.split(selected_candidate['full_path'])[-1]}", "GENERAL")
                     model, clip = LoraLoader().load_lora(model, clip, selected_candidate['full_path'], lora_strength, lora_strength)
                     loaded_loras.add(selected_candidate['full_path'])  # Mark this Lora as loaded
 
diff --git a/src/prompt_combine.py b/src/prompt_combine.py
index 8459112..22cfa76 100644
--- a/src/prompt_combine.py
+++ b/src/prompt_combine.py
@@ -1,4 +1,5 @@
 import re
+from .sn0w import ConfigReader
 
 class CombineStringNode:
     @classmethod
@@ -21,7 +22,7 @@ class CombineStringNode:
     FUNCTION = "combine_string"
     CATEGORY = "sn0w"
 
-    def simplify_tags(self, tags_string):
+    def simplify_tags(self, tags_string, separator):
         # dictionary defines categories with specific rules for removing or keeping tags.
         # remove contains phrases that, if found in a prompt, suggest the tag should be removed.
         # keep contains phrases that, if found in a prompt, indicate the tag should be kept.
@@ -58,7 +59,7 @@ class CombineStringNode:
         
         modified_tags_string = re.sub(parenthesized_pattern, extract_parenthesized, tags_string)
 
-        tags = [tag.strip() for tag in modified_tags_string.split(',')]
+        tags = [tag.strip() for tag in modified_tags_string.split(separator)]
         final_tags = []
         removed_tags = set()
         tag_map = {}
@@ -107,13 +108,18 @@ class CombineStringNode:
                 tag = tag.replace(f"\0{index}\0", parenthesized_parts[index], 1)
             final_tags_with_parentheses.append(tag)
 
-        numeric_tags = [tag for tag in final_tags_with_parentheses if numeric_tag_pattern.match(tag)]
-        non_numeric_tags = [tag for tag in final_tags_with_parentheses if not numeric_tag_pattern.match(tag)]
+        animagine_formatting = ConfigReader.get_setting('animagine_formatting', 'TRUE') == 'TRUE'
 
-        prioritized_final_tags = numeric_tags + non_numeric_tags
+        if animagine_formatting:
+            numeric_tags = [tag for tag in final_tags_with_parentheses if numeric_tag_pattern.match(tag)]
+            non_numeric_tags = [tag for tag in final_tags_with_parentheses if not numeric_tag_pattern.match(tag)]
 
-        simplified_tags_string = ', '.join(prioritized_final_tags)
-        removed_tags_string = ', '.join(removed_tags)
+            prioritized_final_tags = numeric_tags + non_numeric_tags
+        else:
+            prioritized_final_tags = final_tags_with_parentheses
+
+        simplified_tags_string = separator.join(prioritized_final_tags).strip(separator)
+        removed_tags_string = separator.join(removed_tags).strip(separator)
 
         return simplified_tags_string, removed_tags_string
 
@@ -133,9 +139,9 @@ class CombineStringNode:
         # Join all unique words across all strings with the separator, handle simplify directly
         final_combined_string = separator.join(combined)
         if simplify:
-            final_tags, removed_tags = self.simplify_tags(final_combined_string)
+            final_tags, removed_tags = self.simplify_tags(final_combined_string, separator)
         else:
             final_tags = final_combined_string
             removed_tags = ""
-            
+
         return (final_tags, removed_tags,)
\ No newline at end of file