From b5dc70bede19d53a0d2dd386cc251c0996359280 Mon Sep 17 00:00:00 2001 From: Luke Mino-Altherr Date: Thu, 12 Mar 2026 15:36:10 -0700 Subject: [PATCH] Standardize tag ordering to alphabetical across all endpoints Co-Authored-By: Claude Opus 4.6 --- app/assets/database/queries/asset_reference.py | 2 +- app/assets/database/queries/tags.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/database/queries/asset_reference.py b/app/assets/database/queries/asset_reference.py index cab824edf..3735d0ba8 100644 --- a/app/assets/database/queries/asset_reference.py +++ b/app/assets/database/queries/asset_reference.py @@ -319,7 +319,7 @@ def list_references_page( select(AssetReferenceTag.asset_reference_id, Tag.name) .join(Tag, Tag.name == AssetReferenceTag.tag_name) .where(AssetReferenceTag.asset_reference_id.in_(id_list)) - .order_by(AssetReferenceTag.added_at) + .order_by(AssetReferenceTag.tag_name.asc()) ) for ref_id, tag_name in rows.all(): tag_map[ref_id].append(tag_name) diff --git a/app/assets/database/queries/tags.py b/app/assets/database/queries/tags.py index fbca80743..2074a93f6 100644 --- a/app/assets/database/queries/tags.py +++ b/app/assets/database/queries/tags.py @@ -75,9 +75,9 @@ def get_reference_tags(session: Session, reference_id: str) -> list[str]: tag_name for (tag_name,) in ( session.execute( - select(AssetReferenceTag.tag_name).where( - AssetReferenceTag.asset_reference_id == reference_id - ) + select(AssetReferenceTag.tag_name) + .where(AssetReferenceTag.asset_reference_id == reference_id) + .order_by(AssetReferenceTag.tag_name.asc()) ) ).all() ] @@ -120,7 +120,7 @@ def set_reference_tags( ) session.flush() - return SetTagsResult(added=to_add, removed=to_remove, total=desired) + return SetTagsResult(added=sorted(to_add), removed=sorted(to_remove), total=sorted(desired)) def add_tags_to_reference( @@ -364,7 +364,7 @@ def list_tag_counts_for_filtered_assets( ) .where(AssetReferenceTag.asset_reference_id.in_(select(ref_sq.c.id))) .group_by(AssetReferenceTag.tag_name) - .order_by(func.count(AssetReferenceTag.asset_reference_id).desc()) + .order_by(func.count(AssetReferenceTag.asset_reference_id).desc(), AssetReferenceTag.tag_name.asc()) .limit(limit) )