fix: fix tag aliases

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

@@ -1710,8 +1710,7 @@ def add_tag(
         self,
         tag: Tag,
         parent_ids: list[int] | set[int] | None = None,
-        alias_names: list[str] | set[str] | None = None,
-        alias_ids: list[int] | set[int] | None = None,
+        aliases: Iterable[TagAlias] | None = None,
     ) -> Tag | None:
         with Session(self.engine, expire_on_commit=False) as session:
             try:
@@ -1721,8 +1720,8 @@ def add_tag(
                 if parent_ids is not None:
                     self.update_parent_tags(tag, parent_ids, session)
 
-                if alias_ids is not None and alias_names is not None:
-                    self.update_aliases(tag, alias_ids, alias_names, session)
+                if aliases is not None:
+                    self.update_aliases(tag, aliases)
 
                 session.commit()
                 session.expunge(tag)
@@ -2000,11 +1999,10 @@ def update_tag(
         self,
         tag: Tag,
         parent_ids: list[int] | set[int] | None = None,
-        alias_names: list[str] | set[str] | None = None,
-        alias_ids: list[int] | set[int] | None = None,
+        aliases: Iterable[TagAlias] | None = None,
     ) -> None:
         """Edit a Tag in the Library."""
-        self.add_tag(tag, parent_ids, alias_names, alias_ids)
+        self.add_tag(tag, parent_ids, aliases)
 
     def update_color(self, old_color_group: TagColorGroup, new_color_group: TagColorGroup) -> None:
         """Update a TagColorGroup in the Library. If it doesn't already exist, create it."""
@@ -2055,25 +2053,50 @@ def update_color(self, old_color_group: TagColorGroup, new_color_group: TagColor
             else:
                 self.add_color(new_color_group)
 
-    def update_aliases(
-        self,
-        tag: Tag,
-        alias_ids: list[int] | set[int],
-        alias_names: list[str] | set[str],
-        session: Session,
-    ):
-        prev_aliases = session.scalars(select(TagAlias).where(TagAlias.tag_id == tag.id)).all()
+    def update_aliases(self, tag: Tag, aliases: Iterable[TagAlias]) -> bool:
+        """Update TagAliases for a given Tag."""
+        with Session(self.engine) as session:
+            # Remove aliases that are no longer on the Tag
+            try:
+                old_aliases = session.scalars(
+                    select(TagAlias).where(TagAlias.tag_id == tag.id)
+                ).all()
+                old_alias_ids: list[int] = [a.id for a in old_aliases]
+                for old_alias in old_aliases:
+                    if old_alias.id not in [a.id for a in aliases] or not old_alias.name:
+                        logger.warning(
+                            "[Library] Deleting removed alias", id=old_alias.id, name=old_alias.name
+                        )
+                        session.delete(old_alias)
+                session.commit()
+            except IntegrityError as e:
+                session.rollback()
+                logger.error("[Library] Could not update aliases", error=e)
+                return False
 
-        for alias in prev_aliases:
-            if alias.id not in alias_ids or alias.name not in alias_names:
-                session.delete(alias)
-            else:
-                alias_ids.remove(alias.id)
-                alias_names.remove(alias.name)
+            # Update or Add aliases
+            for alias in aliases:
+                # Sanitize alias names
+                alias.name = alias.name.strip()
+                if not alias.name:
+                    continue
 
-        for alias_name in alias_names:
-            alias = TagAlias(alias_name, tag.id)
-            session.add(alias)
+                try:
+                    if alias.id in old_alias_ids:
+                        stmt = (
+                            update(TagAlias).where(TagAlias.id == alias.id).values(name=alias.name)
+                        )
+                        session.execute(stmt)
+                    else:
+                        session.add(alias)
+                except IntegrityError as e:
+                    session.rollback()
+                    logger.error("[Library] Could not update or add alias", error=e)
+                    return False
+
+            session.commit()
+
+        return True
 
     def update_parent_tags(self, tag: Tag, parent_ids: list[int] | set[int], session: Session):
         if tag.id in parent_ids:

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

@@ -163,6 +163,7 @@ def __repr__(self) -> str:
     def __hash__(self) -> int:
         return hash(self.id)
 
+    @override
     def __eq__(self, value: object) -> bool:
         if not isinstance(value, Tag):
             return False

src/tagstudio/qt/controllers/tag_box_controller.py

@@ -87,8 +87,7 @@ def _update_tag_callback(self, build_tag_panel: BuildTagPanel):
         self.__driver.lib.update_tag(
             build_tag_panel.build_tag(),
             parent_ids=set(build_tag_panel.parent_ids),
-            alias_names=set(build_tag_panel.alias_names),
-            alias_ids=set(build_tag_panel.alias_ids),
+            aliases=set(build_tag_panel.aliases),
         )
         self.on_update.emit()
 

src/tagstudio/qt/controllers/tag_search_panel_controller.py

@@ -110,7 +110,6 @@ def on_item_edit(self, item: Tag) -> None:
             Translations["tag.edit"],
             is_savable=True,
         )
-
         edit_tag_modal.saved.connect(lambda: self.edit_item(edit_tag_panel))
         edit_tag_modal.show()
 
@@ -191,10 +190,7 @@ def create_item(self, edit_item_panel: PanelWidget, choose_item: bool = False) -
         if isinstance(edit_item_panel, BuildTagPanel):
             tag: Tag = edit_item_panel.build_tag()
             self.__lib.add_tag(
-                tag,
-                parent_ids=edit_item_panel.parent_ids,
-                alias_names=edit_item_panel.alias_names,
-                alias_ids=edit_item_panel.alias_ids,
+                tag, parent_ids=edit_item_panel.parent_ids, aliases=edit_item_panel.aliases
             )
 
             if choose_item:
@@ -215,8 +211,7 @@ def edit_item(self, edit_item_panel: PanelWidget) -> None:
         self.__lib.update_tag(
             tag=edit_item_panel.build_tag(),
             parent_ids=edit_item_panel.parent_ids,
-            alias_names=edit_item_panel.alias_names,
-            alias_ids=edit_item_panel.alias_ids,
+            aliases=edit_item_panel.aliases,
         )
         self.update_items(self.search_field.text())