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
2025-12-28 22:26:35 +04:00
parent 2041ab483e
commit 145c7516f2
2 changed files with 94 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/open_webui/models/channels.py
+34 -32
View File
@@ -306,9 +306,9 @@ class ChannelTable:
return memberships
def insert_new_channel(
self, form_data: CreateChannelForm, user_id: str
self, form_data: CreateChannelForm, user_id: str, db: Optional[Session] = None
) -> Optional[ChannelModel]:
with get_db() as db:
with get_db_context(db) as db:
channel = ChannelModel(
**{
**form_data.model_dump(),
@@ -389,7 +389,7 @@ class ChannelTable:
def get_channels_by_user_id(self, user_id: str, db: Optional[Session] = None) -> list[ChannelModel]:
with get_db_context(db) as db:
user_group_ids = [
group.id for group in Groups.get_groups_by_member_id(user_id)
group.id for group in Groups.get_groups_by_member_id(user_id, db=db)
]
membership_channels = (
@@ -423,8 +423,8 @@ class ChannelTable:
all_channels = membership_channels + standard_channels
return [ChannelModel.model_validate(c) for c in all_channels]
def get_dm_channel_by_user_ids(self, user_ids: list[str]) -> Optional[ChannelModel]:
with get_db() as db:
def get_dm_channel_by_user_ids(self, user_ids: list[str], db: Optional[Session] = None) -> Optional[ChannelModel]:
with get_db_context(db) as db:
# Ensure uniqueness in case a list with duplicates is passed
unique_user_ids = list(set(user_ids))
@@ -462,8 +462,9 @@ class ChannelTable:
invited_by: str,
user_ids: Optional[list[str]] = None,
group_ids: Optional[list[str]] = None,
db: Optional[Session] = None,
) -> list[ChannelMemberModel]:
with get_db() as db:
with get_db_context(db) as db:
# 1. Collect all user_ids including groups + inviter
requested_users = self._collect_unique_user_ids(
invited_by, user_ids, group_ids
@@ -496,8 +497,9 @@ class ChannelTable:
self,
channel_id: str,
user_ids: list[str],
db: Optional[Session] = None,
) -> int:
with get_db() as db:
with get_db_context(db) as db:
result = (
db.query(ChannelMember)
.filter(
@@ -509,8 +511,8 @@ class ChannelTable:
db.commit()
return result # number of rows deleted
def is_user_channel_manager(self, channel_id: str, user_id: str) -> bool:
with get_db() as db:
def is_user_channel_manager(self, channel_id: str, user_id: str, db: Optional[Session] = None) -> bool:
with get_db_context(db) as db:
# Check if the user is the creator of the channel
# or has a 'manager' role in ChannelMember
channel = db.query(Channel).filter(Channel.id == channel_id).first()
@@ -529,9 +531,9 @@ class ChannelTable:
return membership is not None
def join_channel(
self, channel_id: str, user_id: str
self, channel_id: str, user_id: str, db: Optional[Session] = None
) -> Optional[ChannelMemberModel]:
with get_db() as db:
with get_db_context(db) as db:
# Check if the membership already exists
existing_membership = (
db.query(ChannelMember)
@@ -567,8 +569,8 @@ class ChannelTable:
db.commit()
return channel_member
def leave_channel(self, channel_id: str, user_id: str) -> bool:
with get_db() as db:
def leave_channel(self, channel_id: str, user_id: str, db: Optional[Session] = None) -> bool:
with get_db_context(db) as db:
membership = (
db.query(ChannelMember)
.filter(
@@ -589,9 +591,9 @@ class ChannelTable:
return True
def get_member_by_channel_and_user_id(
self, channel_id: str, user_id: str
self, channel_id: str, user_id: str, db: Optional[Session] = None
) -> Optional[ChannelMemberModel]:
with get_db() as db:
with get_db_context(db) as db:
membership = (
db.query(ChannelMember)
.filter(
@@ -602,8 +604,8 @@ class ChannelTable:
)
return ChannelMemberModel.model_validate(membership) if membership else None
def get_members_by_channel_id(self, channel_id: str) -> list[ChannelMemberModel]:
with get_db() as db:
def get_members_by_channel_id(self, channel_id: str, db: Optional[Session] = None) -> list[ChannelMemberModel]:
with get_db_context(db) as db:
memberships = (
db.query(ChannelMember)
.filter(ChannelMember.channel_id == channel_id)
@@ -614,8 +616,8 @@ class ChannelTable:
for membership in memberships
]
def pin_channel(self, channel_id: str, user_id: str, is_pinned: bool) -> bool:
with get_db() as db:
def pin_channel(self, channel_id: str, user_id: str, is_pinned: bool, db: Optional[Session] = None) -> bool:
with get_db_context(db) as db:
membership = (
db.query(ChannelMember)
.filter(
@@ -633,8 +635,8 @@ class ChannelTable:
db.commit()
return True
def update_member_last_read_at(self, channel_id: str, user_id: str) -> bool:
with get_db() as db:
def update_member_last_read_at(self, channel_id: str, user_id: str, db: Optional[Session] = None) -> bool:
with get_db_context(db) as db:
membership = (
db.query(ChannelMember)
.filter(
@@ -653,9 +655,9 @@ class ChannelTable:
return True
def update_member_active_status(
self, channel_id: str, user_id: str, is_active: bool
self, channel_id: str, user_id: str, is_active: bool, db: Optional[Session] = None
) -> bool:
with get_db() as db:
with get_db_context(db) as db:
membership = (
db.query(ChannelMember)
.filter(
@@ -673,8 +675,8 @@ class ChannelTable:
db.commit()
return True
def is_user_channel_member(self, channel_id: str, user_id: str) -> bool:
with get_db() as db:
def is_user_channel_member(self, channel_id: str, user_id: str, db: Optional[Session] = None) -> bool:
with get_db_context(db) as db:
membership = (
db.query(ChannelMember)
.filter(
@@ -693,8 +695,8 @@ class ChannelTable:
except Exception:
return None
def get_channels_by_file_id(self, file_id: str) -> list[ChannelModel]:
with get_db() as db:
def get_channels_by_file_id(self, file_id: str, db: Optional[Session] = None) -> list[ChannelModel]:
with get_db_context(db) as db:
channel_files = (
db.query(ChannelFile).filter(ChannelFile.file_id == file_id).all()
)
@@ -703,9 +705,9 @@ class ChannelTable:
return [ChannelModel.model_validate(channel) for channel in channels]
def get_channels_by_file_id_and_user_id(
self, file_id: str, user_id: str
self, file_id: str, user_id: str, db: Optional[Session] = None
) -> list[ChannelModel]:
with get_db() as db:
with get_db_context(db) as db:
# 1. Determine which channels have this file
channel_file_rows = (
db.query(ChannelFile).filter(ChannelFile.file_id == file_id).all()
@@ -729,7 +731,7 @@ class ChannelTable:
return []
# Preload user's group membership
user_group_ids = [g.id for g in Groups.get_groups_by_member_id(user_id)]
user_group_ids = [g.id for g in Groups.get_groups_by_member_id(user_id, db=db)]
allowed_channels = []
@@ -766,9 +768,9 @@ class ChannelTable:
return allowed_channels
def get_channel_by_id_and_user_id(
self, id: str, user_id: str
self, id: str, user_id: str, db: Optional[Session] = None
) -> Optional[ChannelModel]:
with get_db() as db:
with get_db_context(db) as db:
# Fetch the channel
channel: Channel = (
db.query(Channel)