OSSForks/ollama-webui
1
0
Fork 0
mirror of https://github.com/zebrajr/ollama-webui.git synced 2026-01-15 12:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix/refac: shared chat files behaviour

Browse Source
This commit is contained in:
Timothy Jaeryang Baek
2025-12-21 23:29:54 +04:00
parent bd7f1869ce
commit 45e3237756
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
backend/open_webui/models/chats.py
View File

@@ -1337,5 +1337,17 @@ class ChatTable:
except Exception: except Exception:
return False return False
def get_shared_chats_by_file_id(self, file_id: str) -> list[ChatModel]:
with get_db() as db:
# Join Chat and ChatFile tables to get shared chats associated with the file_id
all_chats = (
db.query(Chat)
.join(ChatFile, Chat.id == ChatFile.chat_id)
.filter(ChatFile.file_id == file_id, Chat.share_id.isnot(None))
.all()
)
return [ChatModel.model_validate(chat) for chat in all_chats]
Chats = ChatTable() Chats = ChatTable()

10
backend/open_webui/routers/files.py
View File

@@ -34,6 +34,7 @@ from open_webui.models.files import (
FileModelResponse, FileModelResponse,
Files, Files,
) )
from open_webui.models.chats import Chats
from open_webui.models.knowledge import Knowledges from open_webui.models.knowledge import Knowledges
from open_webui.models.groups import Groups from open_webui.models.groups import Groups
@@ -71,9 +72,9 @@ def has_access_to_file(
detail=ERROR_MESSAGES.NOT_FOUND, detail=ERROR_MESSAGES.NOT_FOUND,
) )
# Check if the file is associated with any knowledge bases the user has access to
knowledge_bases = Knowledges.get_knowledges_by_file_id(file_id) knowledge_bases = Knowledges.get_knowledges_by_file_id(file_id)
user_group_ids = {group.id for group in Groups.get_groups_by_member_id(user.id)} user_group_ids = {group.id for group in Groups.get_groups_by_member_id(user.id)}
for knowledge_base in knowledge_bases: for knowledge_base in knowledge_bases:
if knowledge_base.user_id == user.id or has_access( if knowledge_base.user_id == user.id or has_access(
user.id, access_type, knowledge_base.access_control, user_group_ids user.id, access_type, knowledge_base.access_control, user_group_ids
@@ -89,10 +90,17 @@ def has_access_to_file(
if knowledge_base.id == knowledge_base_id: if knowledge_base.id == knowledge_base_id:
return True return True
# Check if the file is associated with any channels the user has access to
channels = Channels.get_channels_by_file_id_and_user_id(file_id, user.id) channels = Channels.get_channels_by_file_id_and_user_id(file_id, user.id)
if access_type == "read" and channels: if access_type == "read" and channels:
return True return True
# Check if the file is associated with any chats the user has access to
# TODO: Granular access control for chats
chats = Chats.get_shared_chats_by_file_id(file_id)
if chats:
return True
return False return False