Adapted make model tags script with the new JSON format.

make_model_tags.py

@@ -5,31 +5,12 @@ import argparse
 from constants import *
 from collections import defaultdict
 
-def is_tag_unneeded(tag):
-    if tag.endswith("_request"):
-        return True
-    if tag.startswith("bad_") and tag.endswith("id"):
-        return True
-    if tag.endswith("_mismatch"):
-        return True
-    match tag:
-        case "tagme":
-            return True
-        case "bad_link":
-            return True
-        case "protected_link":
-            return True
-        case "inactive_account":
-            return True
-        case "bad_source":
-            return True
-        case "resized":
-            return True
-    return False
-
 def parse_args():
     parser = argparse.ArgumentParser(description="Create model tags based on tag frequency.")
-    parser.add_argument("-i", "--min-images", type=int, default=0, help="Filter out tags with less than the specified amount of images, default to 0")
+    parser.add_argument("-m", "--min-images", type=int, default=0, help="Filter out tags with less than the specified amount of images, default to 0")
+    mutex = parser.add_mutually_exclusive_group()
+    mutex.add_argument("-e", "--exclude", nargs="+", help="Exclude tag groups with the specified group names, you can only set either exclude or include, but not both")
+    mutex.add_argument("-i", "--include", nargs="+", help="Include tag groups with the specified group names, you can only set either include or exclude, but not both")
     args = parser.parse_args()
     if args.min_images < 0:
         print("Minimum images must be greater than or equal to 0!")
@@ -39,18 +20,28 @@ def parse_args():
 def main():
     args = parse_args()
     print("Starting...\nGetting paths...")
-    image_id_image_tags_path_tuple_dict = utils.get_image_id_image_tags_path_tuple_dict(IMAGE_DIR)
-    print("Got", len(image_id_image_tags_path_tuple_dict), "images.\nMaking buckets...")
+    image_id_image_metadata_path_tuple_dict = utils.get_image_id_image_metadata_path_tuple_dict(IMAGE_DIR)
+    print("Got", len(image_id_image_metadata_path_tuple_dict), "images.\nMaking buckets...")
     buckets = defaultdict(int)
-    for _, tags_path in tqdm.tqdm(image_id_image_tags_path_tuple_dict.values(), desc="Making buckets"):
-        for tag in utils.get_tags_set(tags_path):
+    for _, metadata_path in tqdm.tqdm(image_id_image_metadata_path_tuple_dict.values(), desc="Making buckets"):
+        for tag in utils.get_tags(metadata_path, args.exclude, args.include):
             buckets[tag] += 1
-    print("Filtering out tags with less than", args.min_images, "images and sorting...")
-    buckets = sorted(bucket for bucket in buckets.items() if not is_tag_unneeded(bucket[0]) and bucket[1] >= args.min_images)
-    print("The new model tags list contains", len(buckets), "tags.\nSaving the result...")
+    ratings = []
+    for bucket in list(buckets.items()):
+        tag = bucket[0]
+        if not tag.startswith("rating:"):
+            continue
+        ratings.append(bucket)
+        buckets.pop(tag)
+    print("Sorting the tags based on alphabetical order...")
+    buckets = sorted(buckets.items())
+    print("Filtering out tags with less than", args.min_images, "images...")
+    buckets += ratings
+    tags = [bucket[0] for bucket in buckets if bucket[1] >= args.min_images]
+    print("The new model tags list contains", len(tags), "tags.\nSaving the result...")
     with open(MODEL_TAGS_PATH, "w", encoding="utf8") as file:
-        for i, bucket in enumerate(buckets):
-            file.write(f"{i} {bucket[0]}\n")
+        for i, tag in enumerate(tags):
+            file.write(f"{i} {tag}\n")
     print("Finished.")
 
 if __name__ == "__main__":

scrape_gel.py

@@ -27,7 +27,7 @@ def get_type_tags_dict(soup):
         class_name = class_name[0]
         if not class_name.startswith("tag-type-"):
             continue
-        tag = element.find("a", recursive=False).contents[0].replace(" ", "_").strip(",_")
+        tag = element.find("a", recursive=False).contents[0].replace(",", "").replace(" ", "_").strip("_")
         if tag in tags_in_dict:
             continue
         tag_type = class_name[9:]

utils/utils.py

@@ -1,4 +1,5 @@
 import os
+import json
 import asyncio
 import aiohttp
 from PIL import Image
@@ -98,17 +99,21 @@ def get_tags(metadata_path, exclude=None, include=None):
     if exclude is not None and include is not None:
         raise ValueError("You can't set both exclude and include, please only set one.")
     metadata = get_metadata(metadata_path)
-    tags = ["rating:" + metadata["rating"]]
-    type_tags_dict = metadata.get("tags")
-    if not type_tags_dict:
-        return tags
+    type_tags_dict = metadata.get("tags", {})
     if exclude is not None:
         for e in exclude:
             type_tags_dict.pop(e, None)
+        include_rating = "rating" not in exclude
     elif include is not None:
         for k in list(type_tags_dict):
             if k not in include:
                 type_tags_dict.pop(k)
+        include_rating = "rating" in include
+    else:
+        include_rating = True
+    tags = []
     for l in type_tags_dict.values():
         tags += l
+    if include_rating:
+        tags.append("rating:" + metadata["rating"])
     return tags