Upload prompt_selector_1215.py

Danbooru Prompt Selector/.py_version/prompt_selector_1215.py

@@ -388,7 +388,7 @@ def random_function():
                 rows = []
                 for row in reader:
                     if all(re.search(r'(?:^|, )' + re.escape(kw) + r'(?:,|$)', ', '.join(row)) for kw in perfect_match_keywords) \
-                    and not any(exclude in cell for exclude in exclude_keywords for cell in row) \
+                    and not any(re.search(r'\b' + re.escape(exclude) + r'\b', cell) for exclude in exclude_keywords for cell in row) \
                     and all(include in cell for include in include_keywords for cell in row):
                         # '{}' 안의 키워드 처리
                         if all(any(re.search(r'(?:^|, )' + re.escape(kw) + r'(?:,|$)', ', '.join(cell)) for kw in perfect_group) or
@@ -403,7 +403,7 @@ def random_function():
                     rows = []
                     for row in reader:
                         if all(re.search(r'(?:^|, )' + re.escape(kw) + r'(?:,|$)', ', '.join(row)) for kw in perfect_match_keywords) \
-                        and not any(exclude in cell for exclude in exclude_keywords for cell in row) \
+                        and not any(re.search(r'\b' + re.escape(exclude) + r'\b', cell) for exclude in exclude_keywords for cell in row) \
                         and all(include in cell for include in include_keywords for cell in row):
                             # '{}' 안의 키워드 처리
                             if all(any(re.search(r'(?:^|, )' + re.escape(kw) + r'(?:,|$)', ', '.join(cell)) for kw in perfect_group) or
@@ -603,7 +603,8 @@ def random_function():
             if rm_characteristic_var.get():
                 for keyword in random_row_keywords:
                     if keyword in bag_of_tags or keyword in character_keys or "(" in keyword or "horns" in keyword:
-                        temp_rm.append(keyword)
+                        if keyword not in entry_text_keywords:
+                            temp_rm.append(keyword)
                 for keyword in temp_rm:
                     random_row_keywords.remove(keyword)
             #NSFW_assert_var