Emil_Shanaty/open-webui-ai4me
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek
2026-02-15 23:57:40 -06:00
parent f96e8f04fc
commit 33308022f0
1 changed files with 42 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/open_webui/models/groups.py
+42 -25
View File
@@ -164,7 +164,10 @@ class GroupTable:
def get_groups(self, filter, db: Optional[Session] = None) -> list[GroupResponse]: def get_groups(self, filter, db: Optional[Session] = None) -> list[GroupResponse]:
with get_db_context(db) as db: 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 filter:
if "query" in filter: if "query" in filter:
@@ -179,9 +182,6 @@ class GroupTable:
json_share_lower = func.lower(json_share_str) json_share_lower = func.lower(json_share_str)
if share_value: 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_( anyone_can_share = or_(
Group.data.is_(None), Group.data.is_(None),
json_share_str.is_(None), json_share_str.is_(None),
@@ -190,7 +190,6 @@ class GroupTable:
) )
if member_id: if member_id:
# Also include member-only groups where user is a member
member_groups_select = select(GroupMember.group_id).where( member_groups_select = select(GroupMember.group_id).where(
GroupMember.user_id == member_id GroupMember.user_id == member_id
) )
@@ -211,21 +210,28 @@ class GroupTable:
else: else:
# Only apply member_id filter when share filter is NOT present # Only apply member_id filter when share filter is NOT present
if "member_id" in filter: if "member_id" in filter:
query = query.join( query = query.filter(
GroupMember, GroupMember.group_id == Group.id Group.id.in_(
).filter(GroupMember.user_id == filter["member_id"]) 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 [ return [
GroupResponse.model_validate( GroupResponse.model_validate(
{ {
**GroupModel.model_validate(group).model_dump(), **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( def search_groups(
@@ -242,31 +248,42 @@ class GroupTable:
if "query" in filter: if "query" in filter:
query = query.filter(Group.name.ilike(f"%{filter['query']}%")) query = query.filter(Group.name.ilike(f"%{filter['query']}%"))
if "member_id" in filter: if "member_id" in filter:
query = query.join( query = query.filter(
GroupMember, GroupMember.group_id == Group.id Group.id.in_(
).filter(GroupMember.user_id == filter["member_id"]) select(GroupMember.group_id).where(
GroupMember.user_id == filter["member_id"]
)
)
)
if "share" in filter: if "share" in filter:
# 'share' is stored in data JSON, support both sqlite and postgres
share_value = filter["share"] share_value = filter["share"]
print("Filtering by share:", share_value)
query = query.filter( query = query.filter(
Group.data.op("->>")("share") == str(share_value) Group.data.op("->>")("share") == str(share_value)
) )
total = query.count() total = query.count()
query = query.order_by(Group.updated_at.desc())
groups = query.offset(skip).limit(limit).all() member_count = func.count(GroupMember.user_id).label("member_count")
group_ids = [group.id for group in groups] results = (
member_counts = self.get_group_member_counts_by_ids(group_ids, db=db) 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 { return {
"items": [ "items": [
GroupResponse.model_validate( 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, "total": total,
} }