fix: subtags/parent tags & aliases update the UI for building a tag

tagstudio/src/core/library/alchemy/library.py

@@ -636,7 +636,6 @@ def search_tags(
                 results=len(res),
             )
 
-            session.expunge_all()
             return res
 
     def get_all_child_tag_ids(self, tag_id: int) -> list[int]:

tagstudio/src/core/library/alchemy/models.py

@@ -50,10 +50,10 @@ class Tag(Base):
 
     aliases: Mapped[set[TagAlias]] = relationship(back_populates="tag")
 
-    parent_tags: Mapped[set["Tag"]] = relationship(
+    parent_tags: Mapped[list["Tag"]] = relationship(
         secondary=TagSubtag.__tablename__,
-        primaryjoin="Tag.id == TagSubtag.child_id",
-        secondaryjoin="Tag.id == TagSubtag.parent_id",
+        primaryjoin="Tag.id == TagSubtag.parent_id",
+        secondaryjoin="Tag.id == TagSubtag.child_id",
         back_populates="subtags",
     )
 
@@ -76,20 +76,39 @@ def alias_strings(self) -> list[str]:
     def alias_ids(self) -> list[int]:
         return [tag.id for tag in self.aliases]
 
+    @property
+    def display_name(self) -> str:
+        if len(self.parent_tags) == 0:
+            return ""
+
+        parent_tag = list(self.parent_tags)[0]
+
+        if parent_tag is None:
+            return ""
+
+        display_name = ""
+
+        if parent_tag.shorthand.strip() == "" or parent_tag.shorthand is None:
+            display_name = " (" + parent_tag.name + ")"
+        else:
+            display_name = " (" + parent_tag.shorthand + ")"
+
+        return self.name + display_name
+
     def __init__(
         self,
         id: int | None = None,
         name: str | None = None,
         shorthand: str | None = None,
         aliases: set[TagAlias] | None = None,
-        parent_tags: set["Tag"] | None = None,
+        parent_tags: list["Tag"] | None = None,
         subtags: set["Tag"] | None = None,
         icon: str | None = None,
         color: TagColor = TagColor.DEFAULT,
     ):
         self.name = name
         self.aliases = aliases or set()
-        self.parent_tags = parent_tags or set()
+        self.parent_tags = parent_tags or list()
         self.subtags = subtags or set()
         self.color = color
         self.icon = icon