refac

tjbck · tjbck · commit 33308022f0f1 · 2026-02-15T23:57:40.000-06:00
diff --git a/backend/open_webui/models/groups.py b/backend/open_webui/models/groups.py
@@ -164,7 +164,10 @@ def get_all_groups(self, db: Optional[Session] = None) -> list[GroupModel]:
 
     def get_groups(self, filter, db: Optional[Session] = None) -> list[GroupResponse]:
         with get_db_context(db) as db:
-            query = db.query(Group)
+            member_count = func.count(GroupMember.user_id).label("member_count")
+            query = db.query(Group, member_count).outerjoin(
+                GroupMember, GroupMember.group_id == Group.id
+            )
 
             if filter:
                 if "query" in filter:
@@ -179,9 +182,6 @@ def get_groups(self, filter, db: Optional[Session] = None) -> list[GroupResponse
                     json_share_lower = func.lower(json_share_str)
 
                     if share_value:
-                        # Groups open to anyone: data is null, config.share is null, or share is true
-                        # Use case-insensitive string comparison to handle variations like "True", "TRUE"
-                        # Handle potential JSON boolean to string casting issues by checking for both string 'true' and boolean equivalence if possible,
                         anyone_can_share = or_(
                             Group.data.is_(None),
                             json_share_str.is_(None),
@@ -190,7 +190,6 @@ def get_groups(self, filter, db: Optional[Session] = None) -> list[GroupResponse
                         )
 
                         if member_id:
-                            # Also include member-only groups where user is a member
                             member_groups_select = select(GroupMember.group_id).where(
                                 GroupMember.user_id == member_id
                             )
@@ -211,21 +210,28 @@ def get_groups(self, filter, db: Optional[Session] = None) -> list[GroupResponse
                 else:
                     # Only apply member_id filter when share filter is NOT present
                     if "member_id" in filter:
-                        query = query.join(
-                            GroupMember, GroupMember.group_id == Group.id
-                        ).filter(GroupMember.user_id == filter["member_id"])
+                        query = query.filter(
+                            Group.id.in_(
+                                select(GroupMember.group_id).where(
+                                    GroupMember.user_id == filter["member_id"]
+                                )
+                            )
+                        )
+
+            results = (
+                query.group_by(Group.id)
+                .order_by(Group.updated_at.desc())
+                .all()
+            )
 
-            groups = query.order_by(Group.updated_at.desc()).all()
-            group_ids = [group.id for group in groups]
-            member_counts = self.get_group_member_counts_by_ids(group_ids, db=db)
             return [
                 GroupResponse.model_validate(
                     {
                         **GroupModel.model_validate(group).model_dump(),
-                        "member_count": member_counts.get(group.id, 0),
+                        "member_count": count or 0,
                     }
                 )
-                for group in groups
+                for group, count in results
             ]
 
     def search_groups(
@@ -242,31 +248,42 @@ def search_groups(
                 if "query" in filter:
                     query = query.filter(Group.name.ilike(f"%{filter['query']}%"))
                 if "member_id" in filter:
-                    query = query.join(
-                        GroupMember, GroupMember.group_id == Group.id
-                    ).filter(GroupMember.user_id == filter["member_id"])
+                    query = query.filter(
+                        Group.id.in_(
+                            select(GroupMember.group_id).where(
+                                GroupMember.user_id == filter["member_id"]
+                            )
+                        )
+                    )
 
                 if "share" in filter:
-                    #  'share' is stored in data JSON, support both sqlite and postgres
                     share_value = filter["share"]
-                    print("Filtering by share:", share_value)
                     query = query.filter(
                         Group.data.op("->>")("share") == str(share_value)
                     )
 
             total = query.count()
-            query = query.order_by(Group.updated_at.desc())
-            groups = query.offset(skip).limit(limit).all()
-            group_ids = [group.id for group in groups]
-            member_counts = self.get_group_member_counts_by_ids(group_ids, db=db)
+
+            member_count = func.count(GroupMember.user_id).label("member_count")
+            results = (
+                query.add_columns(member_count)
+                .outerjoin(GroupMember, GroupMember.group_id == Group.id)
+                .group_by(Group.id)
+                .order_by(Group.updated_at.desc())
+                .offset(skip)
+                .limit(limit)
+                .all()
+            )
 
             return {
                 "items": [
                     GroupResponse.model_validate(
-                        **GroupModel.model_validate(group).model_dump(),
-                        member_count=member_counts.get(group.id, 0),
+                        {
+                            **GroupModel.model_validate(group).model_dump(),
+                            "member_count": count or 0,
+                        }
                     )
-                    for group in groups
+                    for group, count in results
                 ],
                 "total": total,
             }
