refac

backend/open_webui/models/chats.py

@@ -1722,17 +1722,21 @@ class ChatTable:
         folder_id: str,
         skip: int = 0,
         limit: int = 60,
+        sort_by: str = 'updated_at',
+        sort_dir: str = 'desc',
         db: AsyncSession | None = None,
     ) -> list[dict]:
         """Get chats in a folder across ALL users. Returns dicts with user_id."""
         async with get_async_db_context(db) as session:
+            sort_column = Chat.title if sort_by == 'title' else Chat.updated_at
+            order_clause = sort_column.asc() if sort_dir == 'asc' else sort_column.desc()
             stmt = (
                 select(Chat.id, Chat.title, Chat.user_id, Chat.updated_at, Chat.created_at, Chat.last_read_at)
                 .filter_by(folder_id=folder_id)
                 .filter(or_(Chat.pinned == False, Chat.pinned == None))
                 .filter_by(archived=False)
                 .where(Chat.meta['internal'].as_boolean().is_not(True))
-                .order_by(Chat.updated_at.desc(), Chat.id)
+                .order_by(order_clause, Chat.id)
             )
 
             if skip:
@@ -1754,6 +1758,22 @@ class ChatTable:
                 for chat in all_chats
             ]
 
+    async def count_all_chats_by_folder_id(
+        self,
+        folder_id: str,
+        db: AsyncSession | None = None,
+    ) -> int:
+        async with get_async_db_context(db) as session:
+            stmt = (
+                select(func.count(Chat.id))
+                .filter_by(folder_id=folder_id)
+                .filter(or_(Chat.pinned == False, Chat.pinned == None))
+                .filter_by(archived=False)
+                .where(Chat.meta['internal'].as_boolean().is_not(True))
+            )
+            result = await session.execute(stmt)
+            return result.scalar_one()
+
     async def get_chats_by_folder_ids_and_user_id(
         self, folder_ids: list[str], user_id: str, db: AsyncSession | None = None
     ) -> list[ChatModel]:

backend/open_webui/routers/folders.py

@@ -6,7 +6,7 @@ import uuid
 from pathlib import Path
 from typing import Optional
 
-from fastapi import APIRouter, Depends, File, HTTPException, Request, UploadFile, status
+from fastapi import APIRouter, Depends, File, HTTPException, Query, Request, UploadFile, status
 from fastapi.responses import FileResponse, StreamingResponse
 from open_webui.config import UPLOAD_DIR
 from open_webui.constants import ERROR_MESSAGES
@@ -482,6 +482,9 @@ async def update_folder_access_by_id(
 async def get_shared_folder_chats(
     request: Request,
     id: str,
+    page: int | None = Query(None, ge=1),
+    sort_by: str = Query('updated_at'),
+    sort_dir: str = Query('desc'),
     user=Depends(get_verified_user),
     db: AsyncSession = Depends(get_async_session),
 ):
@@ -505,7 +508,17 @@ async def get_shared_folder_chats(
             detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
         )
 
-    chats = await Chats.get_all_chats_by_folder_id(id, db=db)
+    limit = 10
+    skip = (page - 1) * limit if page is not None else 0
+    chats = await Chats.get_all_chats_by_folder_id(
+        id,
+        skip=skip,
+        limit=limit if page is not None else 60,
+        sort_by=sort_by,
+        sort_dir=sort_dir,
+        db=db,
+    )
+    total = await Chats.count_all_chats_by_folder_id(id, db=db) if page is not None else len(chats)
 
     # Resolve owner names for display (avatar URLs are constructed client-side)
     owner_cache: dict[str, str] = {}
@@ -516,10 +529,13 @@ async def get_shared_folder_chats(
             owner_cache[uid] = u.name if u else 'Unknown'
         chat['owner_name'] = owner_cache[uid]
 
-    return {
+    response = {
         'chats': [{**chat, 'readonly': chat['user_id'] != user.id} for chat in chats],
         'folder_permission': 'write' if has_write else 'read',
     }
+    if page is not None:
+        response.update({'total': total, 'has_more': skip + limit < total})
+    return response
 
 
 ############################