feat: chat folder drag and drop support

backend/open_webui/apps/webui/models/chats.py

@@ -84,6 +84,7 @@ class ChatResponse(BaseModel):
     archived: bool
     pinned: Optional[bool] = False
     meta: dict = {}
+    folder_id: Optional[str] = None
 
 
 class ChatTitleIdResponse(BaseModel):
@@ -256,7 +257,7 @@ class ChatTable:
         limit: int = 50,
     ) -> list[ChatModel]:
         with get_db() as db:
-            query = db.query(Chat).filter_by(user_id=user_id).filter_by(parent_id=None)
+            query = db.query(Chat).filter_by(user_id=user_id).filter_by(folder_id=None)
             if not include_archived:
                 query = query.filter_by(archived=False)
 
@@ -278,7 +279,7 @@ class ChatTable:
         limit: Optional[int] = None,
     ) -> list[ChatTitleIdResponse]:
         with get_db() as db:
-            query = db.query(Chat).filter_by(user_id=user_id)
+            query = db.query(Chat).filter_by(user_id=user_id).filter_by(folder_id=None)
             query = query.filter(or_(Chat.pinned == False, Chat.pinned == None))
 
             if not include_archived:

backend/open_webui/apps/webui/models/folders.py

@@ -19,13 +19,6 @@ log.setLevel(SRC_LOG_LEVELS["MODELS"])
 ####################
 
 
-class FolderItems(BaseModel):
-    chat_ids: Optional[list[str]] = None
-    file_ids: Optional[list[str]] = None
-
-    model_config = ConfigDict(extra="allow")
-
-
 class Folder(Base):
     __tablename__ = "folder"
     id = Column(Text, primary_key=True)
@@ -44,7 +37,7 @@ class FolderModel(BaseModel):
     parent_id: Optional[str] = None
     user_id: str
     name: str
-    items: Optional[FolderItems] = None
+    items: Optional[dict] = None
     meta: Optional[dict] = None
     is_expanded: bool = False
     created_at: int
@@ -63,11 +56,6 @@ class FolderForm(BaseModel):
     model_config = ConfigDict(extra="allow")
 
 
-class FolderItemsUpdateForm(BaseModel):
-    items: FolderItems
-    model_config = ConfigDict(extra="allow")
-
-
 class FolderTable:
     def insert_new_folder(
         self, user_id: str, name: str, parent_id: Optional[str] = None
@@ -222,26 +210,6 @@ class FolderTable:
             log.error(f"update_folder: {e}")
             return
 
-    def update_folder_items_by_id_and_user_id(
-        self, id: str, user_id: str, items: FolderItems
-    ) -> Optional[FolderModel]:
-        try:
-            with get_db() as db:
-                folder = db.query(Folder).filter_by(id=id, user_id=user_id).first()
-
-                if not folder:
-                    return None
-
-                folder.items = items.model_dump()
-                folder.updated_at = int(time.time())
-
-                db.commit()
-
-                return FolderModel.model_validate(folder)
-        except Exception as e:
-            log.error(f"update_folder: {e}")
-            return
-
     def delete_folder_by_id_and_user_id(self, id: str, user_id: str) -> bool:
         try:
             with get_db() as db: