mirror of
https://github.com/open-webui/open-webui.git
synced 2025-12-12 04:15:25 +00:00
refac/fix: proper notes db operations
This commit is contained in:
parent
5b1f9e3e21
commit
da661756fa
2 changed files with 35 additions and 29 deletions
|
|
@ -128,7 +128,7 @@ class NoteTable:
|
||||||
notes = query.all()
|
notes = query.all()
|
||||||
return [NoteModel.model_validate(note) for note in notes]
|
return [NoteModel.model_validate(note) for note in notes]
|
||||||
|
|
||||||
def get_notes_by_access(
|
def get_notes_by_permission(
|
||||||
self,
|
self,
|
||||||
user_id: str,
|
user_id: str,
|
||||||
permission: str = "write",
|
permission: str = "write",
|
||||||
|
|
@ -137,40 +137,44 @@ class NoteTable:
|
||||||
) -> list[NoteModel]:
|
) -> list[NoteModel]:
|
||||||
with get_db() as db:
|
with get_db() as db:
|
||||||
user_groups = Groups.get_groups_by_member_id(user_id)
|
user_groups = Groups.get_groups_by_member_id(user_id)
|
||||||
user_group_ids = {group_id for group_id in user_groups}
|
user_group_ids = {group.id for group in user_groups}
|
||||||
|
|
||||||
query = db.query(Note)
|
# Order newest-first. We stream to keep memory usage low.
|
||||||
|
query = (
|
||||||
|
db.query(Note)
|
||||||
|
.order_by(Note.updated_at.desc())
|
||||||
|
.execution_options(stream_results=True)
|
||||||
|
.yield_per(256)
|
||||||
|
)
|
||||||
|
|
||||||
access_conditions = [Note.user_id == user_id]
|
results: list[NoteModel] = []
|
||||||
|
n_skipped = 0
|
||||||
|
|
||||||
if user_group_ids:
|
for note in query:
|
||||||
access_conditions.append(
|
# Fast-pass #1: owner
|
||||||
and_(
|
if note.user_id == user_id:
|
||||||
Note.access_control.isnot(None),
|
permitted = True
|
||||||
Note.access_control != '{}',
|
# Fast-pass #2: public/open
|
||||||
Note.access_control != 'null'
|
elif note.access_control is None:
|
||||||
|
permitted = True
|
||||||
|
else:
|
||||||
|
permitted = has_access(
|
||||||
|
user_id, permission, note.access_control, user_group_ids
|
||||||
)
|
)
|
||||||
)
|
|
||||||
|
|
||||||
query = query.filter(or_(*access_conditions))
|
if not permitted:
|
||||||
|
continue
|
||||||
|
|
||||||
query = query.order_by(Note.updated_at.desc())
|
# Apply skip AFTER permission filtering so it counts only accessible notes
|
||||||
|
if skip and n_skipped < skip:
|
||||||
|
n_skipped += 1
|
||||||
|
continue
|
||||||
|
|
||||||
if skip is not None:
|
results.append(NoteModel.model_validate(note))
|
||||||
query = query.offset(skip)
|
if limit is not None and len(results) >= limit:
|
||||||
if limit is not None:
|
break
|
||||||
query = query.limit(limit)
|
|
||||||
|
|
||||||
notes = query.all()
|
return results
|
||||||
note_models = [NoteModel.model_validate(note) for note in notes]
|
|
||||||
|
|
||||||
filtered_notes = []
|
|
||||||
for note in note_models:
|
|
||||||
if (note.user_id == user_id or
|
|
||||||
has_access(user_id, permission, note.access_control, user_group_ids)):
|
|
||||||
filtered_notes.append(note)
|
|
||||||
|
|
||||||
return filtered_notes
|
|
||||||
|
|
||||||
def get_note_by_id(self, id: str) -> Optional[NoteModel]:
|
def get_note_by_id(self, id: str) -> Optional[NoteModel]:
|
||||||
with get_db() as db:
|
with get_db() as db:
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ async def get_notes(request: Request, user=Depends(get_verified_user)):
|
||||||
"user": UserResponse(**Users.get_user_by_id(note.user_id).model_dump()),
|
"user": UserResponse(**Users.get_user_by_id(note.user_id).model_dump()),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
for note in Notes.get_notes_by_access(user.id, "write")
|
for note in Notes.get_notes_by_permission(user.id, "write")
|
||||||
]
|
]
|
||||||
|
|
||||||
return notes
|
return notes
|
||||||
|
|
@ -81,7 +81,9 @@ async def get_note_list(
|
||||||
|
|
||||||
notes = [
|
notes = [
|
||||||
NoteTitleIdResponse(**note.model_dump())
|
NoteTitleIdResponse(**note.model_dump())
|
||||||
for note in Notes.get_notes_by_access(user.id, "write", skip=skip, limit=limit)
|
for note in Notes.get_notes_by_permission(
|
||||||
|
user.id, "write", skip=skip, limit=limit
|
||||||
|
)
|
||||||
]
|
]
|
||||||
|
|
||||||
return notes
|
return notes
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue