enh/refac: notes

backend/open_webui/routers/notes.py

@@ -8,11 +8,21 @@ from pydantic import BaseModel
 
 from open_webui.socket.main import sio
 
-
+from open_webui.models.groups import Groups
 from open_webui.models.users import Users, UserResponse
-from open_webui.models.notes import Notes, NoteModel, NoteForm, NoteUserResponse
+from open_webui.models.notes import (
+    NoteListResponse,
+    Notes,
+    NoteModel,
+    NoteForm,
+    NoteUserResponse,
+)
 
-from open_webui.config import ENABLE_ADMIN_CHAT_ACCESS, ENABLE_ADMIN_EXPORT
+from open_webui.config import (
+    BYPASS_ADMIN_ACCESS_CONTROL,
+    ENABLE_ADMIN_CHAT_ACCESS,
+    ENABLE_ADMIN_EXPORT,
+)
 from open_webui.constants import ERROR_MESSAGES
 from open_webui.env import SRC_LOG_LEVELS
 
@@ -30,39 +40,17 @@ router = APIRouter()
 ############################
 
 
-@router.get("/", response_model=list[NoteUserResponse])
-async def get_notes(request: Request, user=Depends(get_verified_user)):
-
-    if user.role != "admin" and not has_permission(
-        user.id, "features.notes", request.app.state.config.USER_PERMISSIONS
-    ):
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail=ERROR_MESSAGES.UNAUTHORIZED,
-        )
-
-    notes = [
-        NoteUserResponse(
-            **{
-                **note.model_dump(),
-                "user": UserResponse(**Users.get_user_by_id(note.user_id).model_dump()),
-            }
-        )
-        for note in Notes.get_notes_by_permission(user.id, "write")
-    ]
-
-    return notes
-
-
-class NoteTitleIdResponse(BaseModel):
+class NoteItemResponse(BaseModel):
     id: str
     title: str
+    data: Optional[dict]
     updated_at: int
     created_at: int
+    user: Optional[UserResponse] = None
 
 
-@router.get("/list", response_model=list[NoteTitleIdResponse])
-async def get_note_list(
+@router.get("/", response_model=list[NoteItemResponse])
+async def get_notes(
     request: Request, page: Optional[int] = None, user=Depends(get_verified_user)
 ):
     if user.role != "admin" and not has_permission(
@@ -80,15 +68,61 @@ async def get_note_list(
         skip = (page - 1) * limit
 
     notes = [
-        NoteTitleIdResponse(**note.model_dump())
-        for note in Notes.get_notes_by_permission(
-            user.id, "write", skip=skip, limit=limit
+        NoteUserResponse(
+            **{
+                **note.model_dump(),
+                "user": UserResponse(**Users.get_user_by_id(note.user_id).model_dump()),
+            }
         )
+        for note in Notes.get_notes_by_user_id(user.id, "read", skip=skip, limit=limit)
     ]
-
     return notes
 
 
+@router.get("/search", response_model=NoteListResponse)
+async def search_notes(
+    request: Request,
+    query: Optional[str] = None,
+    view_option: Optional[str] = None,
+    order_by: Optional[str] = None,
+    direction: Optional[str] = None,
+    page: Optional[int] = 1,
+    user=Depends(get_verified_user),
+):
+    if user.role != "admin" and not has_permission(
+        user.id, "features.notes", request.app.state.config.USER_PERMISSIONS
+    ):
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=ERROR_MESSAGES.UNAUTHORIZED,
+        )
+
+    limit = None
+    skip = None
+    if page is not None:
+        limit = 60
+        skip = (page - 1) * limit
+
+    filter = {}
+    if query:
+        filter["query"] = query
+    if view_option:
+        filter["view_option"] = view_option
+    if order_by:
+        filter["order_by"] = order_by
+    if direction:
+        filter["direction"] = direction
+
+    if not user.role == "admin" or not BYPASS_ADMIN_ACCESS_CONTROL:
+        groups = Groups.get_groups_by_member_id(user.id)
+        if groups:
+            filter["group_ids"] = [group.id for group in groups]
+
+        filter["user_id"] = user.id
+
+    return Notes.search_notes(user.id, filter, skip=skip, limit=limit)
+
+
 ############################
 # CreateNewNote
 ############################