Fix bug : tags were referencing wrong data

commit_difference.py

@@ -61,10 +61,10 @@ def commit_difference(id, difference):
                 target_values_to_remove = old_dict[keys]
                 target_values_to_add = new_dict[keys]
                 # remove old values
-                for values in current_value:
-                    name = values.name
-                    if name in target_values_to_remove:
-                        current_value.remove(values)
+                for name in target_values_to_remove:
+                    if name in (tag.name for tag in current_value):
+                        #print(f"{name} is in {[tag.name for tag in current_value]}, removing")
+                        current_value.remove(Tag.get(Tag.name == name))
                 # add new values
                 for values in target_values_to_add:
                     # no int values allowed
@@ -76,7 +76,6 @@ def commit_difference(id, difference):
                     # assert unique, tag should not be iterable
                     assert not isinstance(tag, list), f"Error: {tag} is iterable"
                     current_value.append(tag)
-        post_by_id.save()
     else:
         return
 def main(filepath="difference_cache.jsonl"):
@@ -110,6 +109,30 @@ FIELDS_TO_EXTRACT = {
     'tag_list_copyright': 'tag_list_copyright',
     'tag_list_meta': 'tag_list_meta',
 }
+def pretty_print(post_id:int) -> str:
+    """
+    Returns a pretty printed post
+    """
+    post = Post.get_by_id(post_id)
+    def pretty_print_tag(tag):
+        """
+        Returns a pretty printed tag
+        """
+        return f"{tag.name}({tag.id})"
+    
+    def pretty_print_tags(tags):
+        """
+        Returns a pretty printed list of tags
+        """
+        return ", ".join([pretty_print_tag(tag) for tag in tags])
+    
+    fields = {"tag_list_general", "tag_list_artist", "tag_list_character", "tag_list_meta", "tag_list_copyright"}
+    string = ""
+    # start printing
+    string += f"Post {post_id}\n"
+    for field in fields:
+        string += f"\t{field}: {pretty_print_tags(post.__getattribute__(field))}\n"
+    return string
 
 def save_post(idx:int):
     folder = "danbooru2023_fixed"
@@ -125,6 +148,25 @@ def save_post(idx:int):
                 dump[field] = [tag.name for tag in dump[field]]
         json.dump(dump, file)
 
+def test():
+    """
+    This is a test function that you can test without running the entire script
+    """
+    print(pretty_print(6719955))
+    diff = {"id": 6719955, "difference": [{"tag_list_general": ["virtual_youtuber"], "tag_list_character": ["otonose_kanade"], "tag_list_artist": ["jb_jagbung"], "tag_list_copyright": ["hololive", "hololive_dev_is"]}, {"tag_list_general": ["sad_keanu_(meme)"], "tag_list_character": ["regloss_(hololive)"], "tag_list_artist": ["xt0y4x"], "tag_list_copyright": ["tokino_sora_(old_design)", "juufuutei_raden"]}]}
+    # test, simulate commit, do not commit
+    with db.atomic() as transaction:
+        commit_difference(diff['id'], diff['difference'])
+        print(pretty_print(6719955))
+        transaction.rollback()
+    print(pretty_print(6719955))
+
+def test2():
+    """
+    After commit, you can check if now the post is different
+    """
+    print(pretty_print(6719955))
+    
 if __name__ == "__main__":
     jsonl_files = glob.glob(r"G:\database\finished\*.jsonl")
     # sort by number